修改了一些BUG

src/main/java/com/gunshi/project/hsz/controller/ReservoirWaterController.java

@@ -82,6 +82,11 @@ public class ReservoirWaterController {
         return R.ok(reservoirWaterService.listV2());
     }
 
+    @Post(path = "/listV22", summary = "供水能力分析-水库水情列表")
+    public R<List<AttResBaseVo>> listV22() {
+        return R.ok(reservoirWaterService.listV22());
+    }
+
     @Get(path = "/image/channel", summary = "图像监测视角下拉")
     public R<List<StStbprpB>> channel(@Schema(name = "resCode") @RequestParam("resCode") String resCode) {
         return R.ok(reservoirWaterService.channel(resCode));

src/main/java/com/gunshi/project/hsz/controller/StWaterRRealController.java

@@ -2,6 +2,7 @@ package com.gunshi.project.hsz.controller;
 
 import java.io.Serializable;
 import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 import org.jetbrains.annotations.NotNull;

src/main/java/com/gunshi/project/hsz/entity/vo/StStatusVo.java

@@ -1,8 +1,11 @@
 package com.gunshi.project.hsz.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class StStatusVo {
 

src/main/java/com/gunshi/project/hsz/model/RiskControlInfo.java

@@ -105,4 +105,7 @@ public class RiskControlInfo implements Serializable {
         @Schema(description = "现场图片")
         private List<FileAssociations> files;
 
+        @TableField("possible_result")
+        private String possibleResult;
+
 }

src/main/java/com/gunshi/project/hsz/model/StWaterRReal.java

@@ -79,4 +79,10 @@ public class StWaterRReal implements Serializable {
         @TableField(exist = false)
         private ResMonthEcoFlow resMonthEcoFlow;
 
+
+        @TableField(exist = false)
+        private BigDecimal lgtd;
+
+        @TableField(exist = false)
+        private BigDecimal lttd;
 }

src/main/java/com/gunshi/project/hsz/service/GateValveRealService.java

@@ -156,6 +156,17 @@ public class GateValveRealService extends ServiceImpl<GateValveRealMapper, GateV
         BigDecimal deadCap = reservoir.getDeadCap() == null ? BigDecimal.ZERO : reservoir.getDeadCap();
         BigDecimal availableWater = nowCap.subtract(deadCap);
 
+        Date tm = reservoir.getTm();
+        Calendar now = Calendar.getInstance();
+        now.set(Calendar.MINUTE, 0);
+        now.set(Calendar.SECOND, 0);
+        now.set(Calendar.MILLISECOND, 0);
+        Date currentHour = now.getTime();
+        if(tm.before(currentHour)){
+            result.put(null,"当前时间无最新水位数据");
+            return result;
+        }
+
         // 如果初始可供水量就为0或负数，直接返回
         if (availableWater.compareTo(BigDecimal.ZERO) <= 0) {
             result.put(BigDecimal.ZERO, "当前无可供水量");

src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java

@@ -134,13 +134,90 @@ public class ReservoirWaterService {
             }else if(vo.getCalState() == 0 && vo.getDesState() ==1){
                 vo.setFlState(0);
             }
-
+            //如果最新数据时间小于当前时间整点，那么不显示水位数据(他妈的，很多功能都是复用一个接口的，说实话，不知道以前的人怎么设计的，就单一责任原则不好吗，非得复用代码，这下搞得需求有变更的情况下，一个页面改好了，另一个页面又会出现问题，真是服了）
+            Date tm = vo.getTm();
             BigDecimal rz = vo.getRz();
-            if (rz != null) {
+            // 获取当前时间整点（去掉分钟和秒）
-                //BigDecimal w = stZvarlBService.getWFromZvarl(rz, null, zvarlList);
+            Calendar now = Calendar.getInstance();
-                BigDecimal w = stZvarlBService.getWByZvarl(zvarlList,rz);
+            now.set(Calendar.MINUTE, 0);
-                vo.setNowCap(w);
+            now.set(Calendar.SECOND, 0);
+            now.set(Calendar.MILLISECOND, 0);
+            Date currentHour = now.getTime();
+
+            if(tm != null && tm.before(currentHour)){
+                vo.setRz(null);
+            }else if (tm != null && rz != null){
+                if (rz != null) {
+                    //BigDecimal w = stZvarlBService.getWFromZvarl(rz, null, zvarlList);
+                    BigDecimal w = stZvarlBService.getWByZvarl(zvarlList,rz);
+                    vo.setNowCap(w);
+                }
             }
+
+        });
+
+        //TODO 计算2个灌溉站的流量之和
+        BigDecimal totalSum = BigDecimal.ZERO;
+        String stcd1 = "1112";
+        QueryWrapper<StWaterRReal> irrQw1 = new QueryWrapper<>();
+        irrQw1.eq("stcd", stcd1).orderBy(true, false, "tm");
+        StWaterRReal stWaterRReal1 = stWaterRRealService.getOne(irrQw1);
+        if(stWaterRReal1 != null){
+            totalSum = totalSum.add(stWaterRReal1.getQ());
+        }
+        String stcd2 = "1113";
+        QueryWrapper<StWaterRReal> irrQw2 = new QueryWrapper<>();
+        irrQw2.eq("stcd", stcd2).orderBy(true, false, "tm");
+        StWaterRReal stWaterRReal2 = stWaterRRealService.getOne(irrQw2);
+        if(stWaterRReal2 != null){
+            totalSum = totalSum.add(stWaterRReal2.getQ());
+        }
+        for (AttResBaseVo attResBaseVo : voList) {
+            //设置灌溉流量
+            attResBaseVo.setIrrigationFlowSum(totalSum);
+            //设置灌溉流量时间
+            if(stWaterRReal1 != null){
+                attResBaseVo.setIrrigationFlowTm(stWaterRReal1.getTm());
+            }else if(stWaterRReal2 != null){
+                attResBaseVo.setIrrigationFlowTm(stWaterRReal2.getTm());
+            }
+        }
+        //获取新建生态供水流量站最新得流量
+        String ecologyStcd = "1114";
+        QueryWrapper<StWaterRReal> ecologyQw = new QueryWrapper<>();
+        ecologyQw.eq("stcd", ecologyStcd).orderBy(true, false, "tm");
+        StWaterRReal ecologyWaterRReal = stWaterRRealService.getOne(ecologyQw);
+        if(ecologyWaterRReal != null){
+            voList.stream().forEach(o -> {
+                o.setEcologyFlow(ecologyWaterRReal.getQ());
+                o.setEcologyFlowTm(ecologyWaterRReal.getTm());
+            });
+        }
+        return voList;
+    }
+
+
+    public List<AttResBaseVo> listV22() {
+        List<AttResBaseVo> voList = attResBaseMapper.queryListV2();
+        if(CollectionUtils.isEmpty(voList)){
+            return voList;
+        }
+
+        List<StZvarlB> zvarlList = stZvarlBService.list();
+        zvarlList.sort(Comparator.comparing(StZvarlB::getRz));
+        voList.forEach(vo -> {
+            if(vo.getCalState() == 1){
+                vo.setDesState(0);
+                vo.setFlState(0);
+            }else if(vo.getCalState() == 0 && vo.getDesState() ==1){
+                vo.setFlState(0);
+            }
+            BigDecimal rz = vo.getRz();
+                if (rz != null) {
+                    //BigDecimal w = stZvarlBService.getWFromZvarl(rz, null, zvarlList);
+                    BigDecimal w = stZvarlBService.getWByZvarl(zvarlList,rz);
+                    vo.setNowCap(w);
+                }
         });
 
         //TODO 计算2个灌溉站的流量之和
@@ -381,4 +458,6 @@ public class ReservoirWaterService {
         List<AttResBaseVo> voList = attResBaseMapper.queryYhd(stcd);
         return voList;
     }
+
+
 }

src/main/java/com/gunshi/project/hsz/service/RiskControlInfoService.java

@@ -43,7 +43,7 @@ public class RiskControlInfoService extends ServiceImpl<RiskControlInfoMapper, R
         boolean result = this.save(dto);
         if (result) {
             fileService.saveFile(dto.getFiles(), getGroupId(), String.valueOf(dto.getId()));
-            bzDictRelService.saveRel(dto.getResult(),dto.getId(),getGroupId());
+//            bzDictRelService.saveRel(dto.getResult(),dto.getId(),getGroupId());
         }
         return dto;
     }
