From b171d91e546fc28b79e9d2af2588892e00e93050 Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 16 Jun 2026 16:00:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B9=E6=8D=AE=E8=BF=87=E9=B1=BC?= =?UTF-8?q?=E8=AE=BE=E6=96=BD=E7=AB=99=E7=82=B9=E6=9F=A5=E8=AF=A2=E9=B1=BC?= =?UTF-8?q?=E7=B1=BB=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yfd/platform/config/SecurityConfig.java | 4 +- .../fp/controller/FishPassageController.java | 6 +++ .../qgc_env/fp/service/FpBuildService.java | 2 + .../fp/service/impl/FpBuildServiceImpl.java | 39 +++++++++++++++++++ 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java index 7c7358e1..0a49d30b 100644 --- a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java @@ -64,8 +64,8 @@ public class SecurityConfig { // .requestMatchers("/eng/**").permitAll() // .requestMatchers("/eq/**").permitAll() // .requestMatchers("/env/**").permitAll() - .requestMatchers("/wt/**").permitAll() - .requestMatchers("/fb/**").permitAll() +// .requestMatchers("/wt/**").permitAll() +// .requestMatchers("/fb/**").permitAll() // .requestMatchers("/zq/**").permitAll() // .requestMatchers("/wq/**").permitAll() // .requestMatchers("/vd/**").permitAll() diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fp/controller/FishPassageController.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/controller/FishPassageController.java index 7d2fa893..25fb7bb6 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fp/controller/FishPassageController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/controller/FishPassageController.java @@ -76,6 +76,12 @@ public class FishPassageController { return ResponseResult.successData(fpBuildService.getFishDicList(dataSourceRequest)); } + @PostMapping("/fishDic/stcd/GetKendoList") + @Operation(summary = "根据过鱼设施站点查询鱼类列表") + public ResponseResult getFishDicListByStcd(@RequestBody DataSourceRequest dataSourceRequest) { + return ResponseResult.successData(fpBuildService.getFishDicListByStcd(dataSourceRequest)); + } + @PostMapping("/vmsstbprpt/GetKendoList") @Operation(summary = "根据条件查询过鱼设施基础列表") public ResponseResult getVmsstbprptList(@RequestBody DataSourceRequest dataSourceRequest) { diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/FpBuildService.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/FpBuildService.java index 97d2e4f7..56b2fadb 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/FpBuildService.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/FpBuildService.java @@ -14,6 +14,8 @@ public interface FpBuildService { DataSourceResult getFishDicList(DataSourceRequest dataSourceRequest); + DataSourceResult getFishDicListByStcd(DataSourceRequest dataSourceRequest); + DataSourceResult getFpqMsstbprptList(DataSourceRequest dataSourceRequest); FpVmsstbprptVo getStInfoByStcd(String stcd); diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpBuildServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpBuildServiceImpl.java index 4ccffabc..86f893c6 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpBuildServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fp/service/impl/FpBuildServiceImpl.java @@ -10,6 +10,7 @@ import com.yfd.platform.common.GroupHelper; import com.yfd.platform.common.GroupingInfo; import com.yfd.platform.common.MicroservicDynamicSQLMapper; import com.yfd.platform.common.PageInfo; +import com.yfd.platform.common.exception.BizException; import com.yfd.platform.qgc_env.fp.entity.vo.FpConstructionSituationVo; import com.yfd.platform.qgc_env.fp.entity.vo.FpFishDicVo; import com.yfd.platform.qgc_env.fp.entity.vo.FpVmsstbprptVo; @@ -122,6 +123,44 @@ public class FpBuildServiceImpl implements FpBuildService { return result; } + @Override + public DataSourceResult getFishDicListByStcd(DataSourceRequest dataSourceRequest) { + DataSourceLoadOptionsBase loadOptions = dataSourceRequest == null ? null : dataSourceRequest.toDevRequest(); + String stcd = loadOptions == null ? null : QgcQueryWrapperUtil.getFilterFieldValue(loadOptions, "stcd"); + if (StrUtil.isBlank(stcd)) { + throw new BizException("过鱼设施站点编码(stcd)不能为空."); + } + + Map paramMap = new HashMap<>(); + paramMap.put("stcd", StrUtil.trim(stcd)); + + String sql = "SELECT DISTINCT " + + " fish.ID AS id, " + + " fish.NAME AS name " + + "FROM SD_FPSS_B_H fp " + + "INNER JOIN SD_ENGINFO_B_H eng ON eng.STCD = fp.RSTCD " + + " AND NVL(eng.IS_DELETED, 0) = 0 " + + "INNER JOIN SD_FISHDICTORY_RLTN_B rel ON rel.RVCD = eng.HBRVCD " + + " AND NVL(rel.IS_DELETED, 0) = 0 " + + "INNER JOIN SD_FISHDICTORY_B fish ON fish.ID = NVL(rel.ZY_FISH_ID, rel.FISH_ID) " + + " AND NVL(fish.IS_DELETED, 0) = 0 " + + " AND NVL(fish.ENABLE, 1) = 1 " + + "WHERE fp.STCD = #{map.stcd} " + + "ORDER BY fish.NAME"; + + List list = microservicDynamicSQLMapper.getAllListWithResultType( + sql, + paramMap, + FpFishDicVo.class + ); + + DataSourceResult result = new DataSourceResult<>(); + result.setData(list); + result.setTotal(list == null ? 0L : list.size()); + result.setAggregates(new HashMap<>()); + return result; + } + @Override public DataSourceResult getFpqMsstbprptList(DataSourceRequest dataSourceRequest) { return queryVmsstbprptList(dataSourceRequest, "FPQ");