水量预测日数据接口和时数据接口查询 增加水厂id字段

src/main/java/com/shkpr/service/aimodelpower/jsonbean/zilaishui/JPTbMHourWater.java

@@ -7,6 +7,7 @@ import com.shkpr.service.aimodelpower.controllervalid.CommonParamValidList;
 import com.shkpr.service.aimodelpower.controllervalid.CommonParamValidSS;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
+import org.springframework.util.StringUtils;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -25,6 +26,8 @@ import java.time.temporal.TemporalAdjusters;
 public class JPTbMHourWater {
     private Boolean isPage = false;//是否分页 默认false
 
+    private String orgId;//水厂id
+
     @Range(min = 0, max = 65535, groups = {CommonParamValidList.class, CommonParamValidSS.class})
     private Integer limit = 20;//若分页 默认数为20
 
@@ -39,6 +42,9 @@ public class JPTbMHourWater {
     public boolean checkValid(){
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         StringBuilder strSql = new StringBuilder("");
+        if(!StringUtils.isEmpty(orgId)){
+            strSql.append(" AND orgId = '"+orgId+"'");
+        }
         if(queryDate==null){
             //TODO 说明前端没传,那么默认为今天
             LocalDateTime nowDate = LocalDateTime.now();//结束时间

src/main/java/com/shkpr/service/aimodelpower/jsonbean/zilaishui/JPTbMWater.java

@@ -7,6 +7,7 @@ import com.shkpr.service.aimodelpower.controllervalid.CommonParamValidList;
 import com.shkpr.service.aimodelpower.controllervalid.CommonParamValidSS;
 import lombok.Data;
 import org.hibernate.validator.constraints.Range;
+import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -23,6 +24,8 @@ import java.time.temporal.TemporalAdjusters;
 public class JPTbMWater {
     private Boolean isPage = false;//是否分页 默认false
 
+    private String orgId;//水厂id
+
     @Range(min = 0, max = 65535, groups = {CommonParamValidList.class, CommonParamValidSS.class})
     private Integer limit = 20;//若分页 默认数为20
 
@@ -42,6 +45,9 @@ public class JPTbMWater {
             return false;
         }
         StringBuilder strSql = new StringBuilder("");
+        if(!StringUtils.isEmpty(orgId)){
+            strSql.append(" AND orgId = '"+orgId+"'");
+        }
         if(startDate==null&&endDate==null){
             //TODO 说明前端没传,那么默认为当前月往前推到一号作为开始和结束条件
             LocalDateTime nowDate = LocalDateTime.now();//结束时间