From 102bab74303b6ab7efaae4230e7ed2b3a772f70c Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Sat, 11 Oct 2025 10:56:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=88=E7=AB=AF=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../govern/voltage/impl/GovernSchemeCalcServiceImpl.java | 1 + .../device/pq/service/impl/DeviceRunEvaluateServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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());