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:06:19 +08:00
parent 0d4deaf403
commit b7c0553239
3 changed files with 9 additions and 4 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);
String qsLogPath= path+StringPool.SLASH+middleData.analyses_analyst+"_"+logName;
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);
middleData.analyses_save_filePath = qsSaveFile;

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

@ -5065,7 +5065,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
}
{
String rptPathName = middleData.analyses_absolute_ReportPath.substring(0, middleData.analyses_absolute_ReportPath.lastIndexOf(StringPool.SLASH));
String rptFileName = middleData.analyses_absolute_ReportPath.substring(middleData.analyses_absolute_ReportPath.lastIndexOf(StringPool.SLASH)+1);
String rptFileName = middleData.analyses_absolute_ReportPath.substring(middleData.analyses_absolute_ReportPath.lastIndexOf(StringPool.SLASH)+1)+".txt";
File rptFile = new File(rptFileName);
try {
FileUtil.writeString(gammaFileUtil.GetReportContent(middleData), rptFile, "UTF-8");

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

@ -3917,7 +3917,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
String qsLogPath= path+StringPool.SLASH+userName+"_"+logName;
qsLogPath = qsLogPath.replace(StringPool.BACK_SLASH, StringPool.SLASH);
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);
String analyses_absolute_LogPath=spectrumPathProperties.getLogPath()+StringPool.SLASH+qsLogPath;
String analyses_absolute_ReportPath=spectrumPathProperties.getSaveFilePath()+StringPool.SLASH+qsReportPath;
@ -4076,7 +4076,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
{
String rptContent = phdFileUtil.OutPutRnRpt(betaDataFile);
String rptPathName = analyses_absolute_ReportPath.substring(0, analyses_absolute_ReportPath.lastIndexOf(StringPool.SLASH));
String rptFileName = analyses_absolute_ReportPath.substring(analyses_absolute_ReportPath.lastIndexOf(StringPool.SLASH)+1);
String rptFileName = analyses_absolute_ReportPath.substring(analyses_absolute_ReportPath.lastIndexOf(StringPool.SLASH)+1)+".txt";
File rptFile = new File(rptFileName);
try {
FileUtil.writeString(rptContent, rptFile, "UTF-8");