From e75bb27492a3fd710eabf9232b96a82fc8062cbd Mon Sep 17 00:00:00 2001 From: tangwei Date: Tue, 19 May 2026 16:41:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8E=B7=E5=8F=96=E6=B2=BF=E7=A8=8B?= =?UTF-8?q?=E6=B0=B4=E6=B8=A9=E5=8F=98=E5=8C=96=E9=BB=98=E8=AE=A4=E6=9C=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=B2=B3=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../env/controller/SdWTMonitorController.java | 4 ++- .../env/mapper/AlongDetailMapper.java | 25 +++++++++++++------ .../service/impl/AlongListServiceImpl.java | 2 +- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdWTMonitorController.java b/backend/src/main/java/com/yfd/platform/env/controller/SdWTMonitorController.java index 7b9a631..cacba4d 100644 --- a/backend/src/main/java/com/yfd/platform/env/controller/SdWTMonitorController.java +++ b/backend/src/main/java/com/yfd/platform/env/controller/SdWTMonitorController.java @@ -105,6 +105,9 @@ public class SdWTMonitorController { @GetMapping("/alongDetail/qgc/stcdCheck2") @Operation(summary = "判断出库水温站、垂向水温站所属的电站是否有出库水温站、垂向水温站") public ResponseResult getQgcStcdCheck2(@RequestParam String stcd) { + if (StrUtil.isBlank(stcd)) { + throw new BizException("站点编码不能为空."); + } WtrvInfo result = alongDetailService.getWtrvInfoByStcd3(stcd); return ResponseResult.successData(result); } @@ -119,7 +122,6 @@ public class SdWTMonitorController { @PostMapping({"/alongList/default/rvcd"}) @Operation(summary = "获取沿程水温变化默认有数据的河流") public ResponseResult getDefaultStcd(@RequestBody DataSourceRequest dataSourceRequest) { - return ResponseResult.successData(alongListService.getDefaultRvcd(dataSourceRequest)); } diff --git a/backend/src/main/java/com/yfd/platform/env/mapper/AlongDetailMapper.java b/backend/src/main/java/com/yfd/platform/env/mapper/AlongDetailMapper.java index 07804d4..16a3f3a 100644 --- a/backend/src/main/java/com/yfd/platform/env/mapper/AlongDetailMapper.java +++ b/backend/src/main/java/com/yfd/platform/env/mapper/AlongDetailMapper.java @@ -136,18 +136,27 @@ public interface AlongDetailMapper extends BaseMapper { WtrvInfo getWtrvInfoByStcd2(@Param("stcd") String stcd); @Select("SELECT eng.STCD AS rstcd, eng.ENNM AS ennm, " + - "REGEXP_REPLACE(LISTAGG(DISTINCT TO_CHAR(wtrv.STCD), ',') WITHIN GROUP (ORDER BY wtrv.STCD), '([^,]+)(,\\1)*(,|$)', '\\1\\3') AS stcd, " + - "REGEXP_REPLACE(LISTAGG(DISTINCT TO_CHAR(wtrv.STNM), ',') WITHIN GROUP (ORDER BY wtrv.STCD), '([^,]+)(,\\1)*(,|$)', '\\1\\3') AS stnm, " + - "REGEXP_REPLACE(LISTAGG(DISTINCT TO_CHAR(vt.STCD), ',') WITHIN GROUP (ORDER BY vt.STCD), '([^,]+)(,\\1)*(,|$)', '\\1\\3') AS vtStcd, " + - "REGEXP_REPLACE(LISTAGG(DISTINCT TO_CHAR(vt.STNM), ',') WITHIN GROUP (ORDER BY vt.STCD), '([^,]+)(,\\1)*(,|$)', '\\1\\3') AS vtStnm " + + "REGEXP_REPLACE(LISTAGG(TO_CHAR(wtrv.STCD), ',') WITHIN GROUP (ORDER BY wtrv.STCD), '([^,]+)(,\\1)*(,|$)', '\\1\\3') AS stcd, " + + "REGEXP_REPLACE(LISTAGG(TO_CHAR(wtrv.STNM), ',') WITHIN GROUP (ORDER BY wtrv.STCD), '([^,]+)(,\\1)*(,|$)', '\\1\\3') AS stnm, " + + "REGEXP_REPLACE(LISTAGG(TO_CHAR(vt.STCD), ',') WITHIN GROUP (ORDER BY vt.STCD), '([^,]+)(,\\1)*(,|$)', '\\1\\3') AS vtStcd, " + + "REGEXP_REPLACE(LISTAGG(TO_CHAR(vt.STNM), ',') WITHIN GROUP (ORDER BY vt.STCD), '([^,]+)(,\\1)*(,|$)', '\\1\\3') AS vtStnm " + "FROM SD_ENGINFO_B_H eng " + - "LEFT JOIN SD_WT_B_H wtrv ON wtrv.RSTCD = eng.STCD AND wtrv.STTP = 'WTRV' AND wtrv.IS_DELETED = 0 AND wtrv.MWAY = 2 " + + "LEFT JOIN SD_WT_B_H wtrv ON eng.STCD = wtrv.RSTCD " + + "AND wtrv.STTP = 'WTRV' " + + "AND wtrv.IS_DELETED = 0 " + + "AND wtrv.MWAY = 2 " + + "AND wtrv.DTIN_TYPE = 0 " + "LEFT JOIN SD_WTENGRLTN_B rel ON rel.STCD = wtrv.STCD AND rel.IS_DELETED = 0 " + - "LEFT JOIN SD_WT_B_H vt ON vt.RSTCD = eng.STCD AND vt.STTP = 'WTVT' AND vt.IS_DELETED = 0 AND vt.MWAY = 2 " + + "LEFT JOIN SD_WT_B_H vt ON eng.STCD = vt.RSTCD " + + "AND vt.STTP = 'WTVT' " + + "AND vt.IS_DELETED = 0 " + + "AND vt.MWAY = 2 " + "WHERE eng.USFL = 1 " + - "AND wtrv.STCD IS NOT NULL AND vt.STCD IS NOT NULL AND rel.ENG_DWT_CODE IS NOT NULL " + + "AND wtrv.STCD IS NOT NULL " + + "AND vt.STCD IS NOT NULL " + + "AND rel.ENG_DWT_CODE IS NOT NULL " + "AND (wtrv.STCD = #{stcd} OR vt.STCD = #{stcd} OR eng.STCD = #{stcd}) " + - "AND rel.ENG_DWT_CODE = eng.STCD " + + "AND eng.STCD = rel.ENG_DWT_CODE " + "GROUP BY eng.STCD, eng.ENNM") WtrvInfo getWtrvInfoByStcd3(@Param("stcd") String stcd); } diff --git a/backend/src/main/java/com/yfd/platform/env/service/impl/AlongListServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/service/impl/AlongListServiceImpl.java index 599b90c..aeaa877 100644 --- a/backend/src/main/java/com/yfd/platform/env/service/impl/AlongListServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/service/impl/AlongListServiceImpl.java @@ -62,7 +62,7 @@ public class AlongListServiceImpl extends ServiceImpl= #{tm} AND TM <= #{tm_1} AND WT IS NOT NULL ) t3 " +