河南郸城调度方案库

src/main/java/com/shkpr/service/aimodelpower/jsonbean/woDispatchDatabase/JPDispatchDatabaseInfoSS.java

@@ -39,7 +39,7 @@ public class JPDispatchDatabaseInfoSS extends JPPageLO {
     private String param2;//复合参数名
 
     private String temperature;//气温范围(如 0~30)
-    private String daily_water_supply;//日供水量
+    private String dailyWaterSupply;//日供水量
 
     private Long startDate;//开始日期 (实际时间为 年 月 日(就为当月的一号),时分秒为 00:00:00,如2023-03-01 00:00:00)
 
@@ -145,8 +145,8 @@ public class JPDispatchDatabaseInfoSS extends JPPageLO {
                     " AND max_temp >= " + jsonArray.getDouble(0) +")"+//交集
             ")");
         }
-        if(!StringUtils.isEmpty(daily_water_supply)){
-            JSONArray jsonArray = JSONArray.parseArray(daily_water_supply);
+        if(!StringUtils.isEmpty(dailyWaterSupply)){
+            JSONArray jsonArray = JSONArray.parseArray(dailyWaterSupply);
             str.append(" AND (" +
                     "(min_water <= " + jsonArray.getDouble(0)+ " AND max_water >= " + jsonArray.getDouble(1)+")"+//包含
                     " OR " +

src/main/java/com/shkpr/service/aimodelpower/jsonbean/woDispatchDatabase/JPDispatchDatabaseInfoSave.java

@@ -34,6 +34,9 @@ public class JPDispatchDatabaseInfoSave {
     @Size(min = 0,max = 255, groups = { CommonParamValidNew.class})
     private String temperature;//				适用气温(气温范围 如 0~30) 单位℃
 
+    @Size(min = 0,max = 255, groups = { CommonParamValidNew.class})
+    private String dailyWaterSupply;//日供水量
+
     @Size(min = 0,max = 1024, groups = { CommonParamValidNew.class})
     private String param1;//				复合参数1
 
@@ -80,6 +83,21 @@ public class JPDispatchDatabaseInfoSave {
                 return false;
             }
         }
+        if(!StringUtils.isEmpty(dailyWaterSupply)){
+            //TODO 说明传递了气温范围数组
+            try {
+                JSONArray jsonArray = JSONArray.parseArray(dailyWaterSupply);
+                if(jsonArray==null||jsonArray.size()!=2){
+                    return false;
+                }
+                if (jsonArray.getDouble(0)>=jsonArray.getDouble(1)){
+                    return false;
+                }
+            }catch(Exception ex){
+                //TODO 说明异常则返回false
+                return false;
+            }
+        }
         if(!CollectionUtils.isEmpty(dispoalList)){
             if(dispoalList.stream().anyMatch(x -> !x.checkValid())){
                 return false;

src/main/java/com/shkpr/service/aimodelpower/jsonbean/woDispatchDatabase/JPDispatchDatabaseInfoUpdate.java

@@ -40,6 +40,9 @@ public class JPDispatchDatabaseInfoUpdate {
     @StrNullOrSize(min = 0,max = 255, groups = { CommonParamValidReset.class})
     private String temperature = null;//				适用气温(气温范围 如 0~30) 单位℃
 
+    @StrNullOrSize(min = 0,max = 255, groups = { CommonParamValidReset.class})
+    private String dailyWaterSupply = null;//				日供水量
+
     @StrNullOrSize(min = 0,max = 1024, groups = { CommonParamValidReset.class})
     private String param1 = null;//				复合参数1
 
@@ -88,6 +91,21 @@ public class JPDispatchDatabaseInfoUpdate {
                 return false;
             }
         }
+        if(!StringUtils.isEmpty(dailyWaterSupply)){
+            //TODO 说明传递了气温范围数组
+            try {
+                JSONArray jsonArray = JSONArray.parseArray(dailyWaterSupply);
+                if(jsonArray==null||jsonArray.size()!=2){
+                    return false;
+                }
+                if (jsonArray.getDouble(0)>=jsonArray.getDouble(1)){
+                    return false;
+                }
+            }catch(Exception ex){
+                //TODO 说明异常则返回false
+                return false;
+            }
+        }
         if(!CollectionUtils.isEmpty(dispoalList)){
             if(dispoalList.stream().anyMatch(x -> !x.checkValid())){
                 return false;