Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

云前置改造-微调

Browse Source
This commit is contained in:
xy
2025-10-20 09:30:13 +08:00
parent 995bd8b310
commit d10240758b
2 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/icd/NodeController.java
View File

@@ -196,8 +196,8 @@ public class NodeController extends BaseController {
}) })
public HttpResult<String> updateDevProcessNo(@RequestParam String id,@RequestParam Integer processNo){ public HttpResult<String> updateDevProcessNo(@RequestParam String id,@RequestParam Integer processNo){
String methodDescribe = getMethodDescribe("updateDevProcessNo"); String methodDescribe = getMethodDescribe("updateDevProcessNo");
iNodeService.updateDevProcessNo(id,processNo); String result = iNodeService.updateDevProcessNo(id,processNo);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
} }
} }

19
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java
View File

@@ -689,7 +689,6 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
Set<String> list3 = tree5.stream().map(CsLedgerVO::getPid).collect(Collectors.toSet()); Set<String> list3 = tree5.stream().map(CsLedgerVO::getPid).collect(Collectors.toSet());
projectTree = tree2.stream().filter(vo -> !list3.contains(vo.getId())).collect(Collectors.toList()); projectTree = tree2.stream().filter(vo -> !list3.contains(vo.getId())).collect(Collectors.toList());
List<CsLedgerVO> tree6 = tree2.stream().filter(vo -> list3.contains(vo.getId())).collect(Collectors.toList()); List<CsLedgerVO> tree6 = tree2.stream().filter(vo -> list3.contains(vo.getId())).collect(Collectors.toList());
Set<String> proList = tree6.stream().map(CsLedgerVO::getPid).collect(Collectors.toSet()); Set<String> proList = tree6.stream().map(CsLedgerVO::getPid).collect(Collectors.toSet());
engineerTree = tree1.stream().filter(vo -> !proList.contains(vo.getId())).collect(Collectors.toList()); engineerTree = tree1.stream().filter(vo -> !proList.contains(vo.getId())).collect(Collectors.toList());
@@ -714,24 +713,6 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
} }
}) })
.collect(Collectors.toList()); .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());
// }
// });
// });
} }
} }
} }