水量调度对接实际预测接口数据

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

@@ -299,13 +299,13 @@ public class WaterZILAISHUIDao {
             String sql = "INSERT INTO tb_m_hourwater " +
                     "(\"Date\",\"Hour\"";
             if(!ObjectUtils.isEmpty(value.get("HourForecastWaterWithdrawals"))){
-                sql +=  " , \"HourForecastWaterWithdrawals\" =  '"+value.get("HourForecastWaterWithdrawals")+"' ";
+                sql +=  " , \"HourForecastWaterWithdrawals\" ";
             }
             if(!ObjectUtils.isEmpty(value.get("HourForecastActualWaterSupply"))){
-                sql +=  " ,\"HourForecastActualWaterSupply\" =  '"+value.get("HourForecastActualWaterSupply")+"' ";
+                sql +=  " ,\"HourForecastActualWaterSupply\"";
             }
             if(!ObjectUtils.isEmpty(value.get("HourActualWaterWithdrawals"))){
-                sql +=  " , \"HourActualWaterWithdrawals\" =  '"+value.get("HourActualWaterWithdrawals")+"' ";
+                sql +=  " , \"HourActualWaterWithdrawals\"";
             }
 //            if(!ObjectUtils.isEmpty(value.get("HourActualWaterSupply"))){
                 sql +=  " , \"HourActualWaterSupply\"";
@@ -361,8 +361,11 @@ public class WaterZILAISHUIDao {
     public int insertOrUpdateTbmHourwaterWatersupply(Map<String,Object> value){
         try{
             String sql = "INSERT INTO tb_m_hourwater_watersupply " +
-                    "(\"Date\",\"Hour\",\"PumpID\",\"PumpStatus\",\"HourForecastActualWaterSupply\"," +
-                    " \"PumpWater\",\"RealPumpStatus\",\"PumpEnergy\",\"RealPumpEnergy\",\"LastModifyTime\",\"orgId\" ) VALUES ";
+                    "(\"Date\",\"Hour\",\"PumpID\",\"PumpStatus\",";
+            if(!ObjectUtils.isEmpty(value.get("HourForecastActualWaterSupply"))){
+                sql +=  "\"HourForecastActualWaterSupply\" ,";
+            }
+            sql+= "\"PumpWater\",\"RealPumpStatus\",\"PumpEnergy\",\"RealPumpEnergy\",\"LastModifyTime\",\"orgId\" ) VALUES ";
             sql +=" ( ";
             int i = 1;
             for (Object key : value.keySet()){

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

@@ -114,20 +114,20 @@ public class ScheduleTaskMgr {
         KprAimTapWaterBizFun.checkRecordData();
     }
 
-    //TODO 每天整点的15分执行配置月预测日数据
+    //TODO 每天整点的15分执行配置月预测日数据(目前实际上是先调对应日期的实际预测接口在去调修改实际数据的逻辑)
     @Scheduled(cron = "0 15 * * * *")
 //    @Scheduled(cron = "0 0/1 * * * ?")
     public void executeTbMWater() {
         KprAimWaterCollecationBizFun.insertYuceDataScheduled(null);
     }
 
-    //TODO 每天整点的16分执行配置月预测日小时数据
+    //TODO 每天每小时的16分执行配置月预测日小时数据(目前实际上是先调对应日期的实际预测接口在去调修改实际数据的逻辑)
     @Scheduled(cron = "0 16 * * * *")
     public void executeTbMHourWater() {
         KprAimWaterCollecationBizFun.insertYuceHourDataScheduled(null);
     }
 
-    //TODO 每天整点的15分执行当前月预测日数据
+    //TODO 每天每小时的20分执行当前月预测日数据
     @Scheduled(cron = "0 20 * * * *")
 //    @Scheduled(cron = "0 0/1 * * * ?")
     public void executeTbMWaterNow() {
@@ -135,7 +135,7 @@ public class ScheduleTaskMgr {
         KprAimWaterCollecationBizFun.insertYuceDataScheduled(time);
     }
 
-    //TODO 每天整点的16分执行预测当前月日小时数据
+    //TODO 每天每小时的21分执行预测当前月日小时数据
     @Scheduled(cron = "0 21 * * * *")
     public void executeTbMHourWaterNow() {
         String time = LocalDateTime.now().minusYears(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
@@ -153,6 +153,7 @@ public class ScheduleTaskMgr {
 //            public void run() {
 ////                KprAimTapWaterBizFun.checkRecordAllData();
 ////                KprAimTapWaterBizFun.checkRecordData();
+//                String time = LocalDateTime.now().minusYears(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
 //                KprAimWaterCollecationBizFun.insertYuceDataScheduled(time);
 //            }
 //        };
@@ -162,7 +163,8 @@ public class ScheduleTaskMgr {
 //        TimerTask timerTask1 = new TimerTask() {
 //            @Override
 //            public void run() {
-//                KprAimWaterCollecationBizFun.insertYuceHourDataScheduled(null);
+//                String time = LocalDateTime.now().minusYears(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
+//                KprAimWaterCollecationBizFun.insertYuceHourDataScheduled(time);
 //            }
 //        };
 //        timer2.schedule(timerTask1, 10000);