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

Merge branch 'station20231013' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide into station20231013

Browse Source
This commit is contained in:
panbaolin 2023-10-16 16:52:25 +08:00
commit e2b4f2f76d
3 changed files with 1023 additions and 1022 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jeecg-module-auto-process/src/main/java/org/jeecg/modules/file/FileOperation.java
View File

@ -1,5 +1,6 @@
package org.jeecg.modules.file;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.FileUtil;
import com.google.common.collect.Maps;
import org.apache.commons.lang3.StringUtils;
@ -86,6 +87,17 @@ public class FileOperation {
}
}
/**
* 保存文件
* @param filePath
* @param content
* @throws IOException
*/
public static void saveFile(String filePath, List<String> content) throws IOException {
if (CollUtil.isEmpty(content)) return;
FileUtil.writeUtf8Lines(content, filePath);
}
/**
* 修改文件名称
* @param file

2025
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java
View File

File diff suppressed because it is too large Load Diff

8
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SamplephdSpectrum.java
View File

@ -79,9 +79,9 @@ public class SamplephdSpectrum extends AbstractS_D_Q_G_SpectrumHandler {
Sample_B_Analysis bAnalysis = new Sample_B_Analysis(this);
bAnalysis.analysis();
}
// if (this.sourceData.system_type.equals(SystemType.PARTICULATE.getType()) || this.sourceData.system_type.equals(SystemType.GAMMA.getType())) {
// Sample_G_Analysis sample_g_analysis = new Sample_G_Analysis(super.sourceData, super.spectrumServiceQuotes, super.sampleData);
// sample_g_analysis.analysis();
// }
if (this.sourceData.system_type.equals(SystemType.PARTICULATE.getType()) || this.sourceData.system_type.equals(SystemType.GAMMA.getType())) {
Sample_G_Analysis sample_g_analysis = new Sample_G_Analysis(super.sourceData, super.spectrumServiceQuotes, super.sampleData);
sample_g_analysis.analysis();
}
}
}