diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PushMonitorDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PushMonitorDTO.java index f16a2a11a..1d17d6f2e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PushMonitorDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PushMonitorDTO.java @@ -59,4 +59,15 @@ public class PushMonitorDTO { private String subVoltageLevel; private String provinceId; private String provinceName; + + //母线名称 + private String busName; + //所属主变id + private String transformerId; + //所属主变名称 + private String transformerName; + //所属线路类型 + private String lineType; + //所属线路名称 + private String lineName; } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsDistributionMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsDistributionMonitorController.java index b0da9e3a8..c24884f12 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsDistributionMonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsDistributionMonitorController.java @@ -326,7 +326,7 @@ public class PmsDistributionMonitorController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); } - @ApiOperation(value = "将用户数据导入到配网表中") + @ApiOperation(value = "将台区数据导入到配网表中") @PostMapping("/savePmsDistributionArea") public HttpResult savePmsDistributionArea() { String methodDescribe = getMethodDescribe("savePmsDistributionArea"); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java index 82b2ff3cf..3f903d943 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/GwMonitorPushServiceImpl.java @@ -17,10 +17,7 @@ import com.njcn.device.pms.mapper.majornetwork.*; import com.njcn.device.pms.pojo.dto.MonitorLimitDTO; import com.njcn.device.pms.pojo.dto.PushMonitorDTO; import com.njcn.device.pms.pojo.param.PmsMonitorQueryParam; -import com.njcn.device.pms.pojo.po.GeneratrixWire; -import com.njcn.device.pms.pojo.po.Monitor; -import com.njcn.device.pms.pojo.po.PmsTerminal; -import com.njcn.device.pms.pojo.po.StatationStat; +import com.njcn.device.pms.pojo.po.*; import com.njcn.device.pms.pojo.vo.gw.OtherUserDto; import com.njcn.device.pms.service.gwPush.GwMonitorPushService; import com.njcn.device.pms.service.majornetwork.IMonitorService; @@ -70,6 +67,7 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { private final TerminalMapper terminalMapper; private final PmsGeneratrixWireMapper pmsGeneratrixWireMapper; + private final PmsMidLedgerMapper pmsMidLedgerMapper; @Override @@ -97,6 +95,11 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { //List tranDicList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.VOLTAGE_TRANSFORMER.getCode()).getData(); //Map tranMap = tranDicList.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); + //中性点接地方式 +// List pointDicList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.Neutral_Point.getCode()).getData(); +// Map pointMap = pointDicList.stream().collect(Collectors.toMap(DictData::getId, Function.identity())); + + DictData monitorStateDic = dicDataFeignClient.getDicDataByNameAndTypeName(DicDataTypeEnum.LINE_STATE.getName(), DicDataEnum.RUN.getName()).getData(); @@ -136,6 +139,11 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { Map mapTerminal = pmsTerminalList.stream().collect(Collectors.toMap(PmsTerminal::getId,Function.identity())); Map mapBus = GeneratrixWireList.stream().collect(Collectors.toMap(GeneratrixWire::getId,Function.identity())); + //获取母线中台信息 + List pmsMidLedgers = pmsMidLedgerMapper.selectList(new LambdaQueryWrapper() + .in(PmsMidLedger::getId, mapBus.keySet()) + ); + Map mapMidLedger = pmsMidLedgers.stream().collect(Collectors.toMap(PmsMidLedger::getId,Function.identity())); for (Monitor item : monitorList) { @@ -160,7 +168,10 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { //母线 pushMonitorDTO.setBusId(mapBus.get(item.getLineId()).getMidBusId()); - + //母线名称 + if (mapMidLedger.containsKey(mapBus.get(item.getLineId()).getMidBusId())) { + pushMonitorDTO.setBusName(mapMidLedger.get(mapBus.get(item.getLineId()).getMidBusId()).getName()); + } if (voltageMap.containsKey(item.getVoltageLevel())) { @@ -208,11 +219,12 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService { /* if (tranMap.containsKey(item.getPotentialTransFormerType())) { pushMonitorDTO.setEvtType(tranMap.get(item.getPotentialTransFormerType()).getValue()); + } + if (pointMap.containsKey(item.getNeutralGroundingMode())) { + pushMonitorDTO.setNeutralGround(pointMap.get(item.getNeutralGroundingMode()).getValue()); }*/ - - /*if (StrUtil.isNotBlank(item.getOperationId())) { pushMonitorDTO.setMaintOrg(item.getOperationId()); }*/ 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 f82001abd..d83c0c2cb 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 @@ -2,6 +2,7 @@ package com.njcn.device.pms.service.ledgerManger.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.njcn.common.pojo.enums.common.ServerEnum; @@ -23,6 +24,7 @@ import com.njcn.device.pms.pojo.po.*; import com.njcn.device.pms.service.ledgerManger.DeptLineService; import com.njcn.device.pms.service.ledgerManger.CommTerminalService; import com.njcn.device.pms.service.majornetwork.IPowerDistributionareaService; +import com.njcn.device.pq.pojo.po.LineBak; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; @@ -77,7 +79,7 @@ public class CommTerminalServiceImpl implements CommTerminalService { private final PowerGenerationUserMapper powerGenerationUserMapper; private final IPowerDistributionareaService iPowerDistributionareaService; - + private final LineBakMapper lineBakMapper; /** * 基础获取单位信息 * @@ -577,6 +579,13 @@ public class CommTerminalServiceImpl implements CommTerminalService { lineDevGetDTO.setInterval(monitor.getStatisticalInterval()); lineDevGetDTO.setDevId(monitor.getTerminalId()); lineDevGetDTO.setVoltageLevel(monitor.getVoltageLevel()); + lineDevGetDTO.setType(0); + LineBak lineBak = lineBakMapper.selectOne(new LambdaQueryWrapper() + .eq(LineBak::getId, monitor.getId()) + ); + if(ObjUtil.isNotNull(lineBak)){ + lineDevGetDTO.setOracleLineId(lineBak.getLineId()); + } return lineDevGetDTO; } @@ -594,6 +603,8 @@ public class CommTerminalServiceImpl implements CommTerminalService { lineDevGetDTO.setInterval(distributionMonitor.getStatisticalInterval()); lineDevGetDTO.setDevId(distributionMonitor.getTerminalId()); lineDevGetDTO.setVoltageLevel(powerDistributionarea.getVoltageLevel()); + lineDevGetDTO.setType(1); + lineDevGetDTO.setLineType(2); return lineDevGetDTO; } } else if (DicDataEnum.THREE_LINE.getCode().equals(dictDataSort.getCode())) { @@ -604,15 +615,16 @@ public class CommTerminalServiceImpl implements CommTerminalService { lineDevGetDTO.setInterval(distributionMonitor.getStatisticalInterval()); lineDevGetDTO.setDevId(distributionMonitor.getTerminalId()); lineDevGetDTO.setVoltageLevel(powerGenerationUser.getVoltageLevel()); - return lineDevGetDTO; } else { PowerClient powerClient = powerClientMapper.selectById(monitorId); lineDevGetDTO.setPointName(powerClient.getName()); lineDevGetDTO.setInterval(distributionMonitor.getStatisticalInterval()); lineDevGetDTO.setDevId(distributionMonitor.getTerminalId()); lineDevGetDTO.setVoltageLevel(powerClient.getVoltageLevel()); - return lineDevGetDTO; } + lineDevGetDTO.setType(1); + lineDevGetDTO.setLineType(3); + return lineDevGetDTO; } } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java index dc028f31d..a7650eaa0 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/DistributionMonitorServiceImpl.java @@ -564,6 +564,7 @@ public class DistributionMonitorServiceImpl extends MppServiceImpl