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-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java index 0cd693df9..f1c7a8ef2 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java @@ -183,6 +183,7 @@ public class TransientServiceImpl implements TransientService { // waveDataVO.setName("变电站名称: "+ substation +" 监测点名称: "+ name +" 发生时刻: "+ timeId +" 暂降幅值: "+ v +"% 持续时间: "+ persistTime +"s"); // waveDataVO.setTargetName("相电压有效值"); AnalyWave analyWave = new AnalyWave(); + // 从本地读取该事件的波形 WaveDataDTO comtrade = analyWave.getComtrade(generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + ".CFG", 1); if (Objects.isNull(comtrade.getComtradeCfgDTO())) { throw new BusinessException(EventResponseEnum.ANALYSEWAVE_NOT_FOUND); 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()));