From 5dff7c6ff8fe262302aeccdbca84b1914b15fcf2 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 13 May 2026 09:06:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A2=E5=BD=A2=E6=B7=BB=E5=8A=A0=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E5=86=99=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventGateServiceImpl.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/cn-terminal/src/main/java/com/njcn/product/terminal/event/service/impl/EventGateServiceImpl.java b/cn-terminal/src/main/java/com/njcn/product/terminal/event/service/impl/EventGateServiceImpl.java index dbd9e88..bc91a81 100644 --- a/cn-terminal/src/main/java/com/njcn/product/terminal/event/service/impl/EventGateServiceImpl.java +++ b/cn-terminal/src/main/java/com/njcn/product/terminal/event/service/impl/EventGateServiceImpl.java @@ -54,17 +54,26 @@ public class EventGateServiceImpl implements EventGateService { String lineid = eventDetail.getLineId(); LedgerBaseInfo pqLine = ledgerScaleMapper.getLedgerBaseInfo(Stream.of(lineid).collect(Collectors.toList())).get(0); String waveName = eventDetail.getWavePath(); - String cfgPath, datPath; + String cfgPath, datPath,cfgPath1,datPath1; + InputStream cfgStream,datStream; if (StrUtil.isBlank(waveName)) { throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND); } cfgPath = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".CFG"; datPath = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".DAT"; + + cfgPath1 = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".cfg"; + datPath1 = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".dat"; + log.info("本地磁盘波形文件路径----" + cfgPath); - InputStream cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath); - InputStream datStream = waveFileComponent.getFileInputStreamByFilePath(datPath); + cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath); + datStream = waveFileComponent.getFileInputStreamByFilePath(datPath); if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) { - throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND); + cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath1); + datStream = waveFileComponent.getFileInputStreamByFilePath(datPath1); + if(Objects.isNull(cfgStream) || Objects.isNull(datStream)) { + throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND); + } } waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1);