diff --git a/pom.xml b/pom.xml index fb613a012..25a9777db 100644 --- a/pom.xml +++ b/pom.xml @@ -42,20 +42,21 @@ - - 192.168.1.31 + + 192.168.1.13 - + 192.168.1.111 192.168.1.13 ${middle.server.url}:18848 - - - - + + fd74182b-1fce-4dba-afa7-2623b0376205 + + + ${middle.server.url}:8080 @@ -86,7 +87,6 @@ 2.1.3 1.2.5 8.0.19 - 2.4.0 21.6.0.0 21.1.0.0 3.4.2 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..249b42321 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 @@ -173,15 +173,6 @@ public class TransientServiceImpl implements TransientService { EventDetail eventDetailByTime = eventDetailService.getEventDetailByTime(lineId, timeId); String ip = lineDetailData.getIp(); String waveName = eventDetailByTime.getWaveName(); - // TransientVO transientVO = transientMapper.getTransientDataById(lineId); - // String name = transientVO.getName(); - // String substation = transientVO.getSubstation(); - // Double eventValue = new BigDecimal(eventDetailByTime.getEventValue()).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue(); - // Double v = new BigDecimal(eventValue*100).setScale(0,BigDecimal.ROUND_HALF_UP).doubleValue(); - // Double persistTime = eventDetailByTime.getPersistTime()/1000; - - // 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())) {