市自来水更新:

1.市自来水五个片区15分钟单位的实际数据采集
2.15分钟单位实际数据查询接口
3.15分钟单位预测数据查询接口
4.定时任务新增片区和分区站点的15分钟单位的数据采集,每五分钟获取一次
5.实现15分钟预测插值并实现拆分平滑处理

sql.properties

@@ -5,14 +5,14 @@ spring.datasource.data.password=kpr.23417.postgres
 spring.datasource.data.driver-class-name=org.postgis.DriverWrapper
 
 #pgsql Ë®Á¿Ô¤²âÊý¾Ý¿âÔ´
-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://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.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.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.username=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

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

@@ -49,7 +49,7 @@ public class KprAimTapWaterBizFun {
     static DateTimeFormatter formater = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
     //TODO 15分间隔的预测插值(做假暂时用,不用时注释)
     //TODO 思路:等预测小时的原程序完成后, 原预测表中为小时预测数据,分钟字段为空,将预测表中的数据进行二次清洗然后插入新预测表
-    //TODO beforeDays为往前推清洗多少天 n-1为逻辑, 例如传1就是0天当天
+    //TODO beforeDays为往后推清洗多少天 n-1为逻辑, 例如传1就是0天当天
     public static void yuceZuojia(int beforeDays){
         try{
             LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"预测15分钟插值开始时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));

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

@@ -108,7 +108,7 @@ public class ScheduleTaskMgr {
         KprAimTapWaterBizFun.checkBusinessRecordAllData(1,selfconfess,supplyin,confess);
         KprAimTapWaterBizFun.checkRecordAllDataBusinessFenqu(1);
         //TODO 当前月预测15分水量数据
-        KprAimTapWaterBizFun.yuceZuojia(1);
+        KprAimTapWaterBizFun.yuceZuojia(2);
     }
 
     //TODO 每天整点0五分执行检查日水量是否对齐
@@ -246,7 +246,7 @@ public class ScheduleTaskMgr {
                 KprAimTapWaterBizFun.checkBusinessRecordAllData(2,selfconfess,supplyin,confess);
                 KprAimTapWaterBizFun.checkRecordAllDataBusinessFenqu(2);
                 //TODO 当前月预测15分水量数据
-                KprAimTapWaterBizFun.yuceZuojia(2);
+                KprAimTapWaterBizFun.yuceZuojia(3);
                 KprAimWaterCollecationBizFun.insertYucePump(time);
                 Timer timer3=new Timer();
                 TimerTask timerTask3 = new TimerTask(){