xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 加载F状态的能谱增加能谱文件找不到提示

Browse Source
This commit is contained in:
xiaoguangbin 2024-12-05 16:24:58 +08:00
parent 10e07c5969
commit db9d27d30d
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
View File

@ -698,11 +698,22 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
GardsSampleData gasSampleData = sampleDataSpectrumService.getSampleByMId(aux.getGasBkgdMeasurementId(), GardsSampleData gasSampleData = sampleDataSpectrumService.getSampleByMId(aux.getGasBkgdMeasurementId(),
DataTypeAbbr.DETBKPHD.getType(), sampleData.getSampleType()); DataTypeAbbr.DETBKPHD.getType(), sampleData.getSampleType());
if(StringUtils.isEmpty(sampleFilePath)
&& (Objects.isNull(gasSampleData) || StringUtils.isEmpty(gasSampleData.getInputFileName()))
&& (Objects.isNull(detSampleData) || StringUtils.isEmpty(detSampleData.getInputFileName()))){
result.error500("gas and det file is no exist or is error..");
return result;
}
// 如果找不到sample、det、gas谱文件数据则解析失败修改记录状态 // 如果找不到sample、det、gas谱文件数据则解析失败修改记录状态
if(StringUtils.isEmpty(sampleFilePath) || Objects.isNull(gasSampleData)
|| StringUtils.isEmpty(gasSampleData.getInputFileName())){
result.error500("gas file is no exist or is error..");
return result;
}
if(StringUtils.isEmpty(sampleFilePath) || Objects.isNull(detSampleData) if(StringUtils.isEmpty(sampleFilePath) || Objects.isNull(detSampleData)
|| StringUtils.isEmpty(detSampleData.getInputFileName()) || StringUtils.isEmpty(detSampleData.getInputFileName())){
|| Objects.isNull(gasSampleData) || StringUtils.isEmpty(gasSampleData.getInputFileName())){ result.error500("det file is no exist or is error..");
result.error500("gas or det file is no exist or is error..");
return result; return result;
} }
String gasFilePath = gasSampleData.getInputFileName(); String gasFilePath = gasSampleData.getInputFileName();