Merge remote-tracking branch 'origin/master'

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 {

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);

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgBusbarVoltageServiceImpl.java

@@ -48,8 +48,8 @@ public class RStatOrgBusbarVoltageServiceImpl extends ServiceImpl<RStatOrgBusbar
     @Override
     public List<RStatOrgBusbarVoltageVO> getRStatOrgBusbarVoltage(StatSubstationBizBaseParam param) {
         //获取部门信息
-        List<DeptDTO> deptList = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
-        List<DeptDTO> data = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
+        List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
+        //List<DeptDTO> data = DeptUtil.getDeptSubsetVOList(deptList, param.getId());
 
         Map<String, DeptDTO> deptMap = data.stream().collect(Collectors.toMap(DeptDTO::getCode, Function.identity()));