jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/SelfBaseUtil.java

@@ -549,7 +549,7 @@ public class SelfBaseUtil extends AbstractLogOrReport {
      * @param g_counts ROI卡出来的Gamma数据
      */
     public static void createGammaFile(String pathName,String fileName, EnergySpectrumStruct struct, List<Long> g_counts) {
-        File file = new File(pathName + StrUtil.SLASH + fileName);
+        File file = new File(pathName + File.separator + fileName);
         // 创建PrintWriter对象
         PrintWriter out = null;
         DecimalFormat decimalFormat = new DecimalFormat("0.000000");

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

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