前置日志优化

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/constant/DataParam.java

@@ -58,7 +58,7 @@ public interface DataParam {
 
     String GOVERNANCE_SYSTEM = "治理系统";
 
-    String cldDev = "在线设备";
+    String cldDev = "监测设备";
 
     String EvtParamPhase = "Evt_Param_Phase";
 

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

@@ -596,7 +596,6 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
 
         return device;
     }
-
     @Override
     public List<CsLedgerVO> getztProjectTree() {
         List<CsLedgerVO> engineeringList;
@@ -604,72 +603,260 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         /*获取用户工程，设备信息过滤*/
         List<String> roleengineer = roleEngineerDevService.getRoleengineer();
         List<String> device = roleEngineerDevService.getDevice();
+
+        List<String> zhiLianDevice = new ArrayList<>();
+        List<String> cldDevice = new ArrayList<>();
+        if (CollectionUtil.isNotEmpty(device)) {
+            List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryMapper.selectBatchIds(device);
+            DictTreeVO vo1 = dictTreeFeignClient.queryByCode(DicDataEnum.DEV_CLD.getCode()).getData();
+            Optional.ofNullable(vo1)
+                    .map(DictTreeVO::getId)
+                    .ifPresent(id -> csEquipmentDeliveryPOS.stream()
+                            .filter(item -> Objects.equals(item.getDevType(), id))
+                            .map(CsEquipmentDeliveryPO::getId)
+                            .forEach(cldDevice::add)
+                    );
+            DictTreeVO vo2 = dictTreeFeignClient.queryByCode(DicDataEnum.CONNECT_DEV.getCode()).getData();
+            Optional.ofNullable(vo2)
+                    .map(DictTreeVO::getId)
+                    .ifPresent(id -> csEquipmentDeliveryPOS.stream()
+                            .filter(item -> Objects.equals(item.getDevType(), id))
+                            .map(CsEquipmentDeliveryPO::getId)
+                            .forEach(zhiLianDevice::add)
+                    );
+        }
+
         engineeringList = allList.stream().filter(item -> roleengineer.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 -> device.contains(item.getId()) && !Objects.equals(item.getPid(), "0")).
+        Map<String, CsEquipmentDeliveryPO> poMap = allList.stream()
-                peek(
+                .filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(), "0"))
-                        temp -> {
+                .map(CsLedgerVO::getId)
-                            CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(temp.getId());
+                .distinct()
-                            temp.setComFlag(po.getRunStatus());
+                .collect(Collectors.toMap(
-                            temp.setNDId(po.getNdid());
+                        Function.identity(),
-                            temp.setType("device");
+                        csEquipmentDeliveryMapper::selectById
-                        }
+                ));
-                ).
-                sorted(Comparator.comparing(CsLedgerVO::getSort))
-                .collect(Collectors.toList());
-        checkDevSetData(deviceList);
-        projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList)));
-        engineeringList.forEach(eng -> eng.setChildren(getChildren(eng, projectList)));
 
