From 7fb042387b8a4c06011090194471263ce7fa53e7 Mon Sep 17 00:00:00 2001 From: tangwei Date: Wed, 9 Sep 2026 09:21:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=99=BA=E8=83=BD=E8=A3=85=E5=A4=87?= =?UTF-8?q?=E9=94=9A=E7=82=B9=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qgc_env/ime/controller/ImeController.java | 6 ++++++ .../qgc_env/ime/entity/vo/ImeVmsstbprptVo.java | 3 +++ .../qgc_env/ime/service/impl/ImeServiceImpl.java | 1 + .../mapcfg/controller/MapmoduleBController.java | 13 +++++++++++-- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/ime/controller/ImeController.java b/backend/src/main/java/com/yfd/platform/qgc_env/ime/controller/ImeController.java index c2e2c18b..3623fbd7 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/ime/controller/ImeController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/ime/controller/ImeController.java @@ -27,6 +27,12 @@ public class ImeController { return ResponseResult.successData(imeService.getVmsstbprptList(dataSourceRequest)); } + @PostMapping("/imePoint/GetKendoList") + @Operation(summary = "智能装备锚点查询") + public ResponseResult getImePointList(@RequestBody DataSourceRequest dataSourceRequest) { + return ResponseResult.successData(imeService.getVmsstbprptList(dataSourceRequest)); + } + @PostMapping("/base/device/stat") @Operation(summary = "各基地设备数量统计(堆叠条形图)") public ResponseResult getBaseDeviceStat(@RequestBody DataSourceRequest dataSourceRequest) { diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/ime/entity/vo/ImeVmsstbprptVo.java b/backend/src/main/java/com/yfd/platform/qgc_env/ime/entity/vo/ImeVmsstbprptVo.java index 2fbb3976..66e706e9 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/ime/entity/vo/ImeVmsstbprptVo.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/ime/entity/vo/ImeVmsstbprptVo.java @@ -15,6 +15,9 @@ public class ImeVmsstbprptVo { @Schema(description = "站类编码") private String sttpCode; + @Schema(description = "描点状态") + private String anchoPointState; + @Schema(description = "站点编码") private String stcd; diff --git a/backend/src/main/java/com/yfd/platform/qgc_env/ime/service/impl/ImeServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_env/ime/service/impl/ImeServiceImpl.java index 262d3342..02134c04 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_env/ime/service/impl/ImeServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_env/ime/service/impl/ImeServiceImpl.java @@ -433,6 +433,7 @@ public class ImeServiceImpl implements ImeService { return "SELECT " + "src.STCD AS id, " + "src.STTP_CODE AS sttpCode, " + + "CONCAT('ZHZB_', src.STTP_CODE) AS anchoPointState, " + "src.STLC AS stlc, " + "src.STCD AS stcd, " + "src.STNM AS stnm, " + diff --git a/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/controller/MapmoduleBController.java b/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/controller/MapmoduleBController.java index 02e72757..1d50ad10 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/controller/MapmoduleBController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_sys/mapcfg/controller/MapmoduleBController.java @@ -171,6 +171,7 @@ public class MapmoduleBController { MsMapmoduleB layerModule = new MsMapmoduleB(); layerModule.setModuleId(mapmoduleB.getModuleId()); layerModule.setSystemId(mapmoduleB.getSystemId()); +// layerModule.setResType("layer"); layerModule.setResType("layer"); layerModule.setResId(layer.getId()); layerModule.setChildNode(mapmoduleB.getChildNode()); @@ -190,14 +191,22 @@ public class MapmoduleBController { updateWrapper.eq(MsMapmoduleB::getSystemId, mapmoduleB.getSystemId()); updateWrapper.eq(MsMapmoduleB::getResType, "layer"); updateWrapper.eq(MsMapmoduleB::getResId, layer.getId()); - updateWrapper.eq(MsMapmoduleB::getIsDeleted, 0).set(MsMapmoduleB::getChecked, mapmoduleB.getChecked()); + updateWrapper.eq(MsMapmoduleB::getIsDeleted, 0).set(MsMapmoduleB::getCanBeChecked, mapmoduleB.getChecked()).set(MsMapmoduleB::getChecked, mapmoduleB.getChecked()); mapmoduleBService.update(updateWrapper); + LambdaUpdateWrapper updateWrapper1 = new LambdaUpdateWrapper<>(); + updateWrapper1.eq(MsMapmoduleB::getModuleId, mapmoduleB.getModuleId()); + updateWrapper1.eq(MsMapmoduleB::getSystemId, mapmoduleB.getSystemId()); + updateWrapper1.eq(MsMapmoduleB::getResType, mapmoduleB.getResType()); + updateWrapper1.eq(MsMapmoduleB::getResId, maplegendB.getId()); + updateWrapper1.eq(MsMapmoduleB::getIsDeleted, 0).set(MsMapmoduleB::getCanBeChecked, mapmoduleB.getChecked()); + mapmoduleBService.update(updateWrapper1); + } } } } - + mapmoduleB.setCanBeChecked(mapmoduleB.getChecked()); return ResponseResult.successData(mapmoduleBService.saveOrUpdate(mapmoduleB)); }