市自来水更新:

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

src/main/java/com/shkpr/service/aimodelpower/bizmgr/KprAimTapWaterBizFun.java

@@ -64,8 +64,9 @@ public class KprAimTapWaterBizFun {
                     public void function() {
                         try {
                             for (int dayNum=0;dayNum<beforeDays;dayNum++) {
+                                String dateStr =  startDate.minusDays(-dayNum).format(formatter);
                                 List<Map<String, Object>> resHourList = getWaterCollecationApi().getTbMHourwater(false,
-                                        20, 0, " AND \"orgId\" = '" + org.get("org_id") + "' AND \"Date\" = '" + startDate.minusDays(-dayNum).format(formatter) + "' ORDER BY \"Date\",\"Hour\" ASC ");
+                                        20, 0, " AND \"orgId\" = '" + org.get("org_id") + "' AND \"Date\" = '" + dateStr + "' ORDER BY \"Date\",\"Hour\" ASC ");
                                 processWaterData(resHourList);
                             }
                             latch.countDown();
@@ -147,6 +148,7 @@ public class KprAimTapWaterBizFun {
                     // For example:
                     double originalValue = queryOriginalValue(quarterHourTime);
                     newMap.put("HourActualWaterSupply", originalValue);
+                    newMap.put("LastModifyTime", LocalDateTime.now().format(DateTimeFormatter.ofPattern(TimeTool.TIMESTAMP_FORMAT)));
 
                     // Retain only specific keys
                     Map<String, Object> filteredMap = filterMap(newMap, "Date", "Hour", "HourForecastActualWaterSupply", "HourActualWaterSupply", "LastModifyTime", "orgId");

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

@@ -252,7 +252,7 @@ public class ScheduleTaskMgr {
                 KprAimTapWaterBizFun.checkBusinessRecordOldAllData(2,selfconfess,supplyin,confess);
                 KprAimTapWaterBizFun.checkRecordAllDataBusinessFenqu(2);
                 //TODO 当前月预测15分水量数据
-                KprAimTapWaterBizFun.yuceZuojia(3);
+                KprAimTapWaterBizFun.yuceZuojia(4);
                 KprAimWaterCollecationBizFun.insertYucePump(time);
                 Timer timer3=new Timer();
                 TimerTask timerTask3 = new TimerTask(){