zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 优化过鱼

Browse Source
This commit is contained in:
tangwei 2026-06-05 11:01:06 +08:00
parent 4f9e80a99c
commit 62f50fd96b
7 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEngInfoBHController.java
View File

@ -65,8 +65,8 @@ public class SdEngInfoBHController {
@GetMapping("/getByRvcd") @GetMapping("/getByRvcd")
@Operation(summary = "根据流域编码查询电站") @Operation(summary = "根据流域编码查询电站")
public ResponseResult getByRvcd(@RequestParam String rvcd) { public ResponseResult getByRvcd(@RequestParam String rvcd, @RequestParam String reachcd) {
return ResponseResult.successData(engInfoBHService.getByRvcd(rvcd)); return ResponseResult.successData(engInfoBHService.getByRvcd(rvcd,reachcd));
} }
@PostMapping("/dropdown") @PostMapping("/dropdown")

2
backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEngInfoBHMapper.java
View File

@ -27,7 +27,7 @@ public interface SdEngInfoBHMapper extends BaseMapper<SdEngInfoBH> {
/** /**
* 根据流域编码查询电站列表（通过关联关系） * 根据流域编码查询电站列表（通过关联关系）
*/ */
List<SdEngInfoBH> selectByRvcd(@Param("rvcd") String rvcd); List<SdEngInfoBH> selectByRvcd(@Param("rvcd") String rvcd,@Param("reachcd") String reachcd);
/** /**
* 根据基地流域编码查询电站列表 * 根据基地流域编码查询电站列表

2
backend/src/main/java/com/yfd/platform/qgc_base/service/ISdEngInfoBHService.java
View File

@ -37,7 +37,7 @@ public interface ISdEngInfoBHService extends IService<SdEngInfoBH> {
/** /**
* 根据流域编码查询电站 * 根据流域编码查询电站
*/ */
List<SdEngInfoBH> getByRvcd(String rvcd); List<SdEngInfoBH> getByRvcd(String rvcd,String reachcd);
/** /**
* 电站下拉列表（根据基地编码筛选 + 支持名称模糊搜索） * 电站下拉列表（根据基地编码筛选 + 支持名称模糊搜索）

4
backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
View File

@ -76,8 +76,8 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
} }
@Override @Override
public List<SdEngInfoBH> getByRvcd(String rvcd) { public List<SdEngInfoBH> getByRvcd(String rvcd,String reachcd) {
return engInfoBHMapper.selectByRvcd(rvcd); return engInfoBHMapper.selectByRvcd(rvcd,reachcd);
} }
@Override @Override

2
backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdRvcdDicServiceImpl.java
View File

@ -181,7 +181,7 @@ public class SdRvcdDicServiceImpl extends ServiceImpl<SdRvcdDicMapper, SdRvcdDic
} }
} else if ("RVCD".equals(orgType)) { } else if ("RVCD".equals(orgType)) {
List<SdEngInfoBH> stationList = engInfoBHMapper.selectByRvcd(orgId); List<SdEngInfoBH> stationList = engInfoBHMapper.selectByRvcd(null,orgId);
if (stationList != null) { if (stationList != null) {
for (SdEngInfoBH station : stationList) { for (SdEngInfoBH station : stationList) {
if (station.getStcd() != null) { if (station.getStcd() != null) {

6
backend/src/main/java/com/yfd/platform/qgc_base/service/impl/TreeStructureServiceImpl.java
View File

@ -61,7 +61,7 @@ public class TreeStructureServiceImpl implements ITreeStructureService {
Map<String, List<SdEngInfoBH>> rvcdEngMap = new HashMap<>(); Map<String, List<SdEngInfoBH>> rvcdEngMap = new HashMap<>();
for (SdRvcdDic rvcdDic : rvcdList) { for (SdRvcdDic rvcdDic : rvcdList) {
List<SdEngInfoBH> engList = engInfoBHMapper.selectByRvcd(rvcdDic.getRvcd()); List<SdEngInfoBH> engList = engInfoBHMapper.selectByRvcd(null,rvcdDic.getRvcd());
// 如果提供了电站名称参数，进行模糊匹配筛选 // 如果提供了电站名称参数，进行模糊匹配筛选
if (StringUtils.hasText(engName) && engList != null) { if (StringUtils.hasText(engName) && engList != null) {
@ -172,7 +172,7 @@ public class TreeStructureServiceImpl implements ITreeStructureService {
// 2. 预加载所有流域下的电站（按流域分组） // 2. 预加载所有流域下的电站（按流域分组）
Map<String, List<SdEngInfoBH>> rvcdEngMap = new HashMap<>(); Map<String, List<SdEngInfoBH>> rvcdEngMap = new HashMap<>();
for (SdRvcdDic rvcdDic : rvcdList) { for (SdRvcdDic rvcdDic : rvcdList) {
List<SdEngInfoBH> engList = engInfoBHMapper.selectByRvcd(rvcdDic.getRvcd()); List<SdEngInfoBH> engList = engInfoBHMapper.selectByRvcd(null,rvcdDic.getRvcd());
// 如果提供了电站名称参数，进行模糊匹配筛选 // 如果提供了电站名称参数，进行模糊匹配筛选
if (StringUtils.hasText(engName) && engList != null) { if (StringUtils.hasText(engName) && engList != null) {
@ -366,7 +366,7 @@ public class TreeStructureServiceImpl implements ITreeStructureService {
// 2. 预加载所有流域下的电站（按流域分组） // 2. 预加载所有流域下的电站（按流域分组）
Map<String, List<SdEngInfoBH>> rvcdEngMap = new HashMap<>(); Map<String, List<SdEngInfoBH>> rvcdEngMap = new HashMap<>();
for (SdRvcdDic rvcdDic : rvcdList) { for (SdRvcdDic rvcdDic : rvcdList) {
List<SdEngInfoBH> engList = engInfoBHMapper.selectByRvcd(rvcdDic.getRvcd()); List<SdEngInfoBH> engList = engInfoBHMapper.selectByRvcd(null,rvcdDic.getRvcd());
// 如果提供了电站名称参数，进行模糊匹配筛选 // 如果提供了电站名称参数，进行模糊匹配筛选
if (StringUtils.hasText(engName) && engList != null) { if (StringUtils.hasText(engName) && engList != null) {

11
backend/src/main/resources/mapper/qgc_base/SdEngInfoBHMapper.xml
View File

@ -292,8 +292,15 @@
<select id="selectByRvcd" resultMap="BaseResultMap"> <select id="selectByRvcd" resultMap="BaseResultMap">
SELECT * FROM SD_ENGINFO_B_H SELECT * FROM SD_ENGINFO_B_H
WHERE RVCD = #{rvcd} <where>
ORDER BY ORDER_INDEX ASC <if test="reachcd != null and reachcd != ''">
AND REACHCD = #{reachcd}
</if>
<if test="rvcd != null and rvcd != ''">
AND RVCD = #{rvcd}
</if>
</where>
ORDER BY RVCD, REACHCD
</select> </select>
<select id="selectByHbrvcd" resultMap="BaseResultMap"> <select id="selectByHbrvcd" resultMap="BaseResultMap">