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

自建台站类型不存在导致错误问题修改

Browse Source
This commit is contained in:
qiaoqinzheng 2024-01-15 19:20:46 +08:00
parent 33f164a96f
commit 46c79e8ade
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,29 +348,12 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
map.put("qcFileName", qcphd); map.put("qcFileName", qcphd);
map.put("qcFileStatus", qcStatus); map.put("qcFileStatus", qcStatus);
map.put("sampleSystemType", sampleSystemType); map.put("sampleSystemType", sampleSystemType);
} else if (sampleSystemType.equals(SystemType.GAMMA.getType()) || sampleSystemType.equals(SystemType.PARTICULATE.getType())) { } else {
map.put("sampleFileName", sampleFileName); map.put("sampleFileName", sampleFileName);
map.put("gasFileName", ""); map.put("gasFileName", "");
map.put("detFileName", ""); map.put("detFileName", "");
map.put("qcFileName", ""); map.put("qcFileName", "");
map.put("sampleSystemType", sampleSystemType); map.put("sampleSystemType", sampleSystemType);
} else if (sampleSystemType.equals(SystemType.SELFSTATION.getType())) {
//加载并获取当前路径下所有的文件名称并进行名称格式化 仅需要格式化和sample文件同一个台站 名称格式化为最终名称
List<String> fileNames = phdFileUtil.FileNameByStandardForm(filePath, sampleFileName);
//匹配detFile
boolean detStatus = false;
String detaFileName = fileData.get("detaFileName");
String detphd = phdFileUtil.GetMatchFile(detaFileName, fileNames, DataTypeAbbr.DETBKPHD.getType());
if (StringUtils.isNotBlank(detphd)) {
detaFileName = detphd;
detStatus = true;
}
map.put("sampleFileName", sampleFileName);
map.put("gasFileName", "");
map.put("detFileName", detaFileName);
map.put("detFileStatus", detStatus);
map.put("qcFileName", "");
map.put("sampleSystemType", sampleSystemType);
} }
} }
if (CollectionUtils.isNotEmpty(map)) { if (CollectionUtils.isNotEmpty(map)) {