江津/自来水 优化小时原始数据获取,修复小时数据计算bug

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

@@ -43,8 +43,8 @@ public class KprAimTapWaterBizFun {
         //TODO 检查小时用水量
         DateTimeFormatter formater = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
-        System.out.println("检查机制-计算小时用水量开始时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
-        System.out.println("检查机制-计算小时用水量进行中:......");
+        LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"检查机制-计算小时用水量开始时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+        LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"检查机制-计算小时用水量进行中:......");
         List<Map<String, Object>> configList = getWaterTapWaterApi().getWaterCollectionConfigList(null);
         if (!CollectionUtils.isEmpty(configList)) {
             //TODO 按照组织机构分组
@@ -73,7 +73,7 @@ public class KprAimTapWaterBizFun {
                             //TODO 查询当前天日期内每小时的设备数据
                             for (int i = 0; i < Integer.valueOf(String.valueOf(Duration.between(startDateTime, today.withMinute(0).withSecond(0)).toHours())); i++) {
                                 String startTime = newStartDateTime.minusHours(-i).format(formater);
-                                String endTime = newStartDateTime.minusHours(-(i + 1)).format(formater);
+                                String endTime = newStartDateTime.withHour(i).minusHours(-1).format(formater);
                                 Map<String, Object> recordAllEntity = new HashMap<>();//需要添加的实体数据
                                 recordAllEntity.put("org_name", key.toString());//水厂
                                 recordAllEntity.put("time", endTime);//采集时间(小时的最后时间)
@@ -181,7 +181,7 @@ public class KprAimTapWaterBizFun {
                 }catch(Exception ex){}
             }
             try{latch.await();}catch(Exception ex){}
-            System.out.println("检查机制-计算小时用水量结束时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"检查机制-计算小时用水量结束时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
         }
     }
 
@@ -194,8 +194,8 @@ public class KprAimTapWaterBizFun {
                 //声明总数据的数据数组
                 List<Map<String,Object>> newRecordAll = Collections.synchronizedList(new LinkedList<Map<String,Object>>());
                 //TODO ②开启多线程并发处理各水厂设备的数据
-                System.out.println("检查机制--开始时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
-                System.out.println("检查机制--进行中:......");
+                LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"检查机制--开始时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+                LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"检查机制--进行中:......");
                 final CountDownLatch latch = new CountDownLatch(configList.size());
                 for(Map<String,Object> item:configList){
                     try{
@@ -268,7 +268,7 @@ public class KprAimTapWaterBizFun {
                     }
                 }
                 latch.await();
-                System.out.println("检查机制--结束时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+                LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"检查机制--结束时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
             }
         }catch(Exception ex){
             LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_ERROR
@@ -288,8 +288,8 @@ public class KprAimTapWaterBizFun {
                 //声明总数据的数据数组
                 List<Map<String,Object>> newRecordAll = Collections.synchronizedList(new LinkedList<Map<String,Object>>());
                 //TODO ②开启多线程并发处理各水厂设备的数据
-                System.out.println("比对远通原始数据开始时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
-                System.out.println("进行中:......");
+                LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"比对远通原始数据开始时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+                LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"进行中:......");
                 final CountDownLatch latch = new CountDownLatch(configList.size());
                 LocalDateTime startTimeLocal = LocalDateTime.now().minusDays(1).minusHours(1);
                 for(Map<String,Object> item:configList){
@@ -358,7 +358,7 @@ public class KprAimTapWaterBizFun {
                     }
                 }
                 latch.await();
-                System.out.println("比对远通原始数据结束时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+                LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"比对远通原始数据结束时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
             }
         }catch(Exception ex){
             LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_ERROR
@@ -374,8 +374,8 @@ public class KprAimTapWaterBizFun {
         //TODO ① 首先查询水厂设备配置信息
         try {
 
-            System.out.println("计算小时用水量开始时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
-            System.out.println("计算小时用水量进行中:......");
+            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"计算小时用水量开始时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"计算小时用水量进行中:......");
             List<Map<String, Object>> configList = getWaterTapWaterApi().getWaterCollectionConfigList(null);
             if (!CollectionUtils.isEmpty(configList)) {
                 //TODO 按照组织机构分组
@@ -391,8 +391,10 @@ public class KprAimTapWaterBizFun {
                             public void function() {
                                 //TODO 根据当前配置信息item 查询远通数据中的历史数据
                                 //TODO 首先查询当前水厂设备的从2025-01-01之后到得到数据
-                                LocalDateTime startDateTime = LocalDateTime.now().withMinute(0).withSecond(0)
-                                        .minusDays(1).minusHours(1);
+//                                LocalDateTime startDateTime = LocalDateTime.now().withMinute(0).withSecond(0)
+//                                        .minusDays(1).minusHours(1);
+                                LocalDateTime startDateTime = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0)
+                                        .minusDays(3);
 
                                 //TODO 需计算的循环天数
                                 Long days = 0L;
@@ -416,7 +418,7 @@ public class KprAimTapWaterBizFun {
                                                 //TODO 查询当前天日期内每小时的设备数据
                                                 for (int i = 0; i < 24; i++) {
                                                     String startTime = newStartDateTime.withHour(i).format(formater);
-                                                    String endTime = newStartDateTime.minusHours(-(i + 1)).format(formater);
+                                                    String endTime = newStartDateTime.withHour(i).minusHours(-1).format(formater);
 
                                                     Map<String, Object> recordAllEntity = new HashMap<>();//需要添加的实体数据
                                                     recordAllEntity.put("org_name", key.toString());//水厂
@@ -544,7 +546,7 @@ public class KprAimTapWaterBizFun {
                     }
                 }
                 latch.await();
-                System.out.println("计算小时用水量结束时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+                LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"计算小时用水量结束时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
             }
         }catch(Exception ex){
             LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_ERROR
@@ -560,8 +562,8 @@ public class KprAimTapWaterBizFun {
         //TODO ① 首先查询水厂设备配置信息
         try {
 
-            System.out.println("添加小时泵数据开始时间:"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
-            System.out.println("添加小时泵数据起始时间:("+startFindTime+")进行中:......");
+            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加小时泵数据开始时间:"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加小时泵数据起始时间:("+startFindTime+")进行中:......");
             List<Map<String, Object>> configList = getWaterTapWaterApi().getWaterPumpCollectionConfigList(null);
             if (!CollectionUtils.isEmpty(configList)) {
                 //TODO 按照设备分组
@@ -599,7 +601,7 @@ public class KprAimTapWaterBizFun {
                                         for (int i = 0; i < 24; i++) {
                                             String startTime = newStartDateTime.withHour(i).format(formater);
                                             //TODO 需要加个05分把endTime的整点数据查出来
-                                            String endTime = newStartDateTime.minusHours(-(i + 1)).withMinute(5).withSecond(0).format(formater);
+                                            String endTime = newStartDateTime.withHour(i).minusHours(-1).withMinute(5).withSecond(0).format(formater);
                                             //TODO 此循环计算该小时所有设备的泵数据
                                             for (Map<String, Object> item : deviceList) {
                                                 // 定义字符串日期时间的格式
@@ -676,7 +678,7 @@ public class KprAimTapWaterBizFun {
                     }
                 }
                 latch.await();
-                System.out.println("添加小时泵数据检查机制("+startFindTime+")结束时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+                LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加小时泵数据检查机制("+startFindTime+")结束时间:"+TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
             }
         }catch(Exception ex){
             System.out.print(String.format("Batch initWaterCollecationReacordAll ERROR:{%s} "

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

@@ -859,7 +859,7 @@ public class KprAimWaterCollecationBizFun {
 
     //TODO 定时任务 定时调用水力模型预测接口,截止今天
     public static void insertYuceDayData(String monthNow){
-        System.out.println("添加预测日数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+        LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加预测日数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
         try {
             String yearStr = "";
             String monthStr = "";
@@ -908,14 +908,14 @@ public class KprAimWaterCollecationBizFun {
                                     ex.getLocalizedMessage()));
                 }
             }
-            System.out.println("添加预测日数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加预测日数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
         }catch(Exception ex){
             ex.printStackTrace();
         }
     }
     //TODO 截止到未来的今天+3
     public static void insertYuceDayAddData(String monthNow){
-        System.out.println("添加预测日数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+        LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加预测日数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
         try {
             String yearStr = "";
             String monthStr = "";
@@ -925,6 +925,10 @@ public class KprAimWaterCollecationBizFun {
             }
             LocalDateTime startDate = LocalDateTime.now().withYear(Integer.valueOf(yearStr))
                     .withMonth(Integer.valueOf(monthStr)).withHour(0).withMinute(0).withSecond(0).withNano(0);
+            List<Map<String,Object>> orgConfig = getWaterTapWaterApi().getOrgConfig(false,0,0," AND org_name not like '%水厂'");
+            if("water_volume_prediction_jiangjin2".equals(databaseName)){
+                orgConfig = getWaterTapWaterApi().getOrgConfig(false,0,0,"");
+            }
                 LocalDateTime dateNow = startDate;
                 //TODO 数据库操作 A 调用对应时间预测接口 B 在修改实际值
 
@@ -932,10 +936,13 @@ public class KprAimWaterCollecationBizFun {
                 String dateStr = dateNow.withYear(LocalDateTime.now().getYear()).toLocalDate().format(formatter2);
 
                 //TODO A
+            for (Map<String,Object> config:orgConfig) {
                 JP3TPDay tpDay = new JP3TPDay();
-                tpDay.setOrgId("");
+                tpDay.setOrgId(config.get("org_id").toString());
                 tpDay.setSdate(dateStr);
-                tpDay.setEndate(dateNow.minusDays(-3).toLocalDate().format(formatter2));
+//                tpDay.setEndate(dateNow.minusDays(-3).toLocalDate().format(formatter2));
+                //TODO 预测模型的逻辑是预测当前天往后+3天
+                tpDay.setEndate(dateNow.minusDays(0).toLocalDate().format(formatter2));
                 try {
                     LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO
                             , mStrClassName
@@ -957,7 +964,8 @@ public class KprAimWaterCollecationBizFun {
                             , String.format("预测日数据" + dateStr + "调用异常 ERROR:{%s} ",
                                     ex.getLocalizedMessage()));
                 }
-            System.out.println("添加预测日数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+            }
+            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加预测日数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
         }catch(Exception ex){
             ex.printStackTrace();
         }
@@ -965,7 +973,7 @@ public class KprAimWaterCollecationBizFun {
 
     //TODO 定时任务 定时调用水力模型小时预测接口,截止今天
     public static void insertYuceHourData(String monthNow){
-        System.out.println("添加预测小时数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+        LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加预测小时数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
         try {
             //先获取配置项 根据配置项来进行逻辑添加
             String yearStr = "";
@@ -1012,14 +1020,14 @@ public class KprAimWaterCollecationBizFun {
                                      ex.getLocalizedMessage()));
                  }
             }
-            System.out.println("调用预测模型小时数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"调用预测模型小时数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
         }catch(Exception ex){
             ex.printStackTrace();
         }
     }
     //TODO 截止到未来的今天+3
     public static void insertYuceHourAddData(String monthNow){
-        System.out.println("添加预测小时数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+        LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加预测小时数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
         try {
             //先获取配置项 根据配置项来进行逻辑添加
             String yearStr = "";
@@ -1068,7 +1076,7 @@ public class KprAimWaterCollecationBizFun {
                     }
                 }
             }
-            System.out.println("调用预测模型小时数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"调用预测模型小时数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
         }catch(Exception ex){
             ex.printStackTrace();
         }
@@ -1076,7 +1084,7 @@ public class KprAimWaterCollecationBizFun {
 
     //TODO 跑+1天
     public static void insertYucePump(String monthNow){
-        System.out.println("添加预测泵组优化小时数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+        LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加预测泵组优化小时数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
         try {
             //先获取配置项 根据配置项来进行逻辑添加
             String yearStr = "";
@@ -1123,7 +1131,7 @@ public class KprAimWaterCollecationBizFun {
                      }
                  }
             }
-            System.out.println("调用预测模型泵组优化小时数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"调用预测模型泵组优化小时数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
         }catch(Exception ex){
             ex.printStackTrace();
         }
@@ -1132,7 +1140,7 @@ public class KprAimWaterCollecationBizFun {
     //TODO 跑泵组数据插入预测实际值
     public static void insertYucePumpReal(String monthNow,int monthDay){
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        System.out.println("添加实际值");
+        LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加实际值");
         try {
             //先获取配置项 根据配置项来进行逻辑添加
             String yearStr = "";
@@ -1173,7 +1181,7 @@ public class KprAimWaterCollecationBizFun {
                     }
                 }
             }
-            System.out.println("泵数据实际值修改完成");
+            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"泵数据实际值修改完成");
         }catch(Exception ex){
             ex.printStackTrace();
         }
@@ -1181,7 +1189,7 @@ public class KprAimWaterCollecationBizFun {
 
     //TODO 定时任务 定时添加预测数据 废弃
     public static void insertYuceDataScheduled(String monthNow){
-        System.out.println("添加预测日数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+        LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加预测日数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
         try {
             //先获取配置项 根据配置项来进行逻辑添加
             List<Map<String, Object>> configRes = getWaterTapWaterApi().getWaterYuceConfig(false, 0, 0, "");
@@ -1374,7 +1382,7 @@ public class KprAimWaterCollecationBizFun {
                         }
                         try{latch.await();}catch(Exception ex){}
                     }
-                    System.out.println("添加预测日数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+                    LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加预测日数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
                 }else{
 
                 }
@@ -1386,7 +1394,7 @@ public class KprAimWaterCollecationBizFun {
 
     //TODO 定时任务 定时添加小时预测数据 转变为之做假泵数据
     public static void insertYuceHourDataScheduled(String monthNow){
-        System.out.println("添加预测小时数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+        LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加预测小时数据正在进行"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
         try {
             //先获取配置项 根据配置项来进行逻辑添加
             List<Map<String, Object>> configRes = getWaterTapWaterApi().getWaterYuceConfig(false, 0, 0, "");
@@ -1602,7 +1610,7 @@ public class KprAimWaterCollecationBizFun {
                         }
                         try{latch.await();}catch(Exception ex){}
                     }
-                    System.out.println("添加预测小时数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
+                    LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"添加预测小时数据结束"+ TimeTool.convertUTC2DateStr(TimeTool.getCurMsUTC(),TimeTool.TIMESTAMP_FORMAT));
                 }else{
 
                 }
@@ -1701,7 +1709,7 @@ public class KprAimWaterCollecationBizFun {
     public static void initPumpPowerZero(){
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         //TODO 首先查询出所有的设备
-        System.out.println("计算原始小时数据的用电量....");
+        LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"计算原始小时数据的用电量....");
         List<Map<String, Object>> configList = getWaterTapApi().getWaterPumpCollectionConfigList("");
         List<Map<String, Object>> energyList = getWaterTapApi().getWatertPumpEnergy("");
         if (!CollectionUtils.isEmpty(configList) && !CollectionUtils.isEmpty(energyList)) {
@@ -1758,14 +1766,14 @@ public class KprAimWaterCollecationBizFun {
                         currentRecord.put("power_cons", powerConsumption);
                         int res = getWaterTapApi().insertOrUpdateWaterPumpRecordAll(currentRecord);
                         if (res <= 0) {
-                            System.out.println("修改小时用电量失败");
+                            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"修改小时用电量失败");
                         }
                     }
                 } catch (Exception ex) {
 
                 }
             }
-            System.out.println("修改小时用电量完成");
+            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.LOG_INFO,mStrClassName, mStrClassName,"修改小时用电量完成");
         }
 
     }

src/main/java/com/shkpr/service/aimodelpower/dbdao/shizilaishuiDataSource/service/WaterCollecationServiceImpl.java

@@ -132,11 +132,11 @@ public class WaterCollecationServiceImpl implements WaterCollecationService{
             
             
         }finally {
-            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.valueFromInt(nCode)
-                    , LogFlagBusiType.BUSI_CHILD_DB_TAP_WATER.toStrValue()
-                    , mStrClassName
-                    , String.format("Batch Query getTbMHourwaterWatersupply from database, code:{%d} msg:{%s} ..."
-                            , nCode, strMsg));
+//            LogPrintMgr.getInstance().printLogMsg(LogLevelFlag.valueFromInt(nCode)
+//                    , LogFlagBusiType.BUSI_CHILD_DB_TAP_WATER.toStrValue()
+//                    , mStrClassName
+//                    , String.format("Batch Query getTbMHourwaterWatersupply from database, code:{%d} msg:{%s} ..."
+//                            , nCode, strMsg));
         }
         return arrRes;
     }

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

@@ -218,14 +218,28 @@ public class ScheduleTaskMgr {
             public void run() {
                 KprAimTapWaterBizFun.checkRecordAllData();
                 String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
-                KprAimWaterCollecationBizFun.insertYuceDayAddData(time);
-                KprAimWaterCollecationBizFun.insertYuceHourAddData(time);
+                Timer timer3=new Timer();
+                Timer timer4=new Timer();
+                TimerTask timerTask3 = new TimerTask(){
+                    @Override
+                    public void run() {
+                        KprAimWaterCollecationBizFun.insertYuceDayAddData(time);
+                    }
+                };
+                timer3.schedule(timerTask3,1000);
+                TimerTask timerTask4 = new TimerTask(){
+                    @Override
+                    public void run() {
+                        KprAimWaterCollecationBizFun.insertYuceHourAddData(time);
+                    }
+                };
+                timer4.schedule(timerTask4,1000);
             }
         };
         timer2.schedule(timerTask2,11000);//11秒后执行一次
     }
     //TODO 启动时跑今天泵的数据,江津的先注释
-    /*@PostConstruct
+    @PostConstruct
     public void initPumpFourDay(){
         Timer timer = new Timer();
         TimerTask timerTask1 = new TimerTask() {
@@ -254,10 +268,10 @@ public class ScheduleTaskMgr {
             }
         };
         timer.schedule(timerTask1,9000);//9秒后执行一次
-    }*/
+    }
 
 //    TODO 自来水的注释以下俩方法initPumpRecordAll checkPumpRecordAll
-    @PostConstruct
+    /*@PostConstruct
     public void initPumpRecordAll(){
         new Timer().schedule(new TimerTask() {
             @Override
@@ -285,7 +299,7 @@ public class ScheduleTaskMgr {
                 KprAimTapWaterBizFun.initWaterPumpReacordAll(formattedDate);
             }
         },5000);
-    }
+    }*/
 
     @PostConstruct
     public void initDatabaseName(){

src/main/resources/application.properties

@@ -69,8 +69,11 @@ global.sql.config.path=./sql.properties
 
 # oracleÊý¾ÝÔ´
 spring.datasource.primary.url=jdbc:oracle:thin:@10.127.16.117:1521/ORCLPDB1
-spring.datasource.primary.username=v_cqzls
-spring.datasource.primary.password=CQzls#2025
+#spring.datasource.primary.username=v_cqzls
+#spring.datasource.primary.password=CQzls#2025
+#spring.datasource.primary.driver-class-name=oracle.jdbc.driver.OracleDriver
+spring.datasource.primary.username=v_shizilaishui
+spring.datasource.primary.password=ShiZiLaiShui@0811
 spring.datasource.primary.driver-class-name=oracle.jdbc.driver.OracleDriver
 #spring.datasource.primary.username=v_jiangjin
 #spring.datasource.primary.password=JiangJin@1127