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

fix：补充新beta 的arr rrr log，暂时使用gamma的代替

Browse Source
This commit is contained in:
xiaoguangbin 2024-10-09 19:32:48 +08:00
parent dde5c8e373
commit 546ca0e0bd
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5805,10 +5805,11 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
String reportPath = analyses.getReportPath(); String reportPath = analyses.getReportPath();
String rootPath = spectrumPathProperties.getRootPath(); String rootPath = spectrumPathProperties.getRootPath();
String saveFilePath = spectrumPathProperties.getSaveFilePath(); String saveFilePath = spectrumPathProperties.getSaveFilePath();
reportPath = rootPath + saveFilePath + StrUtil.SLASH + reportPath + FileTypeEnum.arr.getType(); // todo beta报告暂时展示gamma
if (!FileUtil.exist(reportPath)) // reportPath = rootPath + saveFilePath + StrUtil.SLASH + reportPath + FileTypeEnum.arr.getType();
return Result.error("The automatic handler generated report does not exist！"); // if (!FileUtil.exist(reportPath))
result.put("Beta", FileUtil.readUtf8String(reportPath)); // return Result.error("The automatic handler generated report does not exist！");
// result.put("Beta", FileUtil.readUtf8String(reportPath));
List<org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi> analysisRois = analysisRoiAutoService.analysisRoi(idAnalysis); List<org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi> analysisRois = analysisRoiAutoService.analysisRoi(idAnalysis);
for (org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi analysisRoi : analysisRois) { for (org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi analysisRoi : analysisRois) {
Integer roiNum = analysisRoi.getRoiNum(); Integer roiNum = analysisRoi.getRoiNum();
@ -5816,6 +5817,8 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
roiReportPath = rootPath + saveFilePath + StrUtil.SLASH + roiReportPath + FileTypeEnum.arr.getType(); roiReportPath = rootPath + saveFilePath + StrUtil.SLASH + roiReportPath + FileTypeEnum.arr.getType();
if (!FileUtil.exist(roiReportPath)) continue; if (!FileUtil.exist(roiReportPath)) continue;
result.put("Gamma_ROI_" + roiNum, FileUtil.readUtf8String(roiReportPath)); result.put("Gamma_ROI_" + roiNum, FileUtil.readUtf8String(roiReportPath));
// todo beta报告暂时展示gamma
result.put("Beta", FileUtil.readUtf8String(roiReportPath));
} }
return Result.OK(result); return Result.OK(result);
} }
@ -5849,6 +5852,8 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
result.put("Gamma_ROI_2", reportContent2); result.put("Gamma_ROI_2", reportContent2);
result.put("Gamma_ROI_3", reportContent3); result.put("Gamma_ROI_3", reportContent3);
result.put("Gamma_ROI_4", reportContent4); result.put("Gamma_ROI_4", reportContent4);
// todo beta报告暂时使用gamma的
result.put("Beta", reportContent1);
return Result.OK(result); return Result.OK(result);
} }
@ -5863,9 +5868,9 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
String rootPath = spectrumPathProperties.getRootPath(); String rootPath = spectrumPathProperties.getRootPath();
String logPathPrefix = spectrumPathProperties.getLogPath(); String logPathPrefix = spectrumPathProperties.getLogPath();
logPath = rootPath + logPathPrefix + StrUtil.SLASH + logPath; logPath = rootPath + logPathPrefix + StrUtil.SLASH + logPath;
if (!FileUtil.exist(logPath)) // if (!FileUtil.exist(logPath))
return Result.error("The log generated by the automatic processor does not exist！"); // return Result.error("The log generated by the automatic processor does not exist！");
result.put("Beta", FileUtil.readUtf8String(logPath)); // result.put("Beta", FileUtil.readUtf8String(logPath));
List<org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi> analysisRois = analysisRoiAutoService.analysisRoi(idAnalysis); List<org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi> analysisRois = analysisRoiAutoService.analysisRoi(idAnalysis);
for (org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi analysisRoi : analysisRois) { for (org.jeecg.modules.base.entity.rnauto.GardsAnalysisRoi analysisRoi : analysisRois) {
Integer roiNum = analysisRoi.getRoiNum(); Integer roiNum = analysisRoi.getRoiNum();
@ -5873,7 +5878,9 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
roiLogPath = rootPath + logPathPrefix + StrUtil.SLASH + roiLogPath; roiLogPath = rootPath + logPathPrefix + StrUtil.SLASH + roiLogPath;
if (!FileUtil.exist(roiLogPath)) continue; if (!FileUtil.exist(roiLogPath)) continue;
result.put("Gamma_ROI_" + roiNum, FileUtil.readUtf8String(roiLogPath)); result.put("Gamma_ROI_" + roiNum, FileUtil.readUtf8String(roiLogPath));
result.put("Beta", FileUtil.readUtf8String(roiLogPath));
} }
// todo beta报告暂时使用gamma的
return Result.OK(result); return Result.OK(result);
} }
@ -5906,6 +5913,8 @@ public class SelfStationServiceImpl extends AbstractLogOrReport implements ISelf
result.put("Gamma_ROI_2", logContent2); result.put("Gamma_ROI_2", logContent2);
result.put("Gamma_ROI_3", logContent3); result.put("Gamma_ROI_3", logContent3);
result.put("Gamma_ROI_4", logContent4); result.put("Gamma_ROI_4", logContent4);
// todo beta报告暂时使用gamma的
result.put("Beta", logContent1);
return Result.OK(result); return Result.OK(result);
} }