@@ -55,7 +55,7 @@ public class RiskControlInfoService extends ServiceImpl<RiskControlInfoMapper, R
         boolean result = this.updateById(dto);
         if (result) {
             fileService.saveFile(dto.getFiles(), getGroupId(), String.valueOf(dto.getId()));
-            bzDictRelService.updateRel(dto.getResult(),dto.getId(),getGroupId());
+//            bzDictRelService.updateRel(dto.getResult(),dto.getId(),getGroupId());
         }
         return dto;
     }
@@ -67,7 +67,7 @@ public class RiskControlInfoService extends ServiceImpl<RiskControlInfoMapper, R
         boolean data = this.removeById(id);
         if (data) {
             fileService.deleteFile(getGroupId(), id.toString());
-            bzDictRelService.deleteRel(id);
+//            bzDictRelService.deleteRel(id);
         }
         return data;
     }
@@ -85,7 +85,7 @@ public class RiskControlInfoService extends ServiceImpl<RiskControlInfoMapper, R
         Page<RiskControlInfo> res = this.page(page.getPageSo().toPage(), query);
         if (res.getRecords() != null && res.getRecords().size() > 0) {
             fillAttach(res.getRecords());
-            fillRel(res.getRecords());
+//            fillRel(res.getRecords());
         }
         return res;
     }

