自来水相关修改 预测小时数据逻辑变更

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

@@ -862,7 +862,7 @@ public class KprAimWaterCollecationBizFun {
             LocalDateTime startDate = LocalDateTime.now().withYear(Integer.valueOf(yearStr))
                     .withMonth(Integer.valueOf(monthStr)).withHour(0).withMinute(0).withSecond(0).withNano(0);
             //TODO 总体逻辑: 先查询指定月上一年的每日平均值,再按平均值的上下啊百分比去插入指定的浮动百分比数据
-            for (int i = 1;i<=3;i++){
+            for (int i = -2;i<=3;i++){
                 LocalDateTime dateNow = startDate.minusDays(-i);//当前循环时间
                  //TODO 数据库操作 A 调用对应时间预测接口 B 在修改实际值
                  DateTimeFormatter formatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd");

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

@@ -134,59 +134,44 @@ public class ScheduleTaskMgr {
 //    @PostConstruct
 //    public void initTest(){
 //        String time = LocalDateTime.now().minusYears(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
+//        Timer timer2 = new Timer();
+//        TimerTask timerTask1 = new TimerTask() {
+//            @Override
+//            public void run() {
+//                String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
+//
+//            }
+//        };
+//        timer2.schedule(timerTask1, 10000);
+//    }
+
+
+    //TODO 启动时执行一次 江津的就给注释掉
+//    @PostConstruct
+//    public void initOneTapWater(){
 //        Timer timer = new Timer();
 //        // 创建定时器任务
 //        TimerTask timerTask = new TimerTask() {
 //            @Override
 //            public void run() {
-////                KprAimTapWaterBizFun.checkRecordAllData();
-////                KprAimTapWaterBizFun.checkRecordData();
-//                String time = LocalDateTime.now().minusYears(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
-//                KprAimWaterCollecationBizFun.insertYuceDataScheduled(time);
-////                KprAimWaterCollecationBizFun.insertYuceDataScheduled(null);
+//                KprAimTapWaterBizFun.initTapWaterData();
 //            }
 //        };
-//        timer.schedule(timerTask, 5000);
+//        timer.schedule(timerTask, 10000); // 10秒后执行一次
+//    }
 //
-//        Timer timer2 = new Timer();
+//    @PostConstruct
+//    public void initWaterRecordAll(){
+//        Timer timer = new Timer();
 //        TimerTask timerTask1 = new TimerTask() {
 //            @Override
 //            public void run() {
-//                String time = LocalDateTime.now().minusYears(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
-//                KprAimWaterCollecationBizFun.insertYuceHourDataScheduled(time);
-////                KprAimWaterCollecationBizFun.insertYuceHourDataScheduled(null);
+//                KprAimTapWaterBizFun.initWaterCollecationReacordAll();
 //            }
 //        };
-//        timer2.schedule(timerTask1, 10000);
+//        timer.schedule(timerTask1,11000);//11秒后执行一次
 //    }
 
-
-    //TODO 启动时执行一次 江津的就给注释掉
-    @PostConstruct
-    public void initOneTapWater(){
-        Timer timer = new Timer();
-        // 创建定时器任务
-        TimerTask timerTask = new TimerTask() {
-            @Override
-            public void run() {
-                KprAimTapWaterBizFun.initTapWaterData();
-            }
-        };
-        timer.schedule(timerTask, 10000); // 10秒后执行一次
-    }
-
-    @PostConstruct
-    public void initWaterRecordAll(){
-        Timer timer = new Timer();
-        TimerTask timerTask1 = new TimerTask() {
-            @Override
-            public void run() {
-                KprAimTapWaterBizFun.initWaterCollecationReacordAll();
-            }
-        };
-        timer.schedule(timerTask1,11000);//11秒后执行一次
-    }
-
     @PostConstruct
     public void initWaterDay(){
         Timer timer = new Timer();
@@ -208,7 +193,7 @@ public class ScheduleTaskMgr {
             @Override
             public void run() {
                 String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
-                KprAimWaterCollecationBizFun.insertYuceHourData(time);
+//                KprAimWaterCollecationBizFun.insertYuceHourData(time);
                 KprAimWaterCollecationBizFun.insertYuceHourAddData(time);
                 KprAimWaterCollecationBizFun.insertYuceHourDataScheduled(time);//江津的给注释掉
             }