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 bc91a81..acd5568 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 @@ -59,21 +59,26 @@ public class EventGateServiceImpl implements EventGateService { 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"; + try { + cfgPath = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".CFG"; + datPath = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".DAT"; + cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath); + datStream = waveFileComponent.getFileInputStreamByFilePath(datPath); + log.info("本地磁盘波形文件路径----" + cfgPath); - cfgPath1 = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".cfg"; - datPath1 = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".dat"; - - log.info("本地磁盘波形文件路径----" + cfgPath); - cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath); - datStream = waveFileComponent.getFileInputStreamByFilePath(datPath); - if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) { + }catch (Exception e){ + cfgPath1 = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".cfg"; + datPath1 = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".dat"; cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath1); datStream = waveFileComponent.getFileInputStreamByFilePath(datPath1); - if(Objects.isNull(cfgStream) || Objects.isNull(datStream)) { - throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND); - } + } + + + + if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) { + + throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND); + } waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1);