From 57a3c3b12c684772dc039f08507166d83e40bb61 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Fri, 1 Aug 2025 14:58:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Impl/EventDetailServiceImpl.java          | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
index 00f3b4b10..7b740d660 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/EventDetailServiceImpl.java
@@ -172,29 +172,31 @@ public class EventDetailServiceImpl extends ServiceImpl<EventDetailMapper, RmpEv
         }
 
         rmpEventDetailPO.setEventDescribe(" ");
-//        //如果不为空，说明是二次上传波形文件了;
-//        String  reason,type;
-//        if(!StringUtils.isEmpty(rmpEventDetailPO.getWavePath())){
-//            LineDetailDataVO lineDetailData = lineFeignClient.getLineDetailData(rmpEventDetailPO.getLineId()).getData();
-//            String ip = lineDetailData.getIp();
-//            EventAnalysisDTO eventAnalysisDTO = new EventAnalysisDTO();
-//            eventAnalysisDTO.setIp(ip);
-//            eventAnalysisDTO.setWaveName(rmpEventDetailPO.getWavePath());
-//            EventAnalysisDTO result = eventCauseFeignClient.analysisCauseAndType(eventAnalysisDTO).getData();
-//            reason =reasonReflection(result.getCause());
-//            type =advanceTypeReflection(result.getType());
-//            DictData advancereason = dicDataFeignClient.getDicDataByCode(reason).getData();
-//            DictData advanceType = dicDataFeignClient.getDicDataByCode(type).getData();
-//            rmpEventDetailPO.setAdvanceReason(advancereason.getId());
-//            rmpEventDetailPO.setAdvanceType(advanceType.getId());
-//
-//        }
-        //默认都是其他
-        DictData reason = dicDataFeignClient.getDicDataByCode(DicDataEnum.RESON_REST.getCode()).getData();
-        DictData advanceType = dicDataFeignClient.getDicDataByCode(DicDataEnum.TYPE_REST.getCode()).getData();
+        //如果不为空，说明是二次上传波形文件了;
+        String  reason,type;
+        if(!StringUtils.isEmpty(rmpEventDetailPO.getWavePath())){
+            LineDetailDataVO lineDetailData = lineFeignClient.getLineDetailData(rmpEventDetailPO.getLineId()).getData();
+            String ip = lineDetailData.getIp();
+            EventAnalysisDTO eventAnalysisDTO = new EventAnalysisDTO();
+            eventAnalysisDTO.setIp(ip);
+            eventAnalysisDTO.setWaveName(rmpEventDetailPO.getWavePath());
 
-        rmpEventDetailPO.setAdvanceReason(reason.getId());
-        rmpEventDetailPO.setAdvanceType(advanceType.getId());
+            EventAnalysisDTO result = eventCauseFeignClient.analysisCauseAndType(eventAnalysisDTO).getData();
+
+            reason =reasonReflection(result.getCause());
+            type =advanceTypeReflection(result.getType());
+            DictData advancereason = dicDataFeignClient.getDicDataByCode(reason).getData();
+            DictData advanceType = dicDataFeignClient.getDicDataByCode(type).getData();
+            rmpEventDetailPO.setAdvanceReason(advancereason.getId());
+            rmpEventDetailPO.setAdvanceType(advanceType.getId());
+
+        }
+        //默认都是其他
+//        DictData reason = dicDataFeignClient.getDicDataByCode(DicDataEnum.RESON_REST.getCode()).getData();
+//        DictData advanceType = dicDataFeignClient.getDicDataByCode(DicDataEnum.TYPE_REST.getCode()).getData();
+//
+//        rmpEventDetailPO.setAdvanceReason(reason.getId());
+//        rmpEventDetailPO.setAdvanceType(advanceType.getId());
 
 
         String severity = EventUtil.getYzd(deatilDTO.getDuration().floatValue(),(deatilDTO.getAmplitude().floatValue()/100));