Merge remote-tracking branch 'origin/main'

This commit is contained in:
wr
2026-04-02 10:45:08 +08:00
4 changed files with 271 additions and 29 deletions

View File

@@ -2,6 +2,7 @@ package com.njcn.advance.service.impl;
import cn.hutool.core.date.TimeInterval;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.njcn.advance.enums.EnumEvt;
import com.njcn.advance.mapper.RmpEventAdvanceMapper;
@@ -323,6 +324,14 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService {
if (rmpEventDetailPO.getDealFlag() != 1) {
//如果存在三个文件但是没有调用dll/so计算
getDataFromDLL(rmpEventDetailPO, waveOriginalData, rect, entityAdvancedData, causeStruct);
} else {
//已经处理过了那就根据id获取暂降原因
String reason = rmpEventDetailPO.getAdvanceReason();
List<DictData> reasonList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_REASON.getCode()).getData();
Map<String, DictData> eventReasonMap = reasonList.stream().collect(Collectors.toMap(DictData::getId, Function.identity()));
if (ObjectUtil.isNotNull(eventReasonMap.get(reason))) {
entityAdvancedData.sagReason[0] = eventReasonMap.get(reason).getName();
}
}
String hdrStr = null;