-        //获取便携式项目数
+        //获取治理设备
+        List<CsLedgerVO> deviceList = allList.stream()
+                .filter(item -> zhiLianDevice.contains(item.getId()) && !Objects.equals(item.getPid(), "0"))
+                .peek(item -> {
+                    CsEquipmentDeliveryPO po = poMap.get(item.getId());
+                    item.setComFlag(po.getRunStatus());
+                    item.setNDId(po.getNdid());
+                    item.setType("device");
+                    item.setProcess(po.getProcess());
+                })
+                .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
+                .collect(Collectors.toList());
+
+        List<CsLedgerVO> engineeringList1 = new ArrayList<>();
+        List<CsLedgerVO> projectList1 = new ArrayList<>();
+        checkDevSetData(deviceList);
+        List<String> dev = deviceList.stream().map(CsLedgerVO::getId).collect(Collectors.toList());
+        List<CsLedgerVO> ledger1 = getProAndEngineer(dev);
+        if (CollectionUtil.isNotEmpty(ledger1)) {
+            engineeringList1 = ledger1.stream().filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
+            projectList1 = ledger1.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
+            projectList1.forEach(pro -> pro.setChildren(getChildren(pro, deviceList)));
+            List<CsLedgerVO> finalProjectList = projectList1;
+            engineeringList1.forEach(eng -> eng.setChildren(getChildren(eng, finalProjectList)));
+        }
+
+        //获取云前置设备
+        List<CsLedgerVO> cldDevList = allList.stream()
+                .filter(item -> cldDevice.contains(item.getId()) && !Objects.equals(item.getPid(), "0"))
+                .peek(item -> {
+                    CsEquipmentDeliveryPO po = poMap.get(item.getId());
+                    item.setComFlag(po.getRunStatus());
+                    item.setNDId(po.getNdid());
+                    item.setType("device");
+                    item.setProcess(po.getProcess());
+                })
+                .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
+                .collect(Collectors.toList());
+        checkDevSetData(cldDevList);
+        List<CsLedgerVO> engineeringList2 = new ArrayList<>();
+        List<CsLedgerVO> projectList2 = new ArrayList<>();
+
+        List<String> dev2 = cldDevList.stream().map(CsLedgerVO::getId).collect(Collectors.toList());
+        List<CsLedgerVO> ledger2 = getProAndEngineer(dev2);
+        if (CollectionUtil.isNotEmpty(ledger2)) {
+            engineeringList2 = ledger2.stream().filter(item -> item.getLevel().equals(LineBaseEnum.ENGINEERING_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
+            projectList2 = ledger2.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
+            projectList2.forEach(pro -> pro.setChildren(getChildren(pro, cldDevList)));
+            List<CsLedgerVO> finalProjectList = projectList2;
+            engineeringList2.forEach(eng -> eng.setChildren(getChildren(eng, finalProjectList)));
+        }
+
+        //获取便携式设备树
         CsLedgerVO portable = new CsLedgerVO();
         portable.setLevel(0);
-        portable.setName(DataParam.PORTABLE_SYSTEM);
+        portable.setName(DataParam.portableDev);
         portable.setPid("0");
         portable.setId(IdUtil.simpleUUID());
 
-        CsLedgerVO project = new CsLedgerVO();
+        List<CsLedgerVO> ledger;
-        project.setLevel(1);
+        String role = RequestUtil.getUserRole();
-        project.setName(DataParam.WIRELESS_PROJECT);
+        List<String> roles = JSONArray.parseArray(role, String.class);
-        project.setPid("0");
+        if(roles.contains(AppRoleEnum.ROOT.getCode()) || roles.contains(AppRoleEnum.OPERATION_MANAGER.getCode()) || roles.contains(AppRoleEnum.REGULAR_USER.getCode())){
-        project.setId(DataParam.WIRELESS_PROJECT_ID);
+            ledger = allList.stream()
-
+                    .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0"))
-        List<CsLedgerVO> portables = allList.stream().filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0")).collect(Collectors.toList());
+                    .collect(Collectors.toList());
-        checkDevSetData(portables);
+        } else {
-        for (CsLedgerVO c : portables) {
+            LambdaQueryWrapper<CsDeviceUserPO> queryWrapper = new LambdaQueryWrapper<>();
-            c.setPid(project.getId());
+            queryWrapper.eq(CsDeviceUserPO::getPrimaryUserId, RequestUtil.getUserIndex());
-            CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(c.getId());
+            List<CsDeviceUserPO> list1 = csDeviceUserPOMapper.selectList(queryWrapper);
-            c.setComFlag(po.getRunStatus());
+            List<String> result = new ArrayList<>();
-            c.setNDId(po.getNdid());
+            if (CollectionUtil.isNotEmpty(list1)) {
-            c.setType("device");
+                result = list1.stream().map(CsDeviceUserPO::getDeviceId).collect(Collectors.toList());
+            }
+            //针对未启用的装置判断
+            List<String> finalResult = result;
+            ledger = allList.stream()
+                    .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0") && finalResult.contains(item.getId()))
+                    .collect(Collectors.toList());
         }
-        project.setChildren(portables);
 
-        List<CsLedgerVO> wxProjectList = new ArrayList<>();
+        Map<String, CsEquipmentDeliveryPO> poMap2 = ledger.stream()
-        wxProjectList.add(project);
+                .collect(Collectors.toMap(
-
+                        CsLedgerVO::getId,
-        portable.setChildren(wxProjectList);
+                        csEquipmentDeliveryMapper::selectById,
+                        (existing, replacement) -> existing
+                ));
+        List<CsLedgerVO> portables = ledger.stream()
+                .peek(c -> {
+                    CsEquipmentDeliveryPO po = poMap2.get(c.getId());
+                    c.setPid(portable.getId());
+                    c.setComFlag(po.getRunStatus());
+                    c.setNDId(po.getNdid());
+                    c.setType("device");
+                    c.setName(po.getName());
+                    c.setSort(po.getSort());
+                })
+                .filter(c -> poMap2.get(c.getId()).getUsageStatus() == 1)
+                .collect(Collectors.toList());
 
+        portables = portables.stream().sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
+        portable.setChildren(portables);
 
         CsLedgerVO government = new CsLedgerVO();
         government.setLevel(0);
-        government.setName(DataParam.GOVERNANCE_SYSTEM);
+        government.setName(DataParam.governmentDev);
         government.setPid("0");
         government.setId(IdUtil.simpleUUID());
-        government.setChildren(engineeringList);
+        government.setChildren(engineeringList1);
-        List<CsLedgerVO> tree = new ArrayList<>();
 
+        //获取云前置设备树
+        CsLedgerVO cld = new CsLedgerVO();
+        cld.setLevel(0);
+        cld.setName(DataParam.cldDev);
+        cld.setPid("0");
+        cld.setId(IdUtil.simpleUUID());
+        cld.setChildren(engineeringList2);
+
+        List<CsLedgerVO> tree = new ArrayList<>();
         if (CollUtil.isNotEmpty(portables)) {
-            tree.add(portable);
+            CsLedgerVO vo1 = new CsLedgerVO();
+            vo1.setLevel(0);
+            vo1.setName(DataParam.PORTABLE_SYSTEM);
+            vo1.setPid("0");
+            vo1.setId(IdUtil.simpleUUID());
+
+            CsLedgerVO vo2 = new CsLedgerVO();
+            vo2.setLevel(1);
+            vo2.setName(DataParam.WIRELESS_PROJECT);
+            vo2.setPid("0");
+            vo2.setId(DataParam.WIRELESS_PROJECT_ID);
+            vo2.setChildren(portables);
+            vo1.setChildren(Collections.singletonList(vo2));
+            tree.add(vo1);
         }
         if (CollUtil.isNotEmpty(deviceList)) {
             tree.add(government);
         }
-
+        if (CollUtil.isNotEmpty(cldDevList)) {
+            tree.add(cld);
+        }
         return tree;
     }
 
+//    @Override
+//    public List<CsLedgerVO> getztProjectTree() {
+//        List<CsLedgerVO> engineeringList;
+//        List<CsLedgerVO> allList = this.baseMapper.getAll();
+//        /*获取用户工程，设备信息过滤*/
+//        List<String> roleengineer = roleEngineerDevService.getRoleengineer();
+//        List<String> device = roleEngineerDevService.getDevice();
+//        engineeringList = allList.stream().filter(item -> roleengineer.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 -> device.contains(item.getId()) && !Objects.equals(item.getPid(), "0")).
+//                peek(
+//                        temp -> {
+//                            CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(temp.getId());
+//                            temp.setComFlag(po.getRunStatus());
+//                            temp.setNDId(po.getNdid());
+//                            temp.setType("device");
+//                        }
+//                ).
+//                sorted(Comparator.comparing(CsLedgerVO::getSort))
+//                .collect(Collectors.toList());
+//        checkDevSetData(deviceList);
+//        projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList)));
+//        engineeringList.forEach(eng -> eng.setChildren(getChildren(eng, projectList)));
+//
+//        //获取便携式项目数
+//        CsLedgerVO portable = new CsLedgerVO();
+//        portable.setLevel(0);
+//        portable.setName(DataParam.PORTABLE_SYSTEM);
+//        portable.setPid("0");
+//        portable.setId(IdUtil.simpleUUID());
+//
+//        CsLedgerVO project = new CsLedgerVO();
+//        project.setLevel(1);
+//        project.setName(DataParam.WIRELESS_PROJECT);
+//        project.setPid("0");
+//        project.setId(DataParam.WIRELESS_PROJECT_ID);
+//
+//        List<CsLedgerVO> portables = allList.stream().filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0")).collect(Collectors.toList());
+//        checkDevSetData(portables);
+//        for (CsLedgerVO c : portables) {
+//            c.setPid(project.getId());
+//            CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(c.getId());
+//            c.setComFlag(po.getRunStatus());
+//            c.setNDId(po.getNdid());
+//            c.setType("device");
+//        }
+//        project.setChildren(portables);
+//
+//        List<CsLedgerVO> wxProjectList = new ArrayList<>();
+//        wxProjectList.add(project);
+//
+//        portable.setChildren(wxProjectList);
+//
+//
+//        CsLedgerVO government = new CsLedgerVO();
+//        government.setLevel(0);
+//        government.setName(DataParam.GOVERNANCE_SYSTEM);
+//        government.setPid("0");
+//        government.setId(IdUtil.simpleUUID());
+//        government.setChildren(engineeringList);
+//        List<CsLedgerVO> tree = new ArrayList<>();
+//
+//        if (CollUtil.isNotEmpty(portables)) {
+//            tree.add(portable);
+//        }
+//        if (CollUtil.isNotEmpty(deviceList)) {
+//            tree.add(government);
+//        }
+//
+//        return tree;
+//    }
+
     @Override
     public List<CsLedgerVO> objTree() {
         List<CsLedgerVO> result = new ArrayList<>();
@@ -698,6 +885,9 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         List<String> lineIds = poList.stream().map(CsLinePO::getLineId).distinct().collect(Collectors.toList());
 
         List<PqSensitiveUser> pqSensitiveUserList = pqSensitiveUserFeignClient.getListByIds(objIds).getData();
+        if (CollUtil.isEmpty(pqSensitiveUserList)) {
+            return result;
+        }
         Map<String,String> objMap = pqSensitiveUserList.stream().collect(Collectors.toMap(PqSensitiveUser::getId, PqSensitiveUser::getName));
 
         List<CsLedger> csLineList = this.baseMapper.selectList(new LambdaQueryWrapper<CsLedger>().in(CsLedger::getId, lineIds));

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

@@ -43,10 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -332,11 +329,15 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
         if (CollUtil.isEmpty(records)) {
             return result;
         }
+
         List<PqSensitiveUserLineVO> list = new ArrayList<>();
         List<String> sensitiveUserIds = list.stream().map(PqSensitiveUserLineVO::getSensitiveUser).distinct().collect(Collectors.toList());
 
-        Map<String, String> sensitiveUserNameMap = pqSensitiveUserFeignClient.getListByIds(sensitiveUserIds).getData()
+        Map<String, String> sensitiveUserNameMap = new HashMap<>();
-                .stream().collect(Collectors.toMap(PqSensitiveUser::getId, PqSensitiveUser::getName));
+        List<PqSensitiveUser> pqSensitiveUserList = pqSensitiveUserFeignClient.getListByIds(sensitiveUserIds).getData();
+        if (CollUtil.isNotEmpty(pqSensitiveUserList)) {
+            sensitiveUserNameMap = pqSensitiveUserList.stream().collect(Collectors.toMap(PqSensitiveUser::getId, PqSensitiveUser::getName));
+        }
         PqSensitiveUserLineVO sensitiveUserLineVO;
         for (CsLinePO record : records) {
             sensitiveUserLineVO = new PqSensitiveUserLineVO();

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CldWarnParam.java

@@ -0,0 +1,20 @@
+package com.njcn.csharmonic.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class CldWarnParam extends BaseParam implements Serializable {
+
+    @ApiModelProperty("告警等级")
+    private String level;
+
+}

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java

@@ -6,13 +6,13 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csharmonic.param.CldWarnParam;
 import com.njcn.csharmonic.param.CsEventUserQueryPage;
 import com.njcn.csharmonic.param.CsEventUserQueryParam;
 import com.njcn.csharmonic.pojo.po.CsEventPO;
 import com.njcn.csharmonic.pojo.vo.EventDetailVO;
 import com.njcn.csharmonic.service.CsEventUserPOService;
 import com.njcn.web.controller.BaseController;
-import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -82,7 +82,7 @@ public class EventUserController extends BaseController {
     @PostMapping("/frontWarnInfo")
     @ApiOperation("前置告警信息")
     @ApiImplicitParam(name = "baseParam", value = "基础查询数据", required = true)
-    public HttpResult<Page<CsEventPO>> frontWarnInfo(@RequestBody BaseParam baseParam) {
+    public HttpResult<Page<CsEventPO>> frontWarnInfo(@RequestBody CldWarnParam baseParam) {
         String methodDescribe = getMethodDescribe("frontWarnInfo");
         Page<CsEventPO> list = csEventUserPOService.getFrontWarnInfo(baseParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java

@@ -2,6 +2,7 @@ package com.njcn.csharmonic.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.csharmonic.param.CldWarnParam;
 import com.njcn.csharmonic.param.CsEventUserQueryPage;
 import com.njcn.csharmonic.param.CsEventUserQueryParam;
 import com.njcn.csharmonic.pojo.po.CsEventPO;
@@ -32,5 +33,5 @@ public interface CsEventUserPOService extends IService<CsEventUserPO>{
 
         Page<EventDetailVO> queryEventPageWeb(CsEventUserQueryPage csEventUserQueryPage);
 
-        Page<CsEventPO> getFrontWarnInfo(BaseParam baseParam);
+        Page<CsEventPO> getFrontWarnInfo(CldWarnParam baseParam);
 }

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java

@@ -18,6 +18,7 @@ import com.njcn.csdevice.pojo.po.Node;
 import com.njcn.csdevice.pojo.vo.CsLedgerVO;
 import com.njcn.csharmonic.mapper.CsEventPOMapper;
 import com.njcn.csharmonic.mapper.CsEventUserPOMapper;
+import com.njcn.csharmonic.param.CldWarnParam;
 import com.njcn.csharmonic.param.CsEventUserQueryPage;
 import com.njcn.csharmonic.param.CsEventUserQueryParam;
 import com.njcn.csharmonic.pojo.po.CsEventPO;
@@ -32,7 +33,6 @@ import com.njcn.system.api.EpdFeignClient;
 import com.njcn.system.pojo.po.EleEpdPqd;
 import com.njcn.system.pojo.po.EleEvtParm;
 import com.njcn.user.enums.AppRoleEnum;
-import com.njcn.web.pojo.param.BaseParam;
 import com.njcn.web.utils.RequestUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
@@ -392,40 +392,43 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
         if(!CollectionUtils.isEmpty(cldDevTree)){
             cldDevTree = cldDevTree.get(0).getChildren();
         }
+        if (ObjectUtil.isNull(csEventUserQueryPage.getDeviceId()) || StringUtils.isEmpty(csEventUserQueryPage.getDeviceId())) {
+            //便携式就1层下边就是设备
+            List<String> portableDevIds = portableDevTree.stream().filter(
+                    temp -> StringUtils.isEmpty(csEventUserQueryPage.getDeviceId()) ||
+                            Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId())
+            ).map(CsLedgerVO::getId).collect(Collectors.toList());
+            List<String> governmentDevIds = governmentDevTree.stream().filter(temp->StringUtils.isEmpty(csEventUserQueryPage.getEngineeringid())||
+                            Objects.equals(temp.getId(), csEventUserQueryPage.getEngineeringid()))
+                    .map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
+                            temp->StringUtils.isEmpty(csEventUserQueryPage.getProjectId())||
+                                    Objects.equals(temp.getId(), csEventUserQueryPage.getProjectId())
+                    ).
+                    map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
+                            temp->StringUtils.isEmpty(csEventUserQueryPage.getDeviceId())||
+                                    Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId())
+                    ).
+                    map(CsLedgerVO::getId).
+                    collect(Collectors.toList());
+            List<String> cldDevIds = cldDevTree.stream().filter(temp->StringUtils.isEmpty(csEventUserQueryPage.getEngineeringid())||
+                            Objects.equals(temp.getId(), csEventUserQueryPage.getEngineeringid()))
+                    .map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
+                            temp->StringUtils.isEmpty(csEventUserQueryPage.getProjectId())||
+                                    Objects.equals(temp.getId(), csEventUserQueryPage.getProjectId())
+                    ).
+                    map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
+                            temp->StringUtils.isEmpty(csEventUserQueryPage.getDeviceId())||
+                                    Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId())
+                    ).
+                    map(CsLedgerVO::getId).
+                    collect(Collectors.toList());
 
-        //便携式就1层下边就是设备
+            devIds.addAll(portableDevIds);
-        List<String> portableDevIds = portableDevTree.stream().filter(
+            devIds.addAll(governmentDevIds);
-                temp -> StringUtils.isEmpty(csEventUserQueryPage.getDeviceId()) ||
+            devIds.addAll(cldDevIds);
-                        Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId())
+        } else {
-        ).map(CsLedgerVO::getId).collect(Collectors.toList());
+            devIds.add(csEventUserQueryPage.getDeviceId());
-        List<String> governmentDevIds = governmentDevTree.stream().filter(temp->StringUtils.isEmpty(csEventUserQueryPage.getEngineeringid())||
+        }
-                        Objects.equals(temp.getId(), csEventUserQueryPage.getEngineeringid()))
-                .map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
-                        temp->StringUtils.isEmpty(csEventUserQueryPage.getProjectId())||
-                                Objects.equals(temp.getId(), csEventUserQueryPage.getProjectId())
-                ).
-                map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
-                        temp->StringUtils.isEmpty(csEventUserQueryPage.getDeviceId())||
-                                Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId())
-                ).
-                map(CsLedgerVO::getId).
-                collect(Collectors.toList());
-        List<String> cldDevIds = cldDevTree.stream().filter(temp->StringUtils.isEmpty(csEventUserQueryPage.getEngineeringid())||
-                        Objects.equals(temp.getId(), csEventUserQueryPage.getEngineeringid()))
-                .map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
-                        temp->StringUtils.isEmpty(csEventUserQueryPage.getProjectId())||
-                                Objects.equals(temp.getId(), csEventUserQueryPage.getProjectId())
-                ).
-                map(CsLedgerVO::getChildren).flatMap(Collection::stream).filter(
-                        temp->StringUtils.isEmpty(csEventUserQueryPage.getDeviceId())||
-                                Objects.equals(temp.getId(), csEventUserQueryPage.getDeviceId())
-                ).
-                map(CsLedgerVO::getId).
-                collect(Collectors.toList());
-
-        devIds.addAll(portableDevIds);
-        devIds.addAll(governmentDevIds);
-        devIds.addAll(cldDevIds);
 
         if (CollectionUtils.isEmpty(devIds)){
             return returnpage;
@@ -515,7 +518,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
     }
 
     @Override
