Quellcode durchsuchen

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

1037015548@qq.com vor 1 Monat
Ursprung
Commit
3a0c9b48dc

+ 2 - 2
src/main/java/com/shkpr/service/aimodelpower/bizmgr/KprAimTapWaterBizFun.java

@@ -399,7 +399,7 @@ public class KprAimTapWaterBizFun {
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             // 解析字符串以创建 LocalDateTime 实例
             // 解析字符串以创建 LocalDateTime 实例
             LocalDateTime dateTime = LocalDateTime.parse(endTime, formatter);
             LocalDateTime dateTime = LocalDateTime.parse(endTime, formatter);
-            if (dateTime.getHour()==1&&("OPC_SC.HSS.HSS1.AI.LJLL1.F_CV".equals(tagTag) ||
+            if (dateTime.getHour()==0&&dateTime.getMinute()==16&&("OPC_SC.HSS.HSS1.AI.LJLL1.F_CV".equals(tagTag) ||
                     "OPC_SC.HSS.HSS1.AI.LJLL2.F_CV".equals(tagTag) ||
                     "OPC_SC.HSS.HSS1.AI.LJLL2.F_CV".equals(tagTag) ||
                     "OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(tagTag))) {
                     "OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(tagTag))) {
                 Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
                 Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
@@ -498,7 +498,7 @@ public class KprAimTapWaterBizFun {
                                     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                                     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                                     // 解析字符串以创建 LocalDateTime 实例
                                     // 解析字符串以创建 LocalDateTime 实例
                                     LocalDateTime dateTime = LocalDateTime.parse(endTime, formatter);
                                     LocalDateTime dateTime = LocalDateTime.parse(endTime, formatter);
-                                    if (dateTime.getHour()==1&&("OPC_SC.HSS.HSS1.AI.LJLL1.F_CV".equals(item.get("collcation_tag").toString()) ||
+                                    if (dateTime.getHour()==0&&dateTime.getMinute()==16&&("OPC_SC.HSS.HSS1.AI.LJLL1.F_CV".equals(item.get("collcation_tag").toString()) ||
                                             "OPC_SC.HSS.HSS1.AI.LJLL2.F_CV".equals(item.get("collcation_tag").toString()) ||
                                             "OPC_SC.HSS.HSS1.AI.LJLL2.F_CV".equals(item.get("collcation_tag").toString()) ||
                                             "OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(item.get("collcation_tag").toString()))) {
                                             "OPC_SC.HSS.HSS1.AI.LJLL3.F_CV".equals(item.get("collcation_tag").toString()))) {
                                         Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(
                                         Integer itemCount = getWaterTapWaterApi().getTabWaterHistoryCount(

+ 5 - 4
src/main/java/com/shkpr/service/aimodelpower/globalmgr/ScheduleTaskMgr.java

@@ -163,20 +163,21 @@ public class ScheduleTaskMgr {
 //    @Value("${waterbusiness.confess}")
 //    @Value("${waterbusiness.confess}")
     private String confess = "沙坪坝营业所{SPBYGS_BMD.LLJ.LJLL,SPBYGS_XZFZL_DN400.050.ZLJLL,SPBYGS_HYL_DN700.IFC050.ZLJLL,YZSC_LZB_LLJ.YZSC_LZB_LLJ.LJLL},九龙坡营业所{JLPYGS_LQL_DN400.IFC050.ZLJLL,YZQSC.HSXEJ.LJLL,JLPYGS_LHXQ.IFC050.DN700_LJLL1},大渡口营业所{JLPYGS_LHXQ.IFC050.DN600_LJLL1,JLPYGS_RL_DN700.IFC050.ZLJLL}";
     private String confess = "沙坪坝营业所{SPBYGS_BMD.LLJ.LJLL,SPBYGS_XZFZL_DN400.050.ZLJLL,SPBYGS_HYL_DN700.IFC050.ZLJLL,YZSC_LZB_LLJ.YZSC_LZB_LLJ.LJLL},九龙坡营业所{JLPYGS_LQL_DN400.IFC050.ZLJLL,YZQSC.HSXEJ.LJLL,JLPYGS_LHXQ.IFC050.DN700_LJLL1},大渡口营业所{JLPYGS_LHXQ.IFC050.DN600_LJLL1,JLPYGS_RL_DN700.IFC050.ZLJLL}";
     //TODO 启动时执行 测试方法
     //TODO 启动时执行 测试方法
-    /*@PostConstruct
+    @PostConstruct
     public void initTest(){
     public void initTest(){
         String time = LocalDateTime.now().minusYears(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
         String time = LocalDateTime.now().minusYears(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
         Timer timer2 = new Timer();
         Timer timer2 = new Timer();
         TimerTask timerTask1 = new TimerTask() {
         TimerTask timerTask1 = new TimerTask() {
             @Override
             @Override
             public void run() {
             public void run() {
+                KprAimTapWaterBizFun.checkRecordAllDataBusinessFenqu(18);
             }
             }
         };
         };
         timer2.schedule(timerTask1, 5000);
         timer2.schedule(timerTask1, 5000);
-    }*/
+    }
 
 
 
 
-    //TODO 启动时执行一次一年的小时水量和原始水量数据
+    /*//TODO 启动时执行一次一年的小时水量和原始水量数据
     @PostConstruct
     @PostConstruct
     public void initOneTapWater(){
     public void initOneTapWater(){
         Timer timer = new Timer();
         Timer timer = new Timer();
@@ -259,7 +260,7 @@ public class ScheduleTaskMgr {
             }
             }
         };
         };
         timer.schedule(timerTask1,9000);//9秒后执行一次
         timer.schedule(timerTask1,9000);//9秒后执行一次
-    }
+    }*/
 
 
 //    TODO 自来水的注释以下俩方法initPumpRecordAll checkPumpRecordAll
 //    TODO 自来水的注释以下俩方法initPumpRecordAll checkPumpRecordAll
     /*@PostConstruct
     /*@PostConstruct