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

人工交互分析报告存放地址改为Rrr文件夹与Arr区分开

Browse Source
This commit is contained in:
qiaoqinzheng 2024-01-18 14:03:25 +08:00
parent 128e0b6a50
commit ca744c524b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3189,7 +3189,12 @@ public class GammaFileUtil extends AbstractLogOrReport {
qsSaveFile = qsSaveFile.replace(StringPool.BACK_SLASH, StringPool.SLASH); qsSaveFile = qsSaveFile.replace(StringPool.BACK_SLASH, StringPool.SLASH);
String qsLogPath= path+StringPool.SLASH+middleData.analyses_analyst+"_"+logName; String qsLogPath= path+StringPool.SLASH+middleData.analyses_analyst+"_"+logName;
qsLogPath = qsLogPath.replace(StringPool.BACK_SLASH, StringPool.SLASH); qsLogPath = qsLogPath.replace(StringPool.BACK_SLASH, StringPool.SLASH);
String qsReportPath="Arr"+StringPool.SLASH+path+StringPool.SLASH+middleData.analyses_analyst+"_"+rptName; String qsReportPath= "";
if(type.equals(MiddleDataType.Auto.getType())) {
qsReportPath="Arr"+StringPool.SLASH+path+StringPool.SLASH+middleData.analyses_analyst+"_"+rptName;
} else if (type.equals(MiddleDataType.InterAction.getType()) && flag.equalsIgnoreCase("save")){
qsReportPath="Rrr"+StringPool.SLASH+path+StringPool.SLASH+middleData.analyses_analyst+"_"+rptName;
}
qsReportPath = qsReportPath.replace(StringPool.BACK_SLASH, StringPool.SLASH); qsReportPath = qsReportPath.replace(StringPool.BACK_SLASH, StringPool.SLASH);
middleData.analyses_save_filePath = qsSaveFile; middleData.analyses_save_filePath = qsSaveFile;

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

@ -3900,7 +3900,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
String qsLogPath= path+StringPool.SLASH+userName+"_"+logName; String qsLogPath= path+StringPool.SLASH+userName+"_"+logName;
qsLogPath = qsLogPath.replace(StringPool.BACK_SLASH, StringPool.SLASH); qsLogPath = qsLogPath.replace(StringPool.BACK_SLASH, StringPool.SLASH);
String rptName = fileNameMap.get("rpt"); String rptName = fileNameMap.get("rpt");
String qsReportPath="Arr"+StringPool.SLASH+path+StringPool.SLASH+userName+"_"+rptName; String qsReportPath="Rrr"+StringPool.SLASH+path+StringPool.SLASH+userName+"_"+rptName;
qsReportPath = qsReportPath.replace(StringPool.BACK_SLASH, StringPool.SLASH); qsReportPath = qsReportPath.replace(StringPool.BACK_SLASH, StringPool.SLASH);
String analyses_absolute_LogPath=spectrumPathProperties.getLogPath()+StringPool.SLASH+qsLogPath; String analyses_absolute_LogPath=spectrumPathProperties.getLogPath()+StringPool.SLASH+qsLogPath;
String analyses_absolute_ReportPath=spectrumPathProperties.getSaveFilePath()+StringPool.SLASH+qsReportPath; String analyses_absolute_ReportPath=spectrumPathProperties.getSaveFilePath()+StringPool.SLASH+qsReportPath;