src/main/java/com/gunshi/project/hsz/service/RiverWaterService.java

@@ -66,6 +66,17 @@ public class RiverWaterService {
         if(CollectionUtils.isEmpty(attRvBaseVos)){
             return attRvBaseVos;
         }
+        for (AttRvBaseVo attRvBaseVo : attRvBaseVos) {
+            Date tm = attRvBaseVo.getTm();
+            Calendar now = Calendar.getInstance();
+            now.set(Calendar.MINUTE, 0);
+            now.set(Calendar.SECOND, 0);
+            now.set(Calendar.MILLISECOND, 0);
+            Date currentDate = now.getTime();
+            if(tm.before(currentDate)){
+                attRvBaseVo.setZ(null);
+            }
+        }
         return attRvBaseVos;
     }
 

src/main/java/com/gunshi/project/hsz/service/StQxWarnRService.java

@@ -117,7 +117,7 @@ public class StQxWarnRService extends ServiceImpl<StQxWarnRMapper, StQxWarnR> {
                 .count();
         vo.setAiWarnCount(aiWarnCount);
         //TODO 超河道上游
-        String upperStcd = "123";//固定的站点编码
+        String upperStcd = "999999999";//固定的站点编码
         setUpAndDownOverRvUp(upperStcd,vo,dateTimeRangeSo);
 
         //TODO 超河道下游

src/main/java/com/gunshi/project/hsz/service/StWaterRRealService.java

@@ -1,5 +1,7 @@
 package com.gunshi.project.hsz.service;
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.stereotype.Service;
@@ -23,7 +25,24 @@ public class StWaterRRealService extends ServiceImpl<StWaterRRealMapper, StWater
 {
 
     public List<StWaterRReal> listRelated() {
-        return baseMapper.listRelated();
+        List<StWaterRReal> stWaterRReals = baseMapper.listRelated();
+        if(stWaterRReals != null && stWaterRReals.size() > 0){
+            for (StWaterRReal vo : stWaterRReals) {
+                Date tm = vo.getTm();
+                if(tm != null){
+                    Calendar now = Calendar.getInstance();
+                    now.set(Calendar.MINUTE, 0);
+                    now.set(Calendar.SECOND, 0);
+                    now.set(Calendar.MILLISECOND, 0);
+                    Date currentDate = now.getTime();
+                    if(tm.before(currentDate)){
+                        vo.setQ(null);
+                        vo.setV(null);
+                    }
+                }
+            }
+        }
+        return stWaterRReals;
     }
 
     public List<StWaterRReal> listNewData() {

src/main/resources/mapper/StWaterRRealMapper.xml

@@ -7,6 +7,8 @@
         stb.stcd,
         stb.sttp,
         stb.stnm,
+        stb.lgtd,
+        stb.lttd,
         t.tm,
         t.q,
         t.v