nwp查询时间范围与参数控制关联

backend/src/main/java/com/jiayue/ssi/controller/NwpController.java

@@ -9,6 +9,7 @@ import com.jiayue.ssi.entity.ForecastPowerShortTerm;
 import com.jiayue.ssi.entity.Nwp;
 import com.jiayue.ssi.service.ForecastPowerShortTermService;
 import com.jiayue.ssi.service.NwpService;
+import com.jiayue.ssi.service.SysParameterService;
 import com.jiayue.ssi.util.ResponseVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -33,6 +34,8 @@ import java.util.Map;
 public class NwpController {
     @Autowired
     NwpService nwpService;
+    @Autowired
+    SysParameterService sysParameterService;
 
     /**
      * 获取短期分页信息
@@ -69,6 +72,31 @@ public class NwpController {
             else{
                 return ResponseVO.fail("pageSize不能是空！");
             }
+            if (NumberUtil.isLong(startTime) && NumberUtil.isLong(endTime)){
+                if (Long.parseLong(endTime)-Long.parseLong(startTime)<0){
+                    return ResponseVO.fail("开始时间大于截止时间！");
+                }
+            }
+            else {
+                return ResponseVO.fail("查询时间不正确！");
+            }
+
+            int day = 3;
+            String ycMaxDay = sysParameterService.queryByKey("YC_MAX_DAY","3");
+            if (NumberUtil.isInteger(ycMaxDay)){
+                day = Integer.parseInt(ycMaxDay);
+                if (day<1 || day>7){
+                    return ResponseVO.fail("获取参数中预测最大天数应该是1-7天之间");
+                }
+            }
+            else{
+                return ResponseVO.fail("预测查询最大天数不是整型数值！");
+            }
+
+            // 页面日期天数是否<=参数值
+            if (Long.parseLong(endTime)-Long.parseLong(startTime)> 60 * 60 * 24 * 1000*day){
+                return ResponseVO.fail("最多查询"+day+"天的数据哦！");
+            }
 
             QueryWrapper<Nwp> wrapper = new QueryWrapper<>();
             if (StringUtils.isNotEmpty(startTime)) {

ui/src/views/bizManager/nwp/index.vue

@@ -112,12 +112,15 @@ export default {
     }
   },
   created () {
+    // 获取后端业务参数
+
+
   },
   mounted() {
     this.queryStartTime = this.startTime
     this.queryEndTime = this.endTime
-    this.getDraw()
-    this.getTable()
+    // this.getDraw()
+    // this.getTable()
 
   },
   methods:{
@@ -160,8 +163,15 @@ export default {
       }
       await this.$axios.get('/nwpController/getAll',
         {params: searchParams}).then((res) => {
-        this.tableData = res.data.records
-        this.total = res.data.total
+          if (res.code=='0'){
+            this.tableData = res.data.records
+            this.total = res.data.total
+            this.getDraw()
+          }
+          else if (res.code=='1'){
+            this.$message.error(res.data)
+            return
+          }
       }).catch((error) => {
         // this.$message.error(error)
       })
@@ -222,19 +232,19 @@ export default {
         this.loading = false
         return
       }
-      if(this.endTime-this.startTime> 60 * 60 * 24 * 1000*3){
-        // this.startTime = this.queryStartTime
-        // this.endTime = this.queryEndTime
-        this.$message.error("只能最多查询3天的数据哦")
-        this.loading = false
-        return
-      }
+      // if(this.endTime-this.startTime> 60 * 60 * 24 * 1000*3){
+      //   // this.startTime = this.queryStartTime
+      //   // this.endTime = this.queryEndTime
+      //   this.$message.error("只能最多查询3天的数据哦")
+      //   this.loading = false
+      //   return
+      // }
       this.queryStartTime = this.startTime
       this.queryEndTime = this.endTime
-      this.getDraw(this.queryStartTime,this.queryEndTime)
       this.currentPage = 1
       this.pageSize = 10
       this.getTable()
+
     },1000),
     Byresize(tab){
       if(tab.name =='first'){