From 86e5f3dca8d11d925fe56a01b83d74e95cae5351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Thu, 2 Mar 2023 09:49:12 +0800 Subject: [PATCH] =?UTF-8?q?pms=E5=8F=B0=E8=B4=A6bug=E6=8F=90=E4=BA=A4,?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E6=97=A5=E5=BF=97=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/device/pms/api/PmsGeneratrixClient.java | 2 +- .../majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java index 665f6a8f2..2124b48d7 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsGeneratrixClient.java @@ -17,7 +17,7 @@ import java.util.List; * @date 2022/10/18 */ @FeignClient(value = ServerInfo.DEVICE, - path = "/pmsGeneratrixWire", + path = "/pms/generatrixWire", contextId = "pmsGeneratrixWire", fallbackFactory = PmsGeneratrixClientFallbackFactory.class) public interface PmsGeneratrixClient { diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java index 84f3acb8d..7d225eaec 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java @@ -48,8 +48,8 @@ public class RStatOrgBusbarVoltageServiceImpl extends ServiceImpl getRStatOrgBusbarVoltage(StatSubstationBizBaseParam param) { //获取部门信息 - List deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); - List data = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); + List data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData(); + //List data = DeptUtil.getDeptSubsetVOList(deptList, param.getId()); Map deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));