From 62f50fd96bf39079135b30a5bf45a21bc312ee03 Mon Sep 17 00:00:00 2001 From: tangwei Date: Fri, 5 Jun 2026 11:01:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=BF=87=E9=B1=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qgc_base/controller/SdEngInfoBHController.java | 4 ++-- .../platform/qgc_base/mapper/SdEngInfoBHMapper.java | 2 +- .../qgc_base/service/ISdEngInfoBHService.java | 2 +- .../qgc_base/service/impl/SdEngInfoBHServiceImpl.java | 4 ++-- .../qgc_base/service/impl/SdRvcdDicServiceImpl.java | 2 +- .../service/impl/TreeStructureServiceImpl.java | 6 +++--- .../resources/mapper/qgc_base/SdEngInfoBHMapper.xml | 11 +++++++++-- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEngInfoBHController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEngInfoBHController.java index feb06ac0..e7687e86 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEngInfoBHController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEngInfoBHController.java @@ -65,8 +65,8 @@ public class SdEngInfoBHController { @GetMapping("/getByRvcd") @Operation(summary = "根据流域编码查询电站") - public ResponseResult getByRvcd(@RequestParam String rvcd) { - return ResponseResult.successData(engInfoBHService.getByRvcd(rvcd)); + public ResponseResult getByRvcd(@RequestParam String rvcd, @RequestParam String reachcd) { + return ResponseResult.successData(engInfoBHService.getByRvcd(rvcd,reachcd)); } @PostMapping("/dropdown") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEngInfoBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEngInfoBHMapper.java index 9ce5b3ee..98945a3b 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEngInfoBHMapper.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEngInfoBHMapper.java @@ -27,7 +27,7 @@ public interface SdEngInfoBHMapper extends BaseMapper { /** * 根据流域编码查询电站列表（通过关联关系） */ - List selectByRvcd(@Param("rvcd") String rvcd); + List selectByRvcd(@Param("rvcd") String rvcd,@Param("reachcd") String reachcd); /** * 根据基地流域编码查询电站列表 diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdEngInfoBHService.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdEngInfoBHService.java index 5a14f586..437a6bbd 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdEngInfoBHService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/ISdEngInfoBHService.java @@ -37,7 +37,7 @@ public interface ISdEngInfoBHService extends IService { /** * 根据流域编码查询电站 */ - List getByRvcd(String rvcd); + List getByRvcd(String rvcd,String reachcd); /** * 电站下拉列表（根据基地编码筛选 + 支持名称模糊搜索） diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java index cf90f151..8cfcdc33 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java @@ -76,8 +76,8 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl getByRvcd(String rvcd) { - return engInfoBHMapper.selectByRvcd(rvcd); + public List getByRvcd(String rvcd,String reachcd) { + return engInfoBHMapper.selectByRvcd(rvcd,reachcd); } @Override diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdRvcdDicServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdRvcdDicServiceImpl.java index f1768cd5..c9341c3f 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdRvcdDicServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdRvcdDicServiceImpl.java @@ -181,7 +181,7 @@ public class SdRvcdDicServiceImpl extends ServiceImpl stationList = engInfoBHMapper.selectByRvcd(orgId); + List stationList = engInfoBHMapper.selectByRvcd(null,orgId); if (stationList != null) { for (SdEngInfoBH station : stationList) { if (station.getStcd() != null) { diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/TreeStructureServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/TreeStructureServiceImpl.java index 4ceb2135..1ddff22c 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/TreeStructureServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/TreeStructureServiceImpl.java @@ -61,7 +61,7 @@ public class TreeStructureServiceImpl implements ITreeStructureService { Map> rvcdEngMap = new HashMap<>(); for (SdRvcdDic rvcdDic : rvcdList) { - List engList = engInfoBHMapper.selectByRvcd(rvcdDic.getRvcd()); + List engList = engInfoBHMapper.selectByRvcd(null,rvcdDic.getRvcd()); // 如果提供了电站名称参数，进行模糊匹配筛选 if (StringUtils.hasText(engName) && engList != null) { @@ -172,7 +172,7 @@ public class TreeStructureServiceImpl implements ITreeStructureService { // 2. 预加载所有流域下的电站（按流域分组） Map> rvcdEngMap = new HashMap<>(); for (SdRvcdDic rvcdDic : rvcdList) { - List engList = engInfoBHMapper.selectByRvcd(rvcdDic.getRvcd()); + List engList = engInfoBHMapper.selectByRvcd(null,rvcdDic.getRvcd()); // 如果提供了电站名称参数，进行模糊匹配筛选 if (StringUtils.hasText(engName) && engList != null) { @@ -366,7 +366,7 @@ public class TreeStructureServiceImpl implements ITreeStructureService { // 2. 预加载所有流域下的电站（按流域分组） Map> rvcdEngMap = new HashMap<>(); for (SdRvcdDic rvcdDic : rvcdList) { - List engList = engInfoBHMapper.selectByRvcd(rvcdDic.getRvcd()); + List engList = engInfoBHMapper.selectByRvcd(null,rvcdDic.getRvcd()); // 如果提供了电站名称参数，进行模糊匹配筛选 if (StringUtils.hasText(engName) && engList != null) { diff --git a/backend/src/main/resources/mapper/qgc_base/SdEngInfoBHMapper.xml b/backend/src/main/resources/mapper/qgc_base/SdEngInfoBHMapper.xml index 135852bf..58f9c214 100644 --- a/backend/src/main/resources/mapper/qgc_base/SdEngInfoBHMapper.xml +++ b/backend/src/main/resources/mapper/qgc_base/SdEngInfoBHMapper.xml @@ -292,8 +292,15 @@