-    public Page<CsEventPO> getFrontWarnInfo(BaseParam baseParam) {
+    public Page<CsEventPO> getFrontWarnInfo(CldWarnParam baseParam) {
         Page<CsEventPO> page = new Page<>(baseParam.getPageNum(), baseParam.getPageSize());
         List<Node> nodeList = nodeFeignClient.nodeAllList().getData();
         Map<String, Node> nodeMap = nodeList.stream().collect(Collectors.toMap(Node::getId, Function.identity()));
@@ -533,6 +536,9 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
                                 DateUtil.endOfDay(DateUtil.parse(baseParam.getSearchEndTime())).toString())
                         .eq(CsEventPO::getType, 4)
                         .orderByDesc(CsEventPO::getStartTime);
+                if (ObjectUtil.isNotNull(baseParam.getLevel()) && StringUtil.isNotBlank(baseParam.getLevel())) {
+                    queryWrapper.eq(CsEventPO::getLevel, Integer.valueOf(baseParam.getLevel()));
+                }
                 page = csEventPOMapper.selectPage(page, queryWrapper);
             }
         }

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RStatLimitRateDServiceImpl.java

@@ -2,6 +2,7 @@ package com.njcn.csharmonic.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
@@ -194,16 +195,20 @@ public class RStatLimitRateDServiceImpl extends ServiceImpl<RStatLimitRateDMappe
             mainLineVO.setLineId(lineId);
             if (linePO != null) {
                 mainLineVO.setLineName(linePO.getName());
-                if (linePO.getGovern().equals(0)) {
+                if (ObjectUtil.isNotNull(linePO.getGovern())) {
-                    mainLineVO.setGovern("未治理");
+                    if (linePO.getGovern().equals(0)) {
-                }
+                        mainLineVO.setGovern("未治理");
-                if (linePO.getGovern().equals(1)) {
+                    }
-                    mainLineVO.setGovern("已治理");
+                    if (linePO.getGovern().equals(1)) {
+                        mainLineVO.setGovern("已治理");
+                    }
                 }
                 mainLineVO.setObjType(linePO.getMonitorObj());
-                DictData dictData = dicDataFeignClient.getDicDataById(linePO.getMonitorObj()).getData();
+                if (ObjectUtil.isNotNull(linePO.getMonitorObj())) {
-                if (dictData != null) {
+                    DictData dictData = dicDataFeignClient.getDicDataById(linePO.getMonitorObj()).getData();
-                    mainLineVO.setObjType(dictData.getName());
+                    if (dictData != null) {
+                        mainLineVO.setObjType(dictData.getName());
+                    }
                 }
             }
             MainLineStatLimitRateDetailsQueryParam detailsQueryParam = new MainLineStatLimitRateDetailsQueryParam();