代码调整

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<List<CsLedgerVO>> getDeviceTree(){
-        String methodDescribe = getMethodDescribe("getDeviceTree");
-        List<CsLedgerVO> list = csEquipmentDeliveryService.getDeviceTree();
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
-    }
-
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/deviceData")
     @ApiOperation("装置基础数据和模板数据")

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<List<CsLedgerVO>> lineTree(){
         String methodDescribe = getMethodDescribe("lineTree");
         List<CsLedgerVO> list = csLedgerService.getLineTree();
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/deviceTree")
+    @ApiOperation("三层设备树(装置层)")
+    public HttpResult<List<CsLedgerVO>> getDeviceTree(){
+        String methodDescribe = getMethodDescribe("getDeviceTree");
+        List<CsLedgerVO> list = csLedgerService.getDeviceTree();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/add")
     @ApiOperation("新增台账信息")

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java

@@ -74,12 +74,6 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
      */
     Page<CsEquipmentDeliveryVO> list(CsEquipmentDeliveryQueryParm param);
 
-    /**
-     * 终端三层树
-     * @return
-     */
-    List<CsLedgerVO> getDeviceTree();
-
     /**
      * 获取装置基础数据和模板数据
      * @return

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/ICsLedgerService.java

@@ -28,6 +28,12 @@ public interface ICsLedgerService {
      */
     List<CsLedgerVO> getLineTree();
 
+    /**
+     * 终端三层树
+     * @return
+     */
+    List<CsLedgerVO> getDeviceTree();
+
     /**
      * 新增台账数据
      * @param csLedgerParam

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java

@@ -169,24 +169,6 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         return this.baseMapper.page(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper);
     }
 
-    @Override
-    public List<CsLedgerVO> getDeviceTree() {
-        List<CsLedgerVO> engineeringList = new ArrayList<>();
-        List<CsLedgerVO> 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<CsEngineeringPO> engineering = csEngineeringUserService.getEngineeringByUser();
-            engineeringList = allList.stream().filter(item->engineering.stream().map(CsEngineeringPO::getId).collect(Collectors.toList()).contains(item.getId())).collect(Collectors.toList());
-        }
-        List<CsLedgerVO> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-        List<CsLedgerVO> 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();

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

@@ -74,6 +74,24 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         return engineeringList;
     }
 
+    @Override
+    public List<CsLedgerVO> getDeviceTree() {
+        List<CsLedgerVO> engineeringList = new ArrayList<>();
+        List<CsLedgerVO> 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<CsEngineeringPO> engineering = csEngineeringUserService.getEngineeringByUser();
+            engineeringList = allList.stream().filter(item->engineering.stream().map(CsEngineeringPO::getId).collect(Collectors.toList()).contains(item.getId())).collect(Collectors.toList());
+        }
+        List<CsLedgerVO> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
+        List<CsLedgerVO> 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();