From ae3ff913285e2f550d0c1788a31dcd68b8e790b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Wed, 27 Sep 2023 18:44:43 +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 --- .../impl/CommTerminalServiceImpl.java | 37 ++++++++++--------- .../line/PqsEventdetailController.java | 5 ++- .../newalgorithm/RStatOrgController.java | 2 +- .../PqsEventdetailHandlerServiceImpl.java | 6 +-- 4 files changed, 27 insertions(+), 23 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java index d922768d0..647ce87db 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java @@ -118,8 +118,9 @@ public class CommTerminalServiceImpl implements CommTerminalService { List monitorList = monitorMapper.selectList(new LambdaQueryWrapper().eq(Monitor::getStatus, 1).eq(Monitor::getMonitorState, dictData.getId())); Map> map = monitorList.stream().collect(Collectors.groupingBy(Monitor::getOrgId)); - List pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0); - Map> mapPms = pmsMonitorBaseDTOList.stream().collect(Collectors.groupingBy(PmsMonitorBaseDTO::getOrgId)); + //TODO 配网数据量巨大，暂时注释 + //List pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0); + //Map> mapPms = pmsMonitorBaseDTOList.stream().collect(Collectors.groupingBy(PmsMonitorBaseDTO::getOrgId)); temDept.forEach(item -> { DeptGetChildrenMoreDTO deptGetChildrenMoreDTO = new DeptGetChildrenMoreDTO(); @@ -144,7 +145,7 @@ public class CommTerminalServiceImpl implements CommTerminalService { lineList.add(lineDevGetDTO); }); } - if (mapPms.containsKey(i)) { + /* if (mapPms.containsKey(i)) { mapPms.get(i).forEach(it -> { LineDevGetDTO lineDevGetDTOPms = new LineDevGetDTO(); lineDevGetDTOPms.setPointId(it.getMonitorId()); @@ -155,10 +156,10 @@ public class CommTerminalServiceImpl implements CommTerminalService { lineDevGetDTOPms.setVoltageLevel(mapVoltage.get(it.getVoltageLevel()).getValue()); lineListPw.add(lineDevGetDTOPms); }); - } + }*/ }); deptGetChildrenMoreDTO.setLineBaseList(lineList); - deptGetChildrenMoreDTO.setPwMonitorIds(lineListPw); + //deptGetChildrenMoreDTO.setPwMonitorIds(lineListPw); } result.add(deptGetChildrenMoreDTO); }); @@ -173,8 +174,8 @@ public class CommTerminalServiceImpl implements CommTerminalService { List statationStatList = statationStatMapper.selectList(new LambdaQueryWrapper().eq(StatationStat::getStatus, 1)); Map> map = statationStatList.stream().collect(Collectors.groupingBy(StatationStat::getOrgId)); - List pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0); - Map> mapPms = pmsMonitorBaseDTOList.stream().collect(Collectors.groupingBy(PmsMonitorBaseDTO::getOrgId)); + //List pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0); + //Map> mapPms = pmsMonitorBaseDTOList.stream().collect(Collectors.groupingBy(PmsMonitorBaseDTO::getOrgId)); temDept.forEach(item -> { @@ -190,9 +191,9 @@ public class CommTerminalServiceImpl implements CommTerminalService { if (map.containsKey(i)) { lineList.addAll(map.get(i).stream().map(StatationStat::getPowerId).distinct().collect(Collectors.toList())); } - if (mapPms.containsKey(i)) { + /*if (mapPms.containsKey(i)) { lineListPw.addAll(mapPms.get(i).stream().map(PmsMonitorBaseDTO::getPowerrId).distinct().collect(Collectors.toList())); - } + }*/ }); deptGetSubStationDTO.setStationIds(lineList.stream().distinct().collect(Collectors.toList())); deptGetSubStationDTO.setPwStationIds(lineListPw.stream().distinct().collect(Collectors.toList())); @@ -211,9 +212,9 @@ public class CommTerminalServiceImpl implements CommTerminalService { List generatrixWireList = pmsGeneratrixWireMapper.getGeneratrixWireList(); Map> map = generatrixWireList.stream().collect(Collectors.groupingBy(GeneratrixWire::getOrgId)); - List pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0); + /*List pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0); Map> mapPms = pmsMonitorBaseDTOList.stream().collect(Collectors.groupingBy(PmsMonitorBaseDTO::getOrgId)); - +*/ temDept.forEach(item -> { DeptGetBusBarDTO deptGetBusBarDTO = new DeptGetBusBarDTO(); @@ -228,9 +229,9 @@ public class CommTerminalServiceImpl implements CommTerminalService { if (map.containsKey(i)) { lineList.addAll(map.get(i).stream().map(GeneratrixWire::getId).collect(Collectors.toList())); } - if (mapPms.containsKey(i)) { + /* if (mapPms.containsKey(i)) { lineListPw.addAll(mapPms.get(i).stream().map(PmsMonitorBaseDTO::getLineId).collect(Collectors.toList())); - } + }*/ }); deptGetBusBarDTO.setBusBarIds(lineList); deptGetBusBarDTO.setPwBusBarIds(lineListPw); @@ -252,17 +253,17 @@ public class CommTerminalServiceImpl implements CommTerminalService { List pmsTerminals = terminalMapper.selectList(lambdaQueryWrapper); Map> map = pmsTerminals.stream().collect(Collectors.groupingBy(PmsTerminal::getOrgId)); - List pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0); + /* List pmsMonitorBaseDTOList = distributionMonitorMapper.getDisMonitorAllList(null, 0); List pwTerminalIds = pmsMonitorBaseDTOList.stream().map(PmsMonitorBaseDTO::getTerminalId).distinct().collect(Collectors.toList()); List pwPmsTerminals = terminalMapper.selectList(new LambdaQueryWrapper().in(CollUtil.isNotEmpty(pwTerminalIds),PmsTerminal::getId, pwTerminalIds)); Map> mapPms = pwPmsTerminals.stream().collect(Collectors.groupingBy(PmsTerminal::getOrgId)); - +*/ Map> monitorMap = new HashMap<>(); Map> pwMonitorMap = new HashMap<>(); if (type == 1) { //获取装置接入的监测点 monitorMap = monitorList.stream().collect(Collectors.groupingBy(Monitor::getTerminalId)); - pwMonitorMap = pmsMonitorBaseDTOList.stream().filter(x-> ObjectUtil.isNotNull(x.getTerminalId())).collect(Collectors.groupingBy(PmsMonitorBaseDTO::getTerminalId)); + //pwMonitorMap = pmsMonitorBaseDTOList.stream().filter(x-> ObjectUtil.isNotNull(x.getTerminalId())).collect(Collectors.groupingBy(PmsMonitorBaseDTO::getTerminalId)); } @@ -295,7 +296,7 @@ public class CommTerminalServiceImpl implements CommTerminalService { }); } - if (mapPms.containsKey(i)) { + /* if (mapPms.containsKey(i)) { mapPms.get(i).forEach(dev -> { LineDevGetDTO lineDevGetDTO = new LineDevGetDTO(); lineDevGetDTO.setDevId(dev.getId()); @@ -309,7 +310,7 @@ public class CommTerminalServiceImpl implements CommTerminalService { } devGetDTOListPw.add(lineDevGetDTO); }); - } + }*/ }); deptGetDeviceDTO.setDeviceList(devGetDTOList); deptGetDeviceDTO.setPwDeviceList(devGetDTOListPw); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/PqsEventdetailController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/PqsEventdetailController.java index 2858ea90f..6e034e558 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/PqsEventdetailController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/PqsEventdetailController.java @@ -5,6 +5,7 @@ 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.device.biz.commApi.CommTerminalGeneralClient; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.line.PqsEventdetailHandlerService; @@ -42,6 +43,8 @@ public class PqsEventdetailController extends BaseController { private final LineFeignClient lineFeignClient; + private final CommTerminalGeneralClient commTerminalGeneralClient; + private final PqsEventdetailHandlerService pqsEventdetailHandlerService; @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/eventdetailHandler") @@ -52,7 +55,7 @@ public class PqsEventdetailController extends BaseController { String methodDescribe = getMethodDescribe("eventdetailHandler"); List indexLists = new ArrayList<> (); if(CollectionUtils.isEmpty (lineParam.getLineIds ())){ - indexLists = lineFeignClient.getLineList ( ).getData ( ); + indexLists = commTerminalGeneralClient.getRunMonitorIds ().getData (); }else{ indexLists = lineParam.getLineIds (); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RStatOrgController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RStatOrgController.java index 738ceae07..131b195ce 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RStatOrgController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/newalgorithm/RStatOrgController.java @@ -63,7 +63,7 @@ public class RStatOrgController extends BaseController { @ApiImplicitParam(name = "orgParam", value = "参数", required = true) public HttpResult handler(@RequestBody @Validated OrgParam orgParam ){ log.info(LocalDateTime.now()+"dayHandler始执行"); - String methodDescribe = getMethodDescribe("dayHandler"); + String methodDescribe = getMethodDescribe("handler"); /** * 支持补录 */ diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PqsEventdetailHandlerServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PqsEventdetailHandlerServiceImpl.java index 08f4543d3..682d178b3 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PqsEventdetailHandlerServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PqsEventdetailHandlerServiceImpl.java @@ -53,11 +53,11 @@ public class PqsEventdetailHandlerServiceImpl implements PqsEventdetailHandlerSe @Override @Async("asyncExecutor") public void eventdetailHandler(LineParam lineParam) { - if (Objects.equals (lineParam.getDataSource ( ), AlgorithmParam.ORACLE_DATA)) { + /*if (Objects.equals (lineParam.getDataSource ( ), AlgorithmParam.ORACLE_DATA)) { hanlderOracleData (lineParam); - } else if (Objects.equals (lineParam.getDataSource ( ), AlgorithmParam.INFLUX_DATA)) { + } else if (Objects.equals (lineParam.getDataSource ( ), AlgorithmParam.INFLUX_DATA)) {*/ hanlderInfludxbData (lineParam); - } + // } } /** * @Description: hanlderInfludxbData