From d10240758b139f43cf472e4d2559cb6c85da9414 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 20 Oct 2025 09:30:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E5=89=8D=E7=BD=AE=E6=94=B9=E9=80=A0-?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/icd/NodeController.java | 4 ++-- .../service/impl/CsLedgerServiceImpl.java | 19 ------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/icd/NodeController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/icd/NodeController.java index bd771fa..6f3033f 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/icd/NodeController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/icd/NodeController.java @@ -196,8 +196,8 @@ public class NodeController extends BaseController { }) public HttpResult updateDevProcessNo(@RequestParam String id,@RequestParam Integer processNo){ String methodDescribe = getMethodDescribe("updateDevProcessNo"); - iNodeService.updateDevProcessNo(id,processNo); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + String result = iNodeService.updateDevProcessNo(id,processNo); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java index 8d544cc..d23a879 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java @@ -689,7 +689,6 @@ public class CsLedgerServiceImpl extends ServiceImpl i Set list3 = tree5.stream().map(CsLedgerVO::getPid).collect(Collectors.toSet()); projectTree = tree2.stream().filter(vo -> !list3.contains(vo.getId())).collect(Collectors.toList()); - List tree6 = tree2.stream().filter(vo -> list3.contains(vo.getId())).collect(Collectors.toList()); Set proList = tree6.stream().map(CsLedgerVO::getPid).collect(Collectors.toSet()); engineerTree = tree1.stream().filter(vo -> !proList.contains(vo.getId())).collect(Collectors.toList()); @@ -714,24 +713,6 @@ public class CsLedgerServiceImpl extends ServiceImpl i } }) .collect(Collectors.toList()); - -// deviceTree = tree3.stream().filter(vo -> list1.contains(vo.getId())).collect(Collectors.toList()); -// deviceTree.forEach(item->{ -// devs.forEach(item2->{ -// if (Objects.equals(item.getId(),item2.getId())) { -// item.setComFlag(item2.getRunStatus()); -// } -// }); -// }); - -// lineTree = tree4.stream().filter(vo -> list1.contains(vo.getPid())).collect(Collectors.toList()); -// lineTree.forEach(item->{ -// devs.forEach(item2->{ -// if (Objects.equals(item.getPid(),item2.getId())) { -// item.setComFlag(item2.getRunStatus()); -// } -// }); -// }); } } }