市自来水更新:

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

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

@@ -104,14 +104,14 @@ public class ScheduleTaskMgr {
     }
 
     //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);
-//    }
+    @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 * * * *")
@@ -244,16 +244,16 @@ public class ScheduleTaskMgr {
             @Override
             public void run() {
                 //TODO 实际调用调度模型的接口
-                KprAimTapWaterBizFun.checkRecordAllData(2);
-                KprAimWaterCollecationBizFun.initPumpPowerZero();
-                KprAimWaterCollecationBizFun.insertYuceHourAddData(time,2);
+                KprAimTapWaterBizFun.checkRecordAllData(96);
+                KprAimWaterCollecationBizFun.insertYuceHourAddData(time,3);
                 //TODO 江津版本要注释
-                KprAimTapWaterBizFun.checkBusinessRecordAllData(2,selfconfess,supplyin,confess);
-                KprAimTapWaterBizFun.checkBusinessRecordOldAllData(2,selfconfess,supplyin,confess);
-                KprAimTapWaterBizFun.checkRecordAllDataBusinessFenqu(2);
+                KprAimTapWaterBizFun.checkBusinessRecordAllData(96,selfconfess,supplyin,confess);
+                KprAimTapWaterBizFun.checkBusinessRecordOldAllData(96,selfconfess,supplyin,confess);
+                KprAimTapWaterBizFun.checkRecordAllDataBusinessFenqu(96);
                 //TODO 当前月预测15分水量数据
                 KprAimTapWaterBizFun.yuceZuojia(4);
-                KprAimWaterCollecationBizFun.insertYucePump(time);
+                KprAimWaterCollecationBizFun.initPumpPowerZero();
+//                KprAimWaterCollecationBizFun.insertYucePump(time);
                 Timer timer3=new Timer();
                 TimerTask timerTask3 = new TimerTask(){
                     @Override