市自来水更新:

1.更改泵组优化接口调用预测时间增加未来一天
2.增加营业片区小时实际用水量数据定时任务
3.更改预测的组织机构条件范围查新

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

@@ -1344,7 +1344,7 @@ 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 '%水厂'");
+            List<Map<String,Object>> orgConfig = getWaterTapWaterApi().getOrgConfig(false,0,0," AND org_name != '井口水厂' AND org_name != '丰收坝水厂' AND org_name != '沙坪坝水厂' AND org_name != '北碚红工水厂' AND org_name != '大溪沟水厂' ");
             if("water_volume_prediction_jiangjin2".equals(databaseName)){
                 orgConfig = getWaterTapWaterApi().getOrgConfig(false,0,0,"");
             }
@@ -1458,7 +1458,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 总体逻辑: 先查询指定月上一年的每日平均值,再按平均值的上下啊百分比去插入指定的浮动百分比数据
-            List<Map<String,Object>> orgConfig = getWaterTapWaterApi().getOrgConfig(false,0,0," AND org_name not like '%水厂'");
+            List<Map<String,Object>> orgConfig = getWaterTapWaterApi().getOrgConfig(false,0,0," AND org_name != '井口水厂' AND org_name != '丰收坝水厂' AND org_name != '沙坪坝水厂' AND org_name != '北碚红工水厂' AND org_name != '大溪沟水厂' ");
             if("water_volume_prediction_jiangjin2".equals(databaseName)){
                 orgConfig = getWaterTapWaterApi().getOrgConfig(false,0,0,"");
             }
@@ -1515,7 +1515,7 @@ 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 '%水厂'");
+            List<Map<String,Object>> orgConfig = getWaterTapWaterApi().getOrgConfig(false,0,0,"  AND org_name != '井口水厂' AND org_name != '丰收坝水厂' AND org_name != '沙坪坝水厂' AND org_name != '北碚红工水厂' AND org_name != '大溪沟水厂' ");
             if("water_volume_prediction_jiangjin2".equals(databaseName)) {
                 orgConfig = getWaterTapWaterApi().getOrgConfig(false, 0, 0,"");
             }