From a8df0efa9c73dedec505f922879e98aa03de7352 Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Mon, 19 Jun 2023 15:27:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/EquipmentDeliveryController.java | 9 --------- .../controller/ledger/CsLedgerController.java | 11 ++++++++++- .../service/CsEquipmentDeliveryService.java | 6 ------ .../csdevice/service/ICsLedgerService.java | 6 ++++++ .../impl/CsEquipmentDeliveryServiceImpl.java | 18 ------------------ .../service/impl/CsLedgerServiceImpl.java | 18 ++++++++++++++++++ 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java index c3b6dbc..cd51cb9 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java @@ -131,15 +131,6 @@ public class EquipmentDeliveryController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/deviceTree") - @ApiOperation("三层设备树") - public HttpResult> getDeviceTree(){ - String methodDescribe = getMethodDescribe("getDeviceTree"); - List list = csEquipmentDeliveryService.getDeviceTree(); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); - } - @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/deviceData") @ApiOperation("装置基础数据和模板数据") diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java index 44b35a4..ad4d1d6 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java @@ -51,13 +51,22 @@ public class CsLedgerController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/lineTree") - @ApiOperation("治理监测点树") + @ApiOperation("四层设备树(监测点层)") public HttpResult> lineTree(){ String methodDescribe = getMethodDescribe("lineTree"); List list = csLedgerService.getLineTree(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/deviceTree") + @ApiOperation("三层设备树(装置层)") + public HttpResult> getDeviceTree(){ + String methodDescribe = getMethodDescribe("getDeviceTree"); + List list = csLedgerService.getDeviceTree(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/add") @ApiOperation("新增台账信息") diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java index 467a065..749b395 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java @@ -74,12 +74,6 @@ public interface CsEquipmentDeliveryService extends IService list(CsEquipmentDeliveryQueryParm param); - /** - * 终端三层树 - * @return - */ - List getDeviceTree(); - /** * 获取装置基础数据和模板数据 * @return diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsLedgerService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsLedgerService.java index b9abcb5..b6aba0b 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsLedgerService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsLedgerService.java @@ -28,6 +28,12 @@ public interface ICsLedgerService { */ List getLineTree(); + /** + * 终端三层树 + * @return + */ + List getDeviceTree(); + /** * 新增台账数据 * @param csLedgerParam diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java index 7c005ae..63c7f6f 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -169,24 +169,6 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper); } - @Override - public List getDeviceTree() { - List engineeringList = new ArrayList<>(); - List allList = csLedgerMapper.getAll(); - //fixme 这边先根据登录的用户名称来区分是否展示所有的台账信息 - if (Objects.equals(RequestUtil.getUsername(),"root")){ - engineeringList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList()); - } else { - List engineering = csEngineeringUserService.getEngineeringByUser(); - engineeringList = allList.stream().filter(item->engineering.stream().map(CsEngineeringPO::getId).collect(Collectors.toList()).contains(item.getId())).collect(Collectors.toList()); - } - List projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList()); - List deviceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.DEVICE_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList()); - projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList))); - engineeringList.forEach(eng -> eng.setChildren(getChildren(eng, projectList))); - return engineeringList; - } - @Override public DeviceManagerVO getDeviceData(String deviceId) { DeviceManagerVO deviceManagerVo = new DeviceManagerVO(); 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 cc9d5a2..8ced0f9 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 @@ -74,6 +74,24 @@ public class CsLedgerServiceImpl extends ServiceImpl i return engineeringList; } + @Override + public List getDeviceTree() { + List engineeringList = new ArrayList<>(); + List allList = this.baseMapper.getAll(); + //fixme 这边先根据登录的用户名称来区分是否展示所有的台账信息 + if (Objects.equals(RequestUtil.getUsername(),"root")){ + engineeringList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList()); + } else { + List engineering = csEngineeringUserService.getEngineeringByUser(); + engineeringList = allList.stream().filter(item->engineering.stream().map(CsEngineeringPO::getId).collect(Collectors.toList()).contains(item.getId())).collect(Collectors.toList()); + } + List projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList()); + List deviceList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.DEVICE_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList()); + projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList))); + engineeringList.forEach(eng -> eng.setChildren(getChildren(eng, projectList))); + return engineeringList; + } + @Override public void addLedgerTree(CsLedgerParam csLedgerParam) { CsLedger fatherCsLedger = this.lambdaQuery().eq(CsLedger::getId,csLedgerParam.getPid()).one();