From bdfdc9e75c0acc2f2d6992f0ca8bb2cffa0e2789 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Fri, 26 Jun 2026 19:12:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(ledger):=20=E5=AE=9E=E7=8E=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=AE=BE=E5=A4=87=E6=9D=83=E9=99=90=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E5=8F=B0=E8=B4=A6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 集成CsCommTerminalFeignClient用于获取用户关联的设备线路
- 新增filterLedgerTree方法实现台账树的递归过滤功能
- 添加isNodeRelevant方法判断节点是否包含目标监测点
- 重构CsLedgerServiceImpl中的线路数据处理逻辑
- 在CsLedgerVO中新增lineNo字段用于监测点线路号显示
- 修复CsLinePOServiceImpl中线路号为空时的默认值处理
- 注释掉过期的线路最新数据查询接口调用
- 优化IcdServiceImpl中的线路排序逻辑并修正默认值处理
---
 .../equipment/CsUpgradeLogsController.java           |  9 +++------
 .../csdevice/service/impl/CsLinePOServiceImpl.java   | 12 ++++++------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java
index 0857e66..3072fe0 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsUpgradeLogsController.java
@@ -16,10 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -48,10 +45,10 @@ public class CsUpgradeLogsController extends BaseController {
     }
 
     @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD)
-    @PostMapping("/getByDevId")
+    @GetMapping("/getByDevId")
     @ApiOperation("查询指定devId的所有升级日志")
     @ApiImplicitParam(name = "devId", value = "装置Id", required = true)
-    public HttpResult<List<CsUpgradeLogs>> getByDevId(@RequestBody String devId) {
+    public HttpResult<List<CsUpgradeLogs>> getByDevId(@RequestParam("devId") String devId) {
         String methodDescribe = getMethodDescribe("getByDevId");
         List<CsUpgradeLogs> result = csUpgradeLogsService.lambdaQuery().eq(CsUpgradeLogs::getDevId, devId).list();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
index f4b3526..6ca180f 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java
@@ -398,11 +398,11 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
             sensitiveUserNameMap = pqSensitiveUserList.stream().collect(Collectors.toMap(PqSensitiveUser::getId, PqSensitiveUser::getName));
         }
         // 最新数据时间
-//        List<CsLineLatestData> lineLatestDataList = csLineLatestDataFeignClient.listData().getData();
-//        Map<String,CsLineLatestData> lineLatestDataMap = new HashMap<>();
-//        if (CollUtil.isNotEmpty(lineLatestDataList)) {
-//            lineLatestDataMap = lineLatestDataList.stream().collect(Collectors.toMap(CsLineLatestData::getLineId, item -> item));
-//        }
+        List<CsLineLatestData> lineLatestDataList = csLineLatestDataFeignClient.listData().getData();
+        Map<String,CsLineLatestData> lineLatestDataMap = new HashMap<>();
+        if (CollUtil.isNotEmpty(lineLatestDataList)) {
+            lineLatestDataMap = lineLatestDataList.stream().collect(Collectors.toMap(CsLineLatestData::getLineId, item -> item));
+        }
 
         PqSensitiveUserLineVO sensitiveUserLineVO;
 
@@ -447,7 +447,7 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
             // 报告文件
             sensitiveUserLineVO.setReportFilePath(record.getReportFilePath());
             //最新数据时间
-            //sensitiveUserLineVO.setLatestTime(Objects.isNull(lineLatestDataMap.get(record.getLineId()))? null : lineLatestDataMap.get(record.getLineId()).getTimeId());
+            sensitiveUserLineVO.setLatestTime(Objects.isNull(lineLatestDataMap.get(record.getLineId()))? null : lineLatestDataMap.get(record.getLineId()).getTimeId());
             list.add(sensitiveUserLineVO);
         }
         result.setRecords(list);