From d255e2403c1ab0dcc98ae1653c7b7f0236f3335c Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Tue, 9 Jun 2026 18:23:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/qgc_env/wt/entity/vo/WtrvVo.java |  4 ++-
 .../service/impl/AlongDetailServiceImpl.java  | 26 +++++++++----------
 .../service/impl/SdWtMonitorServiceImpl.java  |  4 +--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtrvVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtrvVo.java
index ac9c0f7d..0324eb4c 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtrvVo.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/entity/vo/WtrvVo.java
@@ -12,7 +12,9 @@ public class WtrvVo {
 
     private Date tm;
 
-    private Boolean isIoWtrv;
+//    private Boolean isIoWtrv;
+
+    private Boolean ioWtrv;
 
     private Boolean hasRstcdWtvt;
 
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/AlongDetailServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/AlongDetailServiceImpl.java
index 205a8f19..b455ce4b 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/AlongDetailServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/AlongDetailServiceImpl.java
@@ -214,7 +214,7 @@ public class AlongDetailServiceImpl extends ServiceImpl<AlongDetailMapper, SdAlo
         List<Map<String, Object>> iwtDataVoList = new ArrayList<>();
         List<Map<String, Object>> dwtDataVoList = new ArrayList<>();
         List<Map<String, Object>> wtvtDataVoList = new ArrayList<>();
-//        List<Map<String, Object>> hydropwDataVoList = new ArrayList<>();
+        List<Map<String, Object>> hydropwDataVoList = new ArrayList<>();
         List<Map<String, Object>> pptnDataVoList = new ArrayList<>();
         List<Map<String, Object>> tmpDataVoList = new ArrayList<>();
         List<Map<String, Object>> wtnpDataVoList;
@@ -241,17 +241,17 @@ public class AlongDetailServiceImpl extends ServiceImpl<AlongDetailMapper, SdAlo
                 .filter(it -> getDateValueIgnoreCase(it, "tm") != null)
                 .collect(Collectors.toMap(it -> getDateValueIgnoreCase(it, "tm"), Function.identity()));
 
-//        hydropwDataVoList.addAll(this.alongDetailMapper.getHydropwDataList(wtrvInfo.getStcd(), startTime, endTime));
-//        Map<Date, Map<String, Object>> hydropwDataMap = hydropwDataVoList.stream()
-//                .collect(Collectors.toMap(it -> (Date) it.get("tm"), Function.identity()));
+        hydropwDataVoList.addAll(this.alongDetailMapper.getHydropwDataList(wtrvInfo.getStcd(), startTime, endTime));
+        Map<Date, Map<String, Object>> hydropwDataMap = hydropwDataVoList.stream()
+                .collect(Collectors.toMap(it -> (Date) it.get("tm"), Function.identity()));
 
-//        pptnDataVoList.addAll(this.alongDetailMapper.getPptnDataList(wtrvInfo.getStcd(), startTime, endTime));
-//        Map<Date, Map<String, Object>> pptnDataMap = pptnDataVoList.stream()
-//                .collect(Collectors.toMap(it -> (Date) it.get("tm"), Function.identity()));
+        pptnDataVoList.addAll(this.alongDetailMapper.getPptnDataList(wtrvInfo.getStcd(), startTime, endTime));
+        Map<Date, Map<String, Object>> pptnDataMap = pptnDataVoList.stream()
+                .collect(Collectors.toMap(it -> (Date) it.get("tm"), Function.identity()));
 
-//        tmpDataVoList.addAll(this.alongDetailMapper.getTmpDataList(wtrvInfo.getStcd(), startTime, endTime));
-//        Map<Date, Map<String, Object>> tmpDataMap = tmpDataVoList.stream()
-//                .collect(Collectors.toMap(it -> (Date) it.get("tm"), Function.identity()));
+        tmpDataVoList.addAll(this.alongDetailMapper.getTmpDataList(wtrvInfo.getStcd(), startTime, endTime));
+        Map<Date, Map<String, Object>> tmpDataMap = tmpDataVoList.stream()
+                .collect(Collectors.toMap(it -> (Date) it.get("tm"), Function.identity()));
 
         Map<Integer, BigDecimal> wtnpDataMap = new HashMap<>();
         if (StrUtil.isNotBlank(wtrvInfo.getRstcd())) {
@@ -275,9 +275,9 @@ public class AlongDetailServiceImpl extends ServiceImpl<AlongDetailMapper, SdAlo
             vo.put("rstcd", wtrvInfo.getRstcd());
             vo.put("type", wtrvInfo.getType());
             vo.put("natureTmp", wtnpDataMap.get(it.getMon()));
-//            vo.put("hydropwDataVo", hydropwDataMap.get(it.getTm()));
-//            vo.put("pptnDataVo", pptnDataMap.get(it.getTm()));
-//            vo.put("tmpDataVo", tmpDataMap.get(it.getTm()));
+            vo.put("hydropwDataVo", hydropwDataMap.get(it.getTm()));
+            vo.put("pptnDataVo", pptnDataMap.get(it.getTm()));
+            vo.put("tmpDataVo", tmpDataMap.get(it.getTm()));
 
             if (wtrvInfo.getType() == 1) {
                 Map<String, Object> iwtVo = new HashMap<>();
diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java
index aa9942ff..d3946de4 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_env/wt/service/impl/SdWtMonitorServiceImpl.java
@@ -491,7 +491,7 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService {
     @Override
     public WtrvVo getFlagByStcd(String stcd) {
         String sql = "SELECT wt.STCD AS stcd, " +
-                "CASE WHEN rel.ENG_IWT_CODE IS NOT NULL OR rel.ENG_DWT_CODE IS NOT NULL THEN 1 ELSE 0 END AS isIoWtrv, " +
+                "CASE WHEN rel.ENG_IWT_CODE IS NOT NULL OR rel.ENG_DWT_CODE IS NOT NULL THEN 1 ELSE 0 END AS ioWtrv, " +
                 "CASE WHEN EXISTS ( " +
                 "    SELECT 1 FROM SD_WT_B_H vt " +
                 "    WHERE vt.RSTCD = wt.RSTCD " +
@@ -2305,7 +2305,7 @@ public class SdWtMonitorServiceImpl implements SdWtMonitorService {
     private WtrvVo buildDefaultWtrvVo(String stcd) {
         WtrvVo vo = new WtrvVo();
         vo.setStcd(stcd);
-        vo.setIsIoWtrv(false);
+        vo.setIoWtrv(false);
         vo.setHasRstcdWtvt(false);
         return vo;
     }