diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java index 3aba66c4..49d442b7 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java @@ -2976,7 +2976,7 @@ public class EngEqDataServiceImpl implements EngEqDataService { "CASE WHEN t.PBASEID = '0' THEN NULL ELSE t.PBASEID END AS parentCode, " + "t.GRD AS treeLevel, " + "CASE WHEN EXISTS (SELECT 1 FROM SD_HYDROBASE c WHERE c.PBASEID = t.BASEID AND NVL(c.IS_DELETED, 0) = 0) THEN 1 ELSE 0 END AS hasChildren, " + - "CAST(NULL AS VARCHAR2(36)) AS objId, " + + "t.BASEID AS objId, " + "CAST(NULL AS VARCHAR2(20)) AS topWbsType, " + "t.PATH AS fullPath, " + "1 AS internal, " + diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/controller/FprMonitorController.java b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/controller/FprMonitorController.java index 8a3b1c22..733c5d0d 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/fpr/controller/FprMonitorController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/fpr/controller/FprMonitorController.java @@ -2,6 +2,7 @@ package com.yfd.platform.qgc_env.fpr.controller; import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.config.ResponseResult; +import com.yfd.platform.qgc_eng.eq.service.EngEqDataService; import com.yfd.platform.qgc_env.fpr.service.FprMonitorService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -21,9 +22,20 @@ public class FprMonitorController { @Resource private FprMonitorService fprMonitorService; + @Resource + private EngEqDataService engEqDataService; + + @PostMapping("/msstbprpt/GetKendoList") @Operation(summary = "鱼类调查装置站基础列表") public ResponseResult getMsstbprptList(@RequestBody DataSourceRequest dataSourceRequest) { return ResponseResult.successData(fprMonitorService.getMsstbprptList(dataSourceRequest)); } + + @PostMapping("/wbsb/GetKendoList") + @Operation(summary = "查询基地/基地流域树数据") + public ResponseResult getWbsbList(@RequestBody DataSourceRequest dataSourceRequest) { + return ResponseResult.successData(engEqDataService.getWbsbList(dataSourceRequest)); + } + }