From b150031083a574de482354593fcc02294cc2f906 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Mon, 20 Jul 2026 10:20:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=8E=B0=E5=9C=BA=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E8=A6=81=E6=B1=82=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventGateServiceImpl.java | 9 +++- .../impl/LargeScreenCountServiceImpl.java | 43 ++++++++++++++++++- .../service/impl/SendMessageServiceImpl.java | 2 +- 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/EventGateServiceImpl.java b/event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/EventGateServiceImpl.java index b2b2f0f..2df4310 100644 --- a/event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/EventGateServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/EventGateServiceImpl.java @@ -98,7 +98,14 @@ public class EventGateServiceImpl implements EventGateService { if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) { throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND); } - waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1); + 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); diff --git a/event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/LargeScreenCountServiceImpl.java b/event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/LargeScreenCountServiceImpl.java index e04b176..80b01ae 100644 --- a/event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/LargeScreenCountServiceImpl.java +++ b/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 pqLineList = (List) redisUtil.getObjectByKey(NAME_KEY + StrUtil.DASHED + "pqLineList"); List deptslineIds = (List) redisUtil.getObjectByKey(NAME_KEY + StrUtil.DASHED + largeScreenCountParam.getDeptId()); + largeScreenCountParam.setFiterSensitiveUser("1"); + if(Objects.equals("1",largeScreenCountParam.getFiterSensitiveUser())){ + //查询重要敏感客户 + List poList = pqUserLedgerMapper.selectList(new LambdaQueryWrapper().select(PqUserLedgerPO::getId, PqUserLedgerPO::getCustomerName,PqUserLedgerPO::getIsShow).eq(PqUserLedgerPO::getIsShow, 1)); + List userIds = poList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList()); + List pqUserLineAssPOS = pqUserLineAssMapper.selectList(new LambdaQueryWrapper().in(PqUserLineAssPO::getUserIndex, userIds)); + List 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 devIndexs = pqLineList.stream().map(PqLine::getDevIndex).collect(Collectors.toList()); @@ -1031,7 +1041,8 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { deptAndChildren.remove(largeScreenCountParam.getDeptId()); } List pqDeviceList = pqDeviceService.lambdaQuery().eq(PqDevice::getDevflag, 0).list(); - + //页面查询只显示敏感客户 + largeScreenCountParam.setFiterSensitiveUser("1"); // List deptslines = pqsDeptslineService.lambdaQuery().in(PqsDeptsline::getDeptsIndex, deptAndChildren).eq(PqsDeptsline::getSystype, sysTypeZt).list(); List 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 deptslineIds = (List) redisUtil.getObjectByKey(NAME_KEY + StrUtil.DASHED + temp.getDeptsIndex()); + + if(Objects.equals("1",largeScreenCountParam.getFiterSensitiveUser())){ + //查询重要敏感客户 + List poList = pqUserLedgerMapper.selectList(new LambdaQueryWrapper().select(PqUserLedgerPO::getId, PqUserLedgerPO::getCustomerName,PqUserLedgerPO::getIsShow).eq(PqUserLedgerPO::getIsShow, 1)); + List userIds = poList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList()); + List pqUserLineAssPOS = pqUserLineAssMapper.selectList(new LambdaQueryWrapper().in(PqUserLineAssPO::getUserIndex, userIds)); + List lineIds = pqUserLineAssPOS.stream().map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList()); + deptslineIds.retainAll(lineIds); + } List collect = pqLineList.stream().filter(pqLine -> deptslineIds.contains(pqLine.getLineIndex())).collect(Collectors.toList()); List devIndexs = collect.stream().map(PqLine::getDevIndex).collect(Collectors.toList()); List 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 poList = pqUserLedgerMapper.selectList(new LambdaQueryWrapper().select(PqUserLedgerPO::getId, PqUserLedgerPO::getCustomerName,PqUserLedgerPO::getIsShow).eq(PqUserLedgerPO::getIsShow, 1)); + List userIds = poList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList()); + List pqUserLineAssPOS = pqUserLineAssMapper.selectList(new LambdaQueryWrapper().in(PqUserLineAssPO::getUserIndex, userIds)); + List lineIds = pqUserLineAssPOS.stream().map(PqUserLineAssPO::getLineIndex).distinct().collect(Collectors.toList()); + deptslineIds.retainAll(lineIds); + } //查询暂态事件 List eventdetails = new ArrayList<>(); if (deptslineIds.size() > 1000) { @@ -1468,7 +1498,16 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { List deptslineIds = commGeneralService.getLineIdsByRedis(largeScreenCountParam.getDeptId()); - + //页面查询只显示敏感客户 + largeScreenCountParam.setFiterSensitiveUser("1"); + if(Objects.equals("1",largeScreenCountParam.getFiterSensitiveUser())){ + //查询重要敏感客户 + List poList = pqUserLedgerMapper.selectList(new LambdaQueryWrapper().select(PqUserLedgerPO::getId, PqUserLedgerPO::getCustomerName,PqUserLedgerPO::getIsShow).eq(PqUserLedgerPO::getIsShow, 1)); + List userIds = poList.stream().map(PqUserLedgerPO::getId).collect(Collectors.toList()); + List pqUserLineAssPOS = pqUserLineAssMapper.selectList(new LambdaQueryWrapper().in(PqUserLineAssPO::getUserIndex, userIds)); + List 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()); diff --git a/event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/SendMessageServiceImpl.java b/event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/SendMessageServiceImpl.java index e4f0406..ecd57ba 100644 --- a/event_smart/src/main/java/com/njcn/product/event/transientes/service/impl/SendMessageServiceImpl.java +++ b/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();