河南郸城调度方案库查询增加字段

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

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