From a3e08f0db7a859e4c550deab94bbf537bc52409f Mon Sep 17 00:00:00 2001 From: tangwei Date: Thu, 23 Apr 2026 08:29:03 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E5=9F=BA=E5=9C=B0?= =?UTF-8?q?=E3=80=81=E7=94=B5=E7=AB=99=E3=80=81=E8=AE=BE=E6=96=BD=EF=BC=8C?= =?UTF-8?q?=E9=B1=BC=E7=A7=8D=E7=B1=BB=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../env/controller/SdEngInfoBHController.java | 9 ++++++++- .../env/controller/SdFishDictoryBController.java | 8 ++++++++ .../platform/env/controller/SdFpssBHController.java | 7 +++++++ .../env/controller/SdHydrobaseController.java | 10 ++++++++-- .../platform/env/service/ISdEngInfoBHService.java | 7 ++++++- .../yfd/platform/env/service/ISdFpssBHService.java | 5 +++++ .../platform/env/service/ISdHydrobaseService.java | 7 ++++++- .../env/service/impl/SdEngInfoBHServiceImpl.java | 13 ++++++++++++- .../env/service/impl/SdFpssBHServiceImpl.java | 10 ++++++++++ .../env/service/impl/SdHydrobaseServiceImpl.java | 11 ++++++++++- 10 files changed, 80 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdEngInfoBHController.java b/backend/src/main/java/com/yfd/platform/env/controller/SdEngInfoBHController.java index bff8c2c..aac18b6 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdEngInfoBHController.java +++ b/backend/src/main/java/com/yfd/platform/env/controller/SdEngInfoBHController.java @@ -69,6 +69,13 @@ public class SdEngInfoBHController { return ResponseResult.successData(engInfoBHService.getByRvcd(rvcd)); } + @GetMapping("/dropdown") + @Operation(summary = "电站下拉列表（根据基地编码筛选 + 支持名称模糊搜索）") + public ResponseResult dropdown(@RequestParam(required = false) String baseId, + @RequestParam(required = false) String ennm) { + return ResponseResult.successData(engInfoBHService.selectForDropdown(baseId, ennm)); + } + @Log(module = "电站管理", value = "新增电站") @PostMapping("/add") @Operation(summary = "新增电站") @@ -92,4 +99,4 @@ public class SdEngInfoBHController { boolean result = engInfoBHService.deleteEngInfo(stcd); return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); } -} +} \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdFishDictoryBController.java b/backend/src/main/java/com/yfd/platform/env/controller/SdFishDictoryBController.java index fc8c878..c39e6a0 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdFishDictoryBController.java +++ b/backend/src/main/java/com/yfd/platform/env/controller/SdFishDictoryBController.java @@ -1,5 +1,7 @@ package com.yfd.platform.env.controller; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yfd.platform.annotation.Log; import com.yfd.platform.config.ResponseResult; @@ -45,6 +47,12 @@ public class SdFishDictoryBController { return ResponseResult.successData(sdFishDictoryBService.list()); } + @GetMapping("/listByName") + @Operation(summary = "根据名称查询所有鱼类字典") + public ResponseResult listByName( @RequestParam(required = false) String name) { + return ResponseResult.successData(sdFishDictoryBService.list(new LambdaQueryWrapper().eq(StrUtil.isNotBlank( name),SdFishDictoryB::getName, name))); + } + @GetMapping("/getById") @Operation(summary = "根据ID查询鱼类字典") public ResponseResult getById(@RequestParam String id) { diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdFpssBHController.java b/backend/src/main/java/com/yfd/platform/env/controller/SdFpssBHController.java index 0062657..5af03b1 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdFpssBHController.java +++ b/backend/src/main/java/com/yfd/platform/env/controller/SdFpssBHController.java @@ -57,6 +57,13 @@ public class SdFpssBHController { return ResponseResult.successData(sdFpssBHService.getByRstcd(rstcd)); } + @GetMapping("/dropdown") + @Operation(summary = "设施下拉列表（根据电站编码筛选 + 支持编码模糊搜索）") + public ResponseResult dropdown(@RequestParam(required = false) String rstcd, + @RequestParam(required = false) String stnm) { + return ResponseResult.successData(sdFpssBHService.selectForDropdown(rstcd, stnm)); + } + @Log(module = "过鱼设施管理", value = "新增过鱼设施") @PostMapping("/add") @Operation(summary = "新增过鱼设施") diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdHydrobaseController.java b/backend/src/main/java/com/yfd/platform/env/controller/SdHydrobaseController.java index 581f987..a48ba59 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdHydrobaseController.java +++ b/backend/src/main/java/com/yfd/platform/env/controller/SdHydrobaseController.java @@ -7,9 +7,9 @@ import com.yfd.platform.env.domain.SdHydrobase; import com.yfd.platform.env.service.ISdHydrobaseService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; import java.util.List; /** @@ -62,6 +62,12 @@ public class SdHydrobaseController { return ResponseResult.successData(hydrobaseService.getById(baseid)); } + @GetMapping("/dropdown") + @Operation(summary = "基地下拉列表（支持名称模糊搜索）") + public ResponseResult dropdown(@RequestParam(required = false) String basename) { + return ResponseResult.successData(hydrobaseService.selectForDropdown(basename)); + } + // @Log(module = "基地管理", value = "新增基地") @PostMapping("/add") @Operation(summary = "新增基地") @@ -85,4 +91,4 @@ public class SdHydrobaseController { boolean result = hydrobaseService.deleteHydrobase(baseid); return result ? ResponseResult.success("删除成功") : ResponseResult.error("删除失败"); } -} +} \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdEngInfoBHService.java b/backend/src/main/java/com/yfd/platform/env/service/ISdEngInfoBHService.java index 5fcccc8..ab65aea 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdEngInfoBHService.java +++ b/backend/src/main/java/com/yfd/platform/env/service/ISdEngInfoBHService.java @@ -33,6 +33,11 @@ public interface ISdEngInfoBHService extends IService { */ List getByRvcd(String rvcd); + /** + * 电站下拉列表（根据基地编码筛选 + 支持名称模糊搜索） + */ + List selectForDropdown(String baseId, String ennm); + /** * 新增电站 */ @@ -47,4 +52,4 @@ public interface ISdEngInfoBHService extends IService { * 删除电站 */ boolean deleteEngInfo(String stcd); -} +} \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdFpssBHService.java b/backend/src/main/java/com/yfd/platform/env/service/ISdFpssBHService.java index 3acdb85..8f7dea4 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdFpssBHService.java +++ b/backend/src/main/java/com/yfd/platform/env/service/ISdFpssBHService.java @@ -12,6 +12,11 @@ public interface ISdFpssBHService extends IService { List getByRstcd(String rstcd); + /** + * 设施下拉列表（根据电站编码筛选 + 支持名称模糊搜索） + */ + List selectForDropdown(String rstcd, String stnm); + boolean add(SdFpssBH sdFpssBH); boolean updateById(SdFpssBH sdFpssBH); diff --git a/backend/src/main/java/com/yfd/platform/env/service/ISdHydrobaseService.java b/backend/src/main/java/com/yfd/platform/env/service/ISdHydrobaseService.java index f00451a..92a94e3 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/ISdHydrobaseService.java +++ b/backend/src/main/java/com/yfd/platform/env/service/ISdHydrobaseService.java @@ -28,6 +28,11 @@ public interface ISdHydrobaseService extends IService { */ List getRootList(); + /** + * 基地下拉列表（支持名称模糊搜索） + */ + List selectForDropdown(String basename); + /** * 新增基地 */ @@ -42,4 +47,4 @@ public interface ISdHydrobaseService extends IService { * 删除基地 */ boolean deleteHydrobase(String baseid); -} +} \ No newline at end of file diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/service/impl/SdEngInfoBHServiceImpl.java index a9e52b4..8b49d15 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdEngInfoBHServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/service/impl/SdEngInfoBHServiceImpl.java @@ -7,6 +7,7 @@ import com.yfd.platform.env.mapper.SdEngInfoBHMapper; import com.yfd.platform.env.service.ISdEngInfoBHService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.util.List; @@ -48,6 +49,16 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl selectForDropdown(String baseId, String ennm) { + return this.lambdaQuery() + .eq(StringUtils.hasText(baseId), SdEngInfoBH::getBaseId, baseId) + .like(StringUtils.hasText(ennm), SdEngInfoBH::getEnnm, ennm) + .select(SdEngInfoBH::getStcd, SdEngInfoBH::getEnnm, SdEngInfoBH::getBaseId) + .orderByAsc(SdEngInfoBH::getOrderIndex) + .list(); + } + @Override public boolean addEngInfo(SdEngInfoBH engInfo) { return this.save(engInfo); @@ -62,4 +73,4 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl i return list(wrapper); } + @Override + public List selectForDropdown(String rstcd, String stnm) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(StringUtils.hasText(rstcd), SdFpssBH::getRstcd, rstcd) + .like(StringUtils.hasText(stnm), SdFpssBH::getStnm, stnm) + .select(SdFpssBH::getStcd, SdFpssBH::getStnm, SdFpssBH::getSttp,SdFpssBH::getRstcd) + .orderByDesc(SdFpssBH::getOrderIndex); + return list(wrapper); + } + @Override public boolean add(SdFpssBH sdFpssBH) { return save(sdFpssBH); diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHydrobaseServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/service/impl/SdHydrobaseServiceImpl.java index cafc2cf..4236ea4 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/SdHydrobaseServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/service/impl/SdHydrobaseServiceImpl.java @@ -6,6 +6,7 @@ import com.yfd.platform.env.domain.SdHydrobase; import com.yfd.platform.env.mapper.SdHydrobaseMapper; import com.yfd.platform.env.service.ISdHydrobaseService; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.util.List; @@ -42,6 +43,14 @@ public class SdHydrobaseServiceImpl extends ServiceImpl selectForDropdown(String basename) { + return this.lambdaQuery() + .like(StringUtils.hasText(basename), SdHydrobase::getBasename, basename) + .orderByAsc(SdHydrobase::getOrderIndex) + .list(); + } + @Override public boolean addHydrobase(SdHydrobase hydrobase) { return this.save(hydrobase); @@ -56,4 +65,4 @@ public class SdHydrobaseServiceImpl extends ServiceImpl