市自来水更新:

1.更改泵组优化接口调用预测时间增加未来一天
2.增加营业片区小时实际用水量数据定时任务
3.更改预测的组织机构条件范围查新
4.更改营业片区预测插值bug和原始数据采集bug
5.更改小时水量预测查询接口,支持查询营业所数据
6.优化数据库链接回收机制
7.15分钟预测值查询接口支持营业所查询
8.15分钟实际值查询接口支持营业所查询
9.江津版本优化

sql.properties

@@ -8,13 +8,14 @@ spring.datasource.data.driver-class-name=org.postgis.DriverWrapper
 #spring.datasource.db2.jdbc-url=jdbc:postgresql_postGIS://140.246.183.164:5432/water_volume_prediction?useSSL=false&useAffectedRows=false&allowMultiQueries=true
 #spring.datasource.db2.username=postgres
 #spring.datasource.db2.password=kpr.23417.postgres
-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=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/globalmgr/ScheduleTaskMgr.java

@@ -103,14 +103,15 @@ public class ScheduleTaskMgr {
         }
     }
 
-    @Scheduled(cron="0 */10 * * * ?")
-    public void everyShiwuWork(){
-        KprAimTapWaterBizFun.checkBusinessRecordAllData(1,selfconfess,supplyin,confess);
-        KprAimTapWaterBizFun.checkBusinessRecordOldAllData(1,selfconfess,supplyin,confess);
-        KprAimTapWaterBizFun.checkRecordAllDataBusinessFenqu(1);
-        //TODO 当前月预测15分水量数据
-        KprAimTapWaterBizFun.yuceZuojia(2);
-    }
+    //TODO 江津版本注释
+//    @Scheduled(cron="0 */10 * * * ?")
+//    public void everyShiwuWork(){
+//        KprAimTapWaterBizFun.checkBusinessRecordAllData(1,selfconfess,supplyin,confess);
+//        KprAimTapWaterBizFun.checkBusinessRecordOldAllData(1,selfconfess,supplyin,confess);
+//        KprAimTapWaterBizFun.checkRecordAllDataBusinessFenqu(1);
+//        //TODO 当前月预测15分水量数据
+//        KprAimTapWaterBizFun.yuceZuojia(2);
+//    }
 
     //TODO 每天整点0五分执行检查日水量是否对齐
     @Scheduled(cron = "0 5 * * * *")
@@ -246,11 +247,12 @@ public class ScheduleTaskMgr {
                 KprAimTapWaterBizFun.checkRecordAllData(2);
                 KprAimWaterCollecationBizFun.initPumpPowerZero();
                 KprAimWaterCollecationBizFun.insertYuceHourAddData(time,2);
-                KprAimTapWaterBizFun.checkBusinessRecordAllData(2,selfconfess,supplyin,confess);
-                KprAimTapWaterBizFun.checkBusinessRecordOldAllData(2,selfconfess,supplyin,confess);
-                KprAimTapWaterBizFun.checkRecordAllDataBusinessFenqu(2);
-                //TODO 当前月预测15分水量数据
-                KprAimTapWaterBizFun.yuceZuojia(3);
+                //TODO 江津版本要注释
+//                KprAimTapWaterBizFun.checkBusinessRecordAllData(2,selfconfess,supplyin,confess);
+//                KprAimTapWaterBizFun.checkBusinessRecordOldAllData(2,selfconfess,supplyin,confess);
+//                KprAimTapWaterBizFun.checkRecordAllDataBusinessFenqu(2);
+//                //TODO 当前月预测15分水量数据
+//                KprAimTapWaterBizFun.yuceZuojia(3);
                 KprAimWaterCollecationBizFun.insertYucePump(time);
                 Timer timer3=new Timer();
                 TimerTask timerTask3 = new TimerTask(){

src/main/resources/application.properties

@@ -69,15 +69,15 @@ 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_cqzls
-spring.datasource.primary.password=CQzls#2025
-spring.datasource.primary.driver-class-name=oracle.jdbc.driver.OracleDriver
+#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_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.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