diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEngMonitorController.java b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEngMonitorController.java index f0bdbeb5..8aca07cb 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEngMonitorController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/controller/SdEngMonitorController.java @@ -63,4 +63,10 @@ public class SdEngMonitorController { public ResponseResult getRsvrcscdBRvcdList(@RequestBody DataSourceRequest dataSourceRequest) { return ResponseResult.successData(engInfoBHService.getRsvrcscdBRvcdList(dataSourceRequest)); } + + @PostMapping("/rsvrcscdb/getQgcRvcd") + @Operation(summary = "查询梯级流域图流域") + public ResponseResult getQgcRvcdList(@RequestBody DataSourceRequest dataSourceRequest) { + return ResponseResult.successData(engInfoBHService.getQgcRvcdList(dataSourceRequest)); + } } diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngQgcRvcdVo.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngQgcRvcdVo.java new file mode 100644 index 00000000..e9db9690 --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/vo/EngQgcRvcdVo.java @@ -0,0 +1,11 @@ +package com.yfd.platform.qgc_base.domain.vo; + +import lombok.Data; + +@Data +public class EngQgcRvcdVo { + + private String rvcd; + + private String rvnm; +} 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 fbf4ea9a..e469c5e7 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 @@ -9,6 +9,7 @@ import com.yfd.platform.qgc_base.domain.SdEngInfoBHRequest; import com.yfd.platform.qgc_base.domain.vo.EngBaseInfoVo; import com.yfd.platform.qgc_base.domain.vo.EngEiaapprovalVo; import com.yfd.platform.qgc_base.domain.vo.EngOperatVo; +import com.yfd.platform.qgc_base.domain.vo.EngQgcRvcdVo; import com.yfd.platform.qgc_base.domain.vo.EngRsvrcscdBVo; import com.yfd.platform.qgc_base.domain.vo.EngRsvrcscdRvcdVo; import com.yfd.platform.qgc_base.domain.vo.EngPointVo; @@ -95,4 +96,6 @@ public interface ISdEngInfoBHService extends IService { DataSourceResult getRsvrcscdBKendoList(DataSourceRequest dataSourceRequest); DataSourceResult getRsvrcscdBRvcdList(DataSourceRequest dataSourceRequest); + + DataSourceResult getQgcRvcdList(DataSourceRequest dataSourceRequest); } 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 172bdadf..2d144fa7 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 @@ -27,6 +27,7 @@ import com.yfd.platform.qgc_base.domain.SdEngInfoBHRequest; import com.yfd.platform.qgc_base.domain.vo.EngBaseInfoVo; import com.yfd.platform.qgc_base.domain.vo.EngEiaapprovalVo; import com.yfd.platform.qgc_base.domain.vo.EngOperatVo; +import com.yfd.platform.qgc_base.domain.vo.EngQgcRvcdVo; import com.yfd.platform.qgc_base.domain.vo.EngRsvrcscdBVo; import com.yfd.platform.qgc_base.domain.vo.EngRsvrcscdRvcdVo; import com.yfd.platform.qgc_base.domain.vo.EngPointVo; @@ -2994,14 +2995,19 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl list = microservicDynamicSQLMapper.getAllListWithResultType( sql.toString(), paramMap, EngRsvrcscdRvcdVo.class); @@ -3010,6 +3016,29 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl getQgcRvcdList(DataSourceRequest dataSourceRequest) { + DataSourceResult result = new DataSourceResult<>(); + result.setAggregates(new HashMap<>()); + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT DISTINCT ") + .append("rv.RVCD AS rvcd, ") + .append("rv.RVNM AS rvnm, ") + .append("NVL(rv.ORDER_INDEX, 999999) AS order_index ") + .append("FROM SD_RVCD_DIC rv ") + .append("INNER JOIN MS_LYSXJGX_B rel ON rel.QGC_RVCD = rv.RVCD AND NVL(rel.IS_DELETED, 0) = 0 ") + .append("WHERE NVL(rv.IS_DELETED, 0) = 0 ") + .append("AND NVL(rv.ENABLED, 1) = 1 ") + .append("ORDER BY order_index ASC, rv.RVCD ASC"); + + List list = microservicDynamicSQLMapper.getAllListWithResultType( + sql.toString(), new HashMap<>(), EngQgcRvcdVo.class); + result.setData(list); + result.setTotal(list.size()); + return result; + } + private String buildRsvrcscdBFilterCondition(DataSourceRequest.FilterDescriptor filter, Map paramMap, int[] indexHolder) {