波形添加大小写适配
This commit is contained in:
@@ -59,21 +59,26 @@ public class EventGateServiceImpl implements EventGateService {
|
|||||||
if (StrUtil.isBlank(waveName)) {
|
if (StrUtil.isBlank(waveName)) {
|
||||||
throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
|
throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
|
||||||
}
|
}
|
||||||
cfgPath = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".CFG";
|
try {
|
||||||
datPath = generalInfo.getBusinessWavePath()+ File.separator+pqLine.getIp()+"/"+waveName+".DAT";
|
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";
|
}catch (Exception e){
|
||||||
datPath1 = 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);
|
|
||||||
cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath);
|
|
||||||
datStream = waveFileComponent.getFileInputStreamByFilePath(datPath);
|
|
||||||
if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) {
|
|
||||||
cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath1);
|
cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath1);
|
||||||
datStream = waveFileComponent.getFileInputStreamByFilePath(datPath1);
|
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);
|
waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user