diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/GovernSchemeCalcServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/GovernSchemeCalcServiceImpl.java index bd2ee5fac..492953091 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/GovernSchemeCalcServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/GovernSchemeCalcServiceImpl.java @@ -73,6 +73,7 @@ public class GovernSchemeCalcServiceImpl implements IGovernSchemeCalcService { throw new BusinessException(AdvanceResponseEnum.INCOMING_LINE_DATA_MISS); } sgGovernSchemeHistoryAllVO.setInComingLineName(sgIncomingLine.getName()); + sgGovernSchemeHistoryAllVO.getQuick().setIncomingLineId(sgIncomingLine.getName()); //时间内的电网接入水平(暂降次数) String startTime = sgGovernSchemeHistoryParam.getStartTime(); String endTime = sgGovernSchemeHistoryParam.getEndTime(); diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java index be90e5cb7..3dc5db6d3 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java @@ -95,7 +95,7 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService { DeviceRunEvaluateVO.Info evaluateVO; for (GeneralDeviceDTO deptDeviceInfo : deptDeviceInfos) { List lineIndexes = deptDeviceInfo.getLineIndexes(); - List devIndexes = deptDeviceInfo.getLineIndexes(); + List devIndexes = deptDeviceInfo.getDeviceIndexes(); if (CollUtil.isNotEmpty(lineIndexes)) { evaluateVO = new DeviceRunEvaluateVO.Info(); evaluateVO.setName(deptDeviceInfo.getName());