根据现场客户要求进行修改

event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/EventGateServiceImpl.java

@@ -98,8 +98,15 @@ public class EventGateServiceImpl implements EventGateService {
         if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) {
             throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
         }
+        if(eventDetail.getPersisttime()<10000){
             waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1);
 
+        }else {
+            waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 2);
+
+        }
+//        waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1);
+
         waveDataDTO = waveFileComponent.getValidData(waveDataDTO);
 
         waveDataDTO.setPtType(pqLinedetail.getPttype());

event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/LargeScreenCountServiceImpl.java

@@ -985,6 +985,16 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
         DeviceCountVO deviceCountVO = new DeviceCountVO();
         List<PqLine> pqLineList = (List<PqLine>) redisUtil.getObjectByKey(NAME_KEY + StrUtil.DASHED + "pqLineList");
         List<Integer> deptslineIds = (List<Integer>) redisUtil.getObjectByKey(NAME_KEY + StrUtil.DASHED + largeScreenCountParam.getDeptId());
+        largeScreenCountParam.setFiterSensitiveUser("1");
+        if(Objects.equals("1",largeScreenCountParam.getFiterSensitiveUser())){
+            //查询重要敏感客户
+            List<PqUserLedgerPO> poList = pqUserLedgerMapper.selectList(new LambdaQueryWrapper<PqUserLedgerPO>().select(PqUserLedgerPO::getId, PqUserLedgerPO::getCustomerName,PqUserLedgerPO::getIsShow).eq(PqUserLedgerPO::getIsShow, 1));
+            List<String> userIds = poList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList());
+            List<PqUserLineAssPO> pqUserLineAssPOS = pqUserLineAssMapper.selectList(new LambdaQueryWrapper<PqUserLineAssPO>().in(PqUserLineAssPO::getUserIndex, userIds));
+            List<Integer> templineIds = pqUserLineAssPOS.stream().map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList());
+            deptslineIds.retainAll(templineIds);
+        }
+
         pqLineList = pqLineList.stream().filter(temp -> deptslineIds.contains(temp.getLineIndex())).collect(Collectors.toList());
         List<Integer> devIndexs = pqLineList.stream().map(PqLine::getDevIndex).collect(Collectors.toList());
 
@@ -1031,7 +1041,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
             deptAndChildren.remove(largeScreenCountParam.getDeptId());
         }
         List<PqDevice> pqDeviceList = pqDeviceService.lambdaQuery().eq(PqDevice::getDevflag, 0).list();
-
+        //页面查询只显示敏感客户
+        largeScreenCountParam.setFiterSensitiveUser("1");
 //        List<PqsDeptsline> deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list();
         List<PqsDeptDTO> list = pqsDeptsService.getDeptList(deptAndChildren);
         list.forEach(temp -> {
@@ -1040,6 +1051,15 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
             regionDevCountVO.setDeptsname(temp.getDeptsname());
             regionDevCountVO.setAreaName(temp.getAreaName());
             List<Integer> deptslineIds = (List<Integer>) redisUtil.getObjectByKey(NAME_KEY + StrUtil.DASHED + temp.getDeptsIndex());
+
+            if(Objects.equals("1",largeScreenCountParam.getFiterSensitiveUser())){
+                //查询重要敏感客户
+                List<PqUserLedgerPO> poList = pqUserLedgerMapper.selectList(new LambdaQueryWrapper<PqUserLedgerPO>().select(PqUserLedgerPO::getId, PqUserLedgerPO::getCustomerName,PqUserLedgerPO::getIsShow).eq(PqUserLedgerPO::getIsShow, 1));
+                List<String> userIds = poList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList());
+                List<PqUserLineAssPO> pqUserLineAssPOS = pqUserLineAssMapper.selectList(new LambdaQueryWrapper<PqUserLineAssPO>().in(PqUserLineAssPO::getUserIndex, userIds));
+                List<Integer> lineIds = pqUserLineAssPOS.stream().map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList());
+                deptslineIds.retainAll(lineIds);
+            }
             List<PqLine> collect = pqLineList.stream().filter(pqLine -> deptslineIds.contains(pqLine.getLineIndex())).collect(Collectors.toList());
             List<Integer> devIndexs = collect.stream().map(PqLine::getDevIndex).collect(Collectors.toList());
             List<PqDevice> tempDeviceList = pqDeviceList.stream().filter(pqDevice -> devIndexs.contains(pqDevice.getDevIndex())).collect(Collectors.toList());
