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

fix：自动处理对能谱 data_type判断进行完善

Browse Source
This commit is contained in:
xiaoguangbin 2023-10-10 09:56:50 +08:00
parent 94ea96b788
commit 75d5fb4c68
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumHandler.java
View File

@ -118,14 +118,20 @@ public abstract class SpectrumHandler extends Chain{
boolean flag = false; boolean flag = false;
final DataType[] values = DataType.values(); final DataType[] values = DataType.values();
for(DataType value : values){ for(DataType value : values){
if(this.mailContent.indexOf(DATA_TYPE_PREFIX+value.getType()) != -1){ // 判断能谱数据类型是否正确
if(this.mailContent.contains(DATA_TYPE_PREFIX + value.getType())){
StringBuilder localPath = new StringBuilder(); StringBuilder localPath = new StringBuilder();
localPath.append(this.spectrumServiceQuotes.getTaskProperties().getTemporaryStoragePath()); localPath.append(this.spectrumServiceQuotes.getTaskProperties().getTemporaryStoragePath());
localPath.append(File.separator); localPath.append(File.separator);
localPath.append(System.currentTimeMillis()); localPath.append(System.currentTimeMillis());
localPath.append(value.getSuffix()); localPath.append(value.getSuffix());
this.mailFile = FileUtil.writeString(this.mailContent, localPath.toString(), "UTF-8"); this.mailFile = FileUtil.writeString(this.mailContent, localPath.toString(), "UTF-8");
this.currDataType = value; // 能谱数据类型如果是 SPHDP 或者 SPHDF 统一改为 SAMPLEPHD
if (value.equals(DataType.SPHDP) || value.equals(DataType.SPHDF)) {
this.currDataType = DataType.SAMPLEPHD;
} else {
this.currDataType = value;
}
flag = true; flag = true;
break; break;
} }