From 0ff1e81a97022fb3eb284ac1d6465e2863d7b543 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期二, 05 十一月 2024 14:14:36 +0800
Subject: [PATCH] 调整语法不兼容
---
src/main/java/com/whyc/service/SubTablePageInfoService.java | 236 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 118 insertions(+), 118 deletions(-)
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 9b6126d..2c6cce4 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -458,7 +458,7 @@
//8,133-StandardFeatureCurveService.java;86琛�
public List<StandardFeatureCurve> getList(String va, String c){
- String sql=" select * from `web_site`.`tb_standard_feature_curve_"+va+"_"+c+"`";
+ String sql=" select * from web_site.tb_standard_feature_curve_"+va+"_"+c+"";
List<StandardFeatureCurve> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
@Override
public List getResults(ResultSet rs) throws SQLException {
@@ -1029,7 +1029,7 @@
//26锛�82-HistoryDataArchivingService.java;107琛� 103琛�
public void insertBatch4BattAlarmDataHistoryByYear(String year, List<BattalarmDataHistory> temp){
- String sql="insert into db_alarm.`tb_battalarm_data_history_"+year+"` " +
+ String sql="insert into db_alarm.tb_battalarm_data_history_"+year+" " +
" (BattGroupId,MonNum,Record_Id,alm_id,alm_signal_id,alm_level,alm_start_time,alm_end_time,alm_value,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,usr_Id,alm_severity) " +
" values";
if(temp!=null&&temp.size()>0){
@@ -1318,7 +1318,7 @@
//42,129-HistoryDataArchivingService.java;72琛� 76琛�
public void insertBatch4PowerAlarmHistoryByYear(String year, List<PwrdevAlarmHistory> temp){
- String sql="insert into db_pwrdev_alarm.`tb_pwrdev_alarm_history_"+year+"` " +
+ String sql="insert into db_pwrdev_alarm.tb_pwrdev_alarm_history_"+year+" " +
" (record_id,PowerDeviceId,alm_type,alm_level,alm_source,alm_index,alm_start_time,alm_end_time,alm_value,alm_is_confirmed,alm_confirmed_time,alm_cleared_type,usr_Id,alm_severity,alm_trigger) " +
" values";
if(temp!=null&&temp.size()>0){
@@ -1492,7 +1492,7 @@
//52锛�107-HistoryDataArchivingService.java;165琛岋紝169琛�
public void insertBatch4UserLogByYear(String year, List<UserLog> userLogs){
- String sql=" insert into `tb_user_log_"+year+"`(uId,uOprateType,uOprateDay,uTerminalIp,uOprateMsg,operation_detail,read_flag)" +
+ String sql=" insert into tb_user_log_"+year+"(uId,uOprateType,uOprateDay,uTerminalIp,uOprateMsg,operation_detail,read_flag)" +
" values" ;
if(userLogs!=null&&userLogs.size()>0){
for (int i=0;i<userLogs.size();i++) {
@@ -1521,29 +1521,29 @@
//58-HistoryDataArchivingService.java;65琛�
public void createTable4PowerAlarmHistoryByYear(String year){
- String sql="CREATE TABLE db_pwrdev_alarm.`tb_pwrdev_alarm_history_"+year+"` ( " +
- " `num` bigint(20) NOT NULL AUTO_INCREMENT, " +
- " `record_id` bigint(20) NOT NULL DEFAULT '0', " +
- " `PowerDeviceId` bigint(20) NOT NULL DEFAULT '0', " +
- " `alm_type` int(11) NOT NULL DEFAULT '0', " +
- " `alm_level` int(11) NOT NULL DEFAULT '0', " +
- " `alm_source` int(11) NOT NULL DEFAULT '0', " +
- " `alm_index` int(11) NOT NULL DEFAULT '0', " +
- " `alm_start_time` datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
- " `alm_end_time` datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
- " `alm_value` float NOT NULL DEFAULT '0', " +
- " `alm_is_confirmed` tinyint(1) NOT NULL DEFAULT '0', " +
- " `alm_confirmed_time` datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
- " `alm_cleared_type` int(11) NOT NULL DEFAULT '0', " +
- " `usr_Id` int(11) NOT NULL DEFAULT '0', " +
- " `alm_trigger` int(11) NOT NULL DEFAULT '0', " +
- " `alm_severity` int(11) NOT NULL DEFAULT '0', " +
- " PRIMARY KEY (`num`), " +
- " KEY `index_record_id` (`record_id`), " +
- " KEY `index_pwrdev_id` (`PowerDeviceId`), " +
- " KEY `index_alm_type` (`alm_type`), " +
- " KEY `index_alm_start_time` (`alm_start_time`), " +
- " KEY `index_alm_cleared_type` (`alm_cleared_type`) " +
+ String sql="CREATE TABLE db_pwrdev_alarm.tb_pwrdev_alarm_history_"+year+" ( " +
+ " num bigint(20) NOT NULL AUTO_INCREMENT, " +
+ " record_id bigint(20) NOT NULL DEFAULT '0', " +
+ " PowerDeviceId bigint(20) NOT NULL DEFAULT '0', " +
+ " alm_type int(11) NOT NULL DEFAULT '0', " +
+ " alm_level int(11) NOT NULL DEFAULT '0', " +
+ " alm_source int(11) NOT NULL DEFAULT '0', " +
+ " alm_index int(11) NOT NULL DEFAULT '0', " +
+ " alm_start_time datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
+ " alm_end_time datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
+ " alm_value float NOT NULL DEFAULT '0', " +
+ " alm_is_confirmed tinyint(1) NOT NULL DEFAULT '0', " +
+ " alm_confirmed_time datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
+ " alm_cleared_type int(11) NOT NULL DEFAULT '0', " +
+ " usr_Id int(11) NOT NULL DEFAULT '0', " +
+ " alm_trigger int(11) NOT NULL DEFAULT '0', " +
+ " alm_severity int(11) NOT NULL DEFAULT '0', " +
+ " PRIMARY KEY (num), " +
+ " KEY index_record_id (record_id), " +
+ " KEY index_pwrdev_id (PowerDeviceId), " +
+ " KEY index_alm_type (alm_type), " +
+ " KEY index_alm_start_time (alm_start_time), " +
+ " KEY index_alm_cleared_type (alm_cleared_type) " +
" ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8";
sqlExecuteService.execute(sql);
}
@@ -1665,17 +1665,17 @@
//91-HistoryDataArchivingService.java;158琛�
public void createTable4UserLogByYear( String year){
- String sql=" CREATE TABLE `tb_user_log_"+year+"` ( " +
- " `num` bigint(20) NOT NULL AUTO_INCREMENT, " +
- " `uId` int(11) NOT NULL DEFAULT '0', " +
- " `uOprateType` int(11) NOT NULL DEFAULT '0', " +
- " `uOprateDay` datetime NOT NULL DEFAULT '1980-01-01 00:00:00', " +
- " `uTerminalIp` varchar(20) NOT NULL DEFAULT ' ', " +
- " `uOprateMsg` text, " +
- " `operation_detail` text COMMENT '鎿嶄綔鐨勫叿浣撴暟鎹�', " +
- " `read_flag` tinyint(1) DEFAULT '1' COMMENT '鏄惁宸查槄璇�,姝ゅ姛鑳介拡瀵瑰紓甯镐俊鎭�', " +
- " PRIMARY KEY (`num`), " +
- " KEY `user_id` (`uId`) " +
+ String sql=" CREATE TABLE tb_user_log_"+year+" ( " +
+ " num bigint(20) NOT NULL AUTO_INCREMENT, " +
+ " uId int(11) NOT NULL DEFAULT '0', " +
+ " uOprateType int(11) NOT NULL DEFAULT '0', " +
+ " uOprateDay datetime NOT NULL DEFAULT '1980-01-01 00:00:00', " +
+ " uTerminalIp varchar(20) NOT NULL DEFAULT ' ', " +
+ " uOprateMsg text, " +
+ " operation_detail text COMMENT '鎿嶄綔鐨勫叿浣撴暟鎹�', " +
+ " read_flag tinyint(1) DEFAULT '1' COMMENT '鏄惁宸查槄璇�,姝ゅ姛鑳介拡瀵瑰紓甯镐俊鎭�', " +
+ " PRIMARY KEY (num), " +
+ " KEY user_id (uId) " +
" ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8";
sqlExecuteService.execute(sql);
}
@@ -1794,37 +1794,37 @@
//95-HistoryDataArchivingService.java;96琛�
public void createTable4BattAlarmDataHistoryByYear(String year){
- String sql=" CREATE TABLE db_alarm.`tb_battalarm_data_history_"+year+"` ( " +
- " `num` bigint(20) NOT NULL AUTO_INCREMENT, " +
- " `BattGroupId` int(11) NOT NULL DEFAULT '0', " +
- " `MonNum` int(11) NOT NULL DEFAULT '0', " +
- " `Record_Id` bigint(20) NOT NULL DEFAULT '0', " +
- " `alm_id` int(11) NOT NULL DEFAULT '0', " +
- " `alm_signal_id` int(11) NOT NULL DEFAULT '0', " +
- " `alm_level` int(11) NOT NULL DEFAULT '0', " +
- " `alm_start_time` datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
- " `alm_end_time` datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
- " `alm_value` float NOT NULL DEFAULT '0', " +
- " `alm_is_confirmed` tinyint(1) NOT NULL DEFAULT '0', " +
- " `alm_confirmed_time` datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
- " `alm_cleared_type` int(11) NOT NULL DEFAULT '0', " +
- " `usr_Id` int(11) NOT NULL DEFAULT '0', " +
- " `alm_severity` int(11) NOT NULL DEFAULT '0', " +
- " PRIMARY KEY (`num`), " +
- " KEY `index_battgroup_id` (`BattGroupId`), " +
- " KEY `index_Record_Id` (`Record_Id`), " +
- " KEY `index_alm_id` (`alm_id`), " +
- " KEY `index_alm_start_time` (`alm_start_time`), " +
- " KEY `index_alm_cleared_type` (`alm_cleared_type`), " +
- " KEY `index_alm_signal_id` (`alm_signal_id`), " +
- " KEY `index_alm_level` (`alm_level`) " +
+ String sql=" CREATE TABLE db_alarm.tb_battalarm_data_history_"+year+" ( " +
+ " num bigint(20) NOT NULL AUTO_INCREMENT, " +
+ " BattGroupId int(11) NOT NULL DEFAULT '0', " +
+ " MonNum int(11) NOT NULL DEFAULT '0', " +
+ " Record_Id bigint(20) NOT NULL DEFAULT '0', " +
+ " alm_id int(11) NOT NULL DEFAULT '0', " +
+ " alm_signal_id int(11) NOT NULL DEFAULT '0', " +
+ " alm_level int(11) NOT NULL DEFAULT '0', " +
+ " alm_start_time datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
+ " alm_end_time datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
+ " alm_value float NOT NULL DEFAULT '0', " +
+ " alm_is_confirmed tinyint(1) NOT NULL DEFAULT '0', " +
+ " alm_confirmed_time datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
+ " alm_cleared_type int(11) NOT NULL DEFAULT '0', " +
+ " usr_Id int(11) NOT NULL DEFAULT '0', " +
+ " alm_severity int(11) NOT NULL DEFAULT '0', " +
+ " PRIMARY KEY (num), " +
+ " KEY index_battgroup_id (BattGroupId), " +
+ " KEY index_Record_Id (Record_Id), " +
+ " KEY index_alm_id (alm_id), " +
+ " KEY index_alm_start_time (alm_start_time), " +
+ " KEY index_alm_cleared_type (alm_cleared_type), " +
+ " KEY index_alm_signal_id (alm_signal_id), " +
+ " KEY index_alm_level (alm_level) " +
" ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8";
sqlExecuteService.execute(sql);
}
//114-HistoryDataArchivingService.java;138琛�
public void insertBatch4DevAlarmDataHistoryByYear(String year, List<DevalarmDataHistory> temp){
- String sql=" insert into db_alarm.`tb_devalarm_data_history_"+year+"` " +
+ String sql=" insert into db_alarm.tb_devalarm_data_history_"+year+" " +
" (record_id,dev_id,dev_ip,alm_type,alm_level" +
" ,alm_start_time,alm_end_time,alm_value,alm_is_confirmed" +
" ,alm_confirmed_time,alm_cleared_type,usr_Id,alm_severity) " +
@@ -1931,27 +1931,27 @@
//119-HistoryDataArchivingService.java;127琛�
public void createTable4DevAlarmDataHistoryByYear( String year){
- String sql=" CREATE TABLE db_alarm.`tb_devalarm_data_history_"+year+"` ( " +
- " `num` bigint(20) NOT NULL AUTO_INCREMENT, " +
- " `record_id` bigint(20) NOT NULL DEFAULT '0', " +
- " `dev_id` int(11) NOT NULL DEFAULT '0', " +
- " `dev_ip` varchar(24) NOT NULL DEFAULT '127.0.0.1', " +
- " `alm_type` int(11) NOT NULL DEFAULT '0', " +
- " `alm_level` int(11) NOT NULL DEFAULT '0', " +
- " `alm_start_time` datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
- " `alm_end_time` datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
- " `alm_value` float NOT NULL DEFAULT '0', " +
- " `alm_is_confirmed` tinyint(1) NOT NULL DEFAULT '0', " +
- " `alm_confirmed_time` datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
- " `alm_cleared_type` int(11) NOT NULL DEFAULT '0', " +
- " `usr_Id` int(11) NOT NULL DEFAULT '0', " +
- " `alm_severity` int(11) NOT NULL DEFAULT '0', " +
- " PRIMARY KEY (`num`), " +
- " KEY `index_record_id` (`record_id`), " +
- " KEY `index_dev_id` (`dev_id`), " +
- " KEY `index_alm_type` (`alm_type`), " +
- " KEY `index_alm_start_time` (`alm_start_time`), " +
- " KEY `index_alm_cleared_type` (`alm_cleared_type`) " +
+ String sql=" CREATE TABLE db_alarm.tb_devalarm_data_history_"+year+" ( " +
+ " num bigint(20) NOT NULL AUTO_INCREMENT, " +
+ " record_id bigint(20) NOT NULL DEFAULT '0', " +
+ " dev_id int(11) NOT NULL DEFAULT '0', " +
+ " dev_ip varchar(24) NOT NULL DEFAULT '127.0.0.1', " +
+ " alm_type int(11) NOT NULL DEFAULT '0', " +
+ " alm_level int(11) NOT NULL DEFAULT '0', " +
+ " alm_start_time datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
+ " alm_end_time datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
+ " alm_value float NOT NULL DEFAULT '0', " +
+ " alm_is_confirmed tinyint(1) NOT NULL DEFAULT '0', " +
+ " alm_confirmed_time datetime NOT NULL DEFAULT '1982-01-01 00:00:00', " +
+ " alm_cleared_type int(11) NOT NULL DEFAULT '0', " +
+ " usr_Id int(11) NOT NULL DEFAULT '0', " +
+ " alm_severity int(11) NOT NULL DEFAULT '0', " +
+ " PRIMARY KEY (num), " +
+ " KEY index_record_id (record_id), " +
+ " KEY index_dev_id (dev_id), " +
+ " KEY index_alm_type (alm_type), " +
+ " KEY index_alm_start_time (alm_start_time), " +
+ " KEY index_alm_cleared_type (alm_cleared_type) " +
" ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8";
sqlExecuteService.execute(sql);
}
@@ -2069,7 +2069,7 @@
//4-StandardFeatureCurveMapper.xml;6琛�
public void insertBatch(String titleNameUnion, List<StandardFeatureCurve> curveList2){
- String sql="insert into `web_site`.`tb_standard_feature_curve_"+titleNameUnion+"` (`time`,`value`) values ";
+ String sql="insert into web_site.tb_standard_feature_curve_"+titleNameUnion+" (time,value) values ";
if(curveList2!=null&&curveList2.size()>0){
for (int i=0;i<curveList2.size();i++) {
StandardFeatureCurve bh=curveList2.get(i);
@@ -2083,11 +2083,11 @@
}
//100-StandardFeatureCurveMapper.xml;12琛�
public void createTable(String titleNameUnion){
- String sql="CREATE TABLE `web_site`.`tb_standard_feature_curve_"+titleNameUnion+"` ( " +
- " `id` INT NOT NULL AUTO_INCREMENT, " +
- " `time` VARCHAR(45) NULL, " +
- " `value` DOUBLE NULL, " +
- " PRIMARY KEY (`id`));";
+ String sql="CREATE TABLE web_site.tb_standard_feature_curve_"+titleNameUnion+" ( " +
+ " id INT NOT NULL AUTO_INCREMENT, " +
+ " time VARCHAR(45) NULL, " +
+ " value DOUBLE NULL, " +
+ " PRIMARY KEY (id));";
sqlExecuteService.execute(sql);
}
@@ -2435,12 +2435,12 @@
//23-ElePriceMapper.xml;8琛�
public void createEleprice(String tableName){
String sql="CREATE TABLE IF NOT EXISTS web_site."+tableName+" ( " +
- " `num` int(11) NOT NULL AUTO_INCREMENT, " +
- " `tmp_id` int(11) NOT NULL DEFAULT '1001', " +
- " `tmp_starttime` TIME NOT NULL DEFAULT '00:00:00' COMMENT '寮�濮嬫椂闂�', " +
- " `tmp_stoptime` TIME NOT NULL DEFAULT '00:00:00' COMMENT '缁撴潫鏃堕棿', " +
- " `ele_price` float NOT NULL DEFAULT '0' COMMENT '鐢佃垂浠锋牸', " +
- " PRIMARY KEY (`num`) " +
+ " num int(11) NOT NULL AUTO_INCREMENT, " +
+ " tmp_id int(11) NOT NULL DEFAULT '1001', " +
+ " tmp_starttime TIME NOT NULL DEFAULT '00:00:00' COMMENT '寮�濮嬫椂闂�', " +
+ " tmp_stoptime TIME NOT NULL DEFAULT '00:00:00' COMMENT '缁撴潫鏃堕棿', " +
+ " ele_price float NOT NULL DEFAULT '0' COMMENT '鐢佃垂浠锋牸', " +
+ " PRIMARY KEY (num) " +
" )";
sqlExecuteService.execute(sql);
}
@@ -2497,7 +2497,7 @@
String sql="(SELECT " +
" num " +
" FROM " +
- " db_batt_history.`tb_batt_realdata_"+realdata.getTableName()+"` " +
+ " db_batt_history.tb_batt_realdata_"+realdata.getTableName()+" " +
" WHERE " +
" recrod_time BETWEEN '"+ThreadLocalUtil.format(realdata.getRecrodTime(),1)+"' " +
" AND '"+ThreadLocalUtil.format(realdata.getRecrodTime1(),1)+"' " +
@@ -2507,7 +2507,7 @@
" (SELECT " +
" num " +
" FROM " +
- " db_batt_history.`tb_batt_realdata_"+realdata.getTableName()+"` " +
+ " db_batt_history.tb_batt_realdata_"+realdata.getTableName()+" " +
" WHERE " +
" recrod_time BETWEEN '"+ThreadLocalUtil.format(realdata.getRecrodTime(),1)+"' " +
" AND '"+ThreadLocalUtil.format(realdata.getRecrodTime1(),1)+"' " +
@@ -3295,7 +3295,7 @@
//93-CommonMapper.xml;160琛�
public void truncate(String dbName, String tableName){
- String sql="TRUNCATE "+dbName+".`"+tableName+"`";
+ String sql="TRUNCATE "+dbName+"."+tableName+"";
sqlExecuteService.execute(sql);
}
@@ -3551,25 +3551,25 @@
//鍒涘缓clear
public void creatClear(int battGroupId) {
String sql=" CREATE TABLE IF NOT EXISTS db_batt_testdata.tb_batttestdata_clear_"+battGroupId+" (" +
- " `num` bigint(20) NOT NULL AUTO_INCREMENT," +
- " `BattGroupId` int(11) NOT NULL DEFAULT '0'," +
- " `test_record_count` int(11) NOT NULL DEFAULT '0'," +
- " `test_type` int(11) NOT NULL DEFAULT '0'," +
- " `data_new` tinyint(1) NOT NULL DEFAULT '0'," +
- " `data_available` tinyint(1) NOT NULL DEFAULT '0'," +
- " `record_num` int(11) NOT NULL DEFAULT '0'," +
- " `test_starttime` datetime NOT NULL DEFAULT '1982-01-01 00:00:00'," +
- " `record_time` datetime NOT NULL DEFAULT '1982-01-01 00:00:00'," +
- " `test_timelong` int(11) NOT NULL DEFAULT '0'," +
- " `online_vol` float NOT NULL DEFAULT '0'," +
- " `group_vol` float NOT NULL DEFAULT '0'," +
- " `test_curr` float NOT NULL DEFAULT '0'," +
- " `test_cap` float NOT NULL DEFAULT '0'," +
- " `mon_num` int(11) NOT NULL DEFAULT '0'," +
- " `mon_vol` float NOT NULL DEFAULT '0'," +
- " `mon_tmp` float NOT NULL DEFAULT '0'," +
- " PRIMARY KEY (`num`)," +
- " KEY `index_test_record_count` (`test_record_count`)" +
+ " num bigint(20) NOT NULL AUTO_INCREMENT," +
+ " BattGroupId int(11) NOT NULL DEFAULT '0'," +
+ " test_record_count int(11) NOT NULL DEFAULT '0'," +
+ " test_type int(11) NOT NULL DEFAULT '0'," +
+ " data_new tinyint(1) NOT NULL DEFAULT '0'," +
+ " data_available tinyint(1) NOT NULL DEFAULT '0'," +
+ " record_num int(11) NOT NULL DEFAULT '0'," +
+ " test_starttime datetime NOT NULL DEFAULT '1982-01-01 00:00:00'," +
+ " record_time datetime NOT NULL DEFAULT '1982-01-01 00:00:00'," +
+ " test_timelong int(11) NOT NULL DEFAULT '0'," +
+ " online_vol float NOT NULL DEFAULT '0'," +
+ " group_vol float NOT NULL DEFAULT '0'," +
+ " test_curr float NOT NULL DEFAULT '0'," +
+ " test_cap float NOT NULL DEFAULT '0'," +
+ " mon_num int(11) NOT NULL DEFAULT '0'," +
+ " mon_vol float NOT NULL DEFAULT '0'," +
+ " mon_tmp float NOT NULL DEFAULT '0'," +
+ " PRIMARY KEY (num)," +
+ " KEY index_test_record_count (test_record_count)" +
")";
sqlExecuteService.execute(sql);
}
--
Gitblit v1.9.1