@@ -1098,6 +1118,16 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
         if (CollUtil.isEmpty(deptslineIds)) {
             return new ArrayList<>();
         }
+        //页面查询只显示敏感客户
+        largeScreenCountParam.setFiterSensitiveUser("1");
+        if(Objects.equals("1",largeScreenCountParam.getFiterSensitiveUser())){
+            //查询重要敏感客户
+            List<PqUserLedgerPO> poList = pqUserLedgerMapper.selectList(new LambdaQueryWrapper<PqUserLedgerPO>().select(PqUserLedgerPO::getId, PqUserLedgerPO::getCustomerName,PqUserLedgerPO::getIsShow).eq(PqUserLedgerPO::getIsShow, 1));
+            List<String> userIds = poList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList());
+            List<PqUserLineAssPO> pqUserLineAssPOS = pqUserLineAssMapper.selectList(new LambdaQueryWrapper<PqUserLineAssPO>().in(PqUserLineAssPO::getUserIndex, userIds));
+            List<Integer> lineIds = pqUserLineAssPOS.stream().map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList());
+            deptslineIds.retainAll(lineIds);
+        }
         //查询暂态事件
         List<PqsEventdetail> eventdetails = new ArrayList<>();
         if (deptslineIds.size() > 1000) {
@@ -1468,7 +1498,16 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService {
 
 
         List<Integer> deptslineIds = commGeneralService.getLineIdsByRedis(largeScreenCountParam.getDeptId());
-
+        //页面查询只显示敏感客户
+        largeScreenCountParam.setFiterSensitiveUser("1");
+        if(Objects.equals("1",largeScreenCountParam.getFiterSensitiveUser())){
+            //查询重要敏感客户
+            List<PqUserLedgerPO> poList = pqUserLedgerMapper.selectList(new LambdaQueryWrapper<PqUserLedgerPO>().select(PqUserLedgerPO::getId, PqUserLedgerPO::getCustomerName,PqUserLedgerPO::getIsShow).eq(PqUserLedgerPO::getIsShow, 1));
+            List<String> userIds = poList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList());
+            List<PqUserLineAssPO> pqUserLineAssPOS = pqUserLineAssMapper.selectList(new LambdaQueryWrapper<PqUserLineAssPO>().in(PqUserLineAssPO::getUserIndex, userIds));
+            List<Integer> lineIds = pqUserLineAssPOS.stream().map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList());
+            deptslineIds.retainAll(lineIds);
+        }
 
         if (Objects.isNull(largeScreenCountParam.getGdIndex())) {
             pqLineList = pqLineList.stream().filter(temp -> deptslineIds.contains(temp.getLineIndex())).collect(Collectors.toList());

event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/SendMessageServiceImpl.java

@@ -150,7 +150,7 @@ public class SendMessageServiceImpl implements SendMessageService {
                             .collect(Collectors.groupingBy(PqsEventdetail::getStationName));
                     //组装暂降信息
                     StringBuilder stringBuilder = new StringBuilder(temp.getCustomerName());
-                    stringBuilder.append("上级直供变电站共有相关"+allBus+",");
+                    stringBuilder.append("上级直供变电站共有"+allBus+",");
                     stringBuilder.append("涉及"+allsubStation+"。");
                     AtomicInteger index = new AtomicInteger();