自来水bug

sql.properties

@@ -9,14 +9,14 @@ spring.datasource.data.driver-class-name=org.postgis.DriverWrapper
 #spring.datasource.db2.username=postgres
 #spring.datasource.db2.password=kpr.23417.postgres
 #spring.datasource.db2.driver-class-name=org.postgis.DriverWrapper
-#spring.datasource.db2.jdbc-url=jdbc:postgresql_postGIS://10.101.5.50:5432/water_volume_prediction?useSSL=false&useAffectedRows=false&allowMultiQueries=true
-spring.datasource.db2.jdbc-url=jdbc:postgresql_postGIS://10.101.3.104:5432/water_volume_prediction_jiangjin2?useSSL=false&useAffectedRows=false&allowMultiQueries=true
+spring.datasource.db2.jdbc-url=jdbc:postgresql_postGIS://10.101.5.50:5432/water_volume_prediction?useSSL=false&useAffectedRows=false&allowMultiQueries=true
+#spring.datasource.db2.jdbc-url=jdbc:postgresql_postGIS://10.101.3.104:5432/water_volume_prediction_jiangjin2?useSSL=false&useAffectedRows=false&allowMultiQueries=true
 spring.datasource.db2.username=postgres
-#spring.datasource.db2.password=ygt.23417.postgres
-spring.datasource.db2.password=kpr.23417.postgres
+spring.datasource.db2.password=ygt.23417.postgres
+#spring.datasource.db2.password=kpr.23417.postgres
 spring.datasource.db2.driver-class-name=org.postgis.DriverWrapper
-spring,database.name=water_volume_prediction_jiangjin2
-#spring,database.name=water_volume_prediction
+#spring,database.name=water_volume_prediction_jiangjin2
+spring,database.name=water_volume_prediction
 
 spring.datasource.child2pg.jdbc-url=jdbc:postgresql_postGIS://10.101.5.50:5432/water_level_prediction?useSSL=false&useAffectedRows=false&allowMultiQueries=true
 spring.datasource.child2pg.username=postgres

src/main/java/com/shkpr/service/aimodelpower/dbdao/shizilaishuiDataSource/WaterZILAISHUIDao.java

@@ -53,7 +53,7 @@ public class WaterZILAISHUIDao {
     public List<Map<String,Object>> getPageZILAISHUI_HISTORY2(int limit,int offset,String extend){
         try {
             String tableName = "cqda.V_SHIZILAISHUI_HISTORY2";
-            String filedOrgName = "NAMA";
+            String filedOrgName = "NAME";
             if("water_volume_prediction_jiangjin2".equals(KprAimWaterCollecationBizFun.databaseName)){
                 tableName = "cqda.V_JIANGJIN_HISTORY ";
                 filedOrgName = "ORG_NAME";

src/main/java/com/shkpr/service/aimodelpower/globalmgr/ScheduleTaskMgr.java

@@ -158,7 +158,6 @@ public class ScheduleTaskMgr {
 //                KprAimWaterCollecationBizFun.insertYuceHourData(time);
         //TODO 实际调用调度模型的接口
         KprAimWaterCollecationBizFun.insertYucePumpReal(time,LocalDateTime.now().getDayOfMonth());
-//        KprAimWaterCollecationBizFun.initPumpPowerCons();
     }
 
     //TODO 启动时执行 测试方法
@@ -261,36 +260,36 @@ public class ScheduleTaskMgr {
         timer2.schedule(timerTask2,9000);//9秒后执行一次
     }
     //TODO 启动时跑今天泵的数据,江津的先注释
-//    @PostConstruct
-//    public void initPumpFourDay(){
-//        Timer timer = new Timer();
-//        TimerTask timerTask1 = new TimerTask() {
-//            @Override
-//            public void run() {
-//                String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
-////                KprAimWaterCollecationBizFun.insertYuceHourData(time);
-//                //TODO 实际调用调度模型的接口
-//                KprAimWaterCollecationBizFun.insertYucePumpReal(time,1);
-//            }
-//        };
-//        timer.schedule(timerTask1,9000);//9秒后执行一次
-//    }
-//
-//    @PostConstruct
-//    public void initPumpPowerCons(){
-//        Timer timer = new Timer();
-//        TimerTask timerTask1 = new TimerTask() {
-//            @Override
-//            public void run() {
-//                String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
-////                KprAimWaterCollecationBizFun.insertYuceHourData(time);
-//                //TODO 实际调用调度模型的接口
-//                KprAimWaterCollecationBizFun.initPumpPowerZero();
-//                KprAimWaterCollecationBizFun.insertYucePump(time);
-//            }
-//        };
-//        timer.schedule(timerTask1,9000);//9秒后执行一次
-//    }
+    @PostConstruct
+    public void initPumpFourDay(){
+        Timer timer = new Timer();
+        TimerTask timerTask1 = new TimerTask() {
+            @Override
+            public void run() {
+                String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
+//                KprAimWaterCollecationBizFun.insertYuceHourData(time);
+                //TODO 实际调用调度模型的接口
+                KprAimWaterCollecationBizFun.insertYucePumpReal(time,1);
+            }
+        };
+        timer.schedule(timerTask1,9000);//9秒后执行一次
+    }
+
+    @PostConstruct
+    public void initPumpPowerCons(){
+        Timer timer = new Timer();
+        TimerTask timerTask1 = new TimerTask() {
+            @Override
+            public void run() {
+                String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
+//                KprAimWaterCollecationBizFun.insertYuceHourData(time);
+                //TODO 实际调用调度模型的接口
+                KprAimWaterCollecationBizFun.initPumpPowerZero();
+                KprAimWaterCollecationBizFun.insertYucePump(time);
+            }
+        };
+        timer.schedule(timerTask1,9000);//9秒后执行一次
+    }
 
     //TODO 自来水的注释以下俩方法initPumpRecordAll checkPumpRecordAll
 //    @PostConstruct

src/main/resources/application.properties

@@ -69,12 +69,12 @@ global.sql.config.path=./sql.properties
 
 # oracle数据源
 spring.datasource.primary.url=jdbc:oracle:thin:@10.127.16.117:1521/ORCLPDB1
-#spring.datasource.primary.username=v_shizilaishui
-#spring.datasource.primary.password=ShiZiLaiShui@0811
-#spring.datasource.primary.driver-class-name=oracle.jdbc.driver.OracleDriver
-spring.datasource.primary.username=v_jiangjin
-spring.datasource.primary.password=JiangJin@1127
+spring.datasource.primary.username=v_cqzls
+spring.datasource.primary.password=CQzls#2025
 spring.datasource.primary.driver-class-name=oracle.jdbc.driver.OracleDriver
+#spring.datasource.primary.username=v_jiangjin
+#spring.datasource.primary.password=JiangJin@1127
+#spring.datasource.primary.driver-class-name=oracle.jdbc.driver.OracleDriver
 
 #开启mybatis内部调试日志输出
 #logging.level.com.sqlmybatis.test.mapper=debug