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

fix:gamma自动处理baseline等文件保存路径修改

Browse Source
This commit is contained in:
xiaoguangbin 2023-10-23 10:19:38 +08:00
parent e6eb6699a2
commit 4d47579788
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -3103,13 +3103,15 @@ public class GammaFileUtil extends AbstractLogOrReport {
qsScacPath = qsScacPath.replace(StringPool.BACK_SLASH, StringPool.SLASH); qsScacPath = qsScacPath.replace(StringPool.BACK_SLASH, StringPool.SLASH);
String savePath = StringPool.SLASH + spectrumPathProperties.getSaveFilePath();
String rootPath = spectrumPathProperties.getRootPath();
String qsSaveBaseLine = StringPool.SLASH+spectrumPathProperties.getSaveFilePath()+StringPool.SLASH+qsBaseLinePath; String qsSaveBaseLine = savePath + StringPool.SLASH + qsBaseLinePath;
String qsSaveLc = StringPool.SLASH+spectrumPathProperties.getSaveFilePath()+StringPool.SLASH+qsLcPath; String qsSaveLc = savePath + StringPool.SLASH + qsLcPath;
String qsSaveScac = StringPool.SLASH+spectrumPathProperties.getSaveFilePath()+StringPool.SLASH+qsScacPath; String qsSaveScac = savePath + StringPool.SLASH + qsScacPath;
GammaReportUtil.writeFile(fileAnlyse.getBaseCtrls(), qsSaveBaseLine); GammaReportUtil.writeFile(fileAnlyse.getBaseCtrls(), rootPath + qsSaveBaseLine);
GammaReportUtil.writeFile(fileAnlyse.getVLc(), "LC", qsSaveLc); GammaReportUtil.writeFile(fileAnlyse.getVLc(), "LC", rootPath + qsSaveLc);
GammaReportUtil.writeFile(fileAnlyse.getVScac(), "SCSC", qsSaveScac); GammaReportUtil.writeFile(fileAnlyse.getVScac(), "SCSC", rootPath + qsSaveScac);
double totalNumber = 0.0; double totalNumber = 0.0;
for(int m=0;m<fileAnlyse.getSpec().getCounts().size();m++) { for(int m=0;m<fileAnlyse.getSpec().getCounts().size();m++) {
@ -4177,6 +4179,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
} }
public File analyzeFile(String path, String fileName) { public File analyzeFile(String path, String fileName) {
path = path.replace("\\", "/");
//连接ftp //连接ftp
FTPClient ftpClient = ftpUtil.LoginFTP(); FTPClient ftpClient = ftpUtil.LoginFTP();
InputStream inputStream = null; InputStream inputStream = null;