From 5cb0ca72a5a4f6c6356defe1493c6d8a28d1cee9 Mon Sep 17 00:00:00 2001 From: duwenyuan <15600000461@163.com> Date: Wed, 17 Dec 2025 13:21:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20createGamma=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/common/util/SelfStationUtil.java | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java index b3831965..719ded1d 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java @@ -691,27 +691,24 @@ public class SelfStationUtil extends SelfBaseUtil { sampleVueData.setROIFourPHDFile(createGammaPHD(struct, gammaFourName, path, sampleVueData.getROIFourCounts())); } - public static void createGamma(String path, String sampleFileName, EnergySpectrumStruct struct, SelfStationVueData sampleVueData, boolean roi) { + public static void createGamma(String path, String sampleFileName, EnergySpectrumStruct struct, SelfStationVueData sampleVueData, PHDFile phdFile) { // 根据ROI生成四个Gamma谱文件, 文件命名为Beta名称后面_ROI_x.PHD - String gammaOneName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_1.PHD"; + String gammaOneName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_1_r.PHD"; // 创建Gamma文件 - createGammaFile(path, gammaOneName, struct, sampleVueData.getROIOneCounts()); - String gammaTwoName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_2.PHD"; - createGammaFile(path, gammaTwoName, struct, sampleVueData.getROITwoCounts()); + createGammaFile(path, gammaOneName, struct, sampleVueData.getROIOneCounts(),phdFile); + String gammaTwoName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_2_r.PHD"; + createGammaFile(path, gammaTwoName, struct, sampleVueData.getROITwoCounts(),phdFile); - String gammaThreeName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_3.PHD"; - createGammaFile(path, gammaThreeName, struct, sampleVueData.getROIThreeCounts()); + String gammaThreeName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_3_r.PHD"; + createGammaFile(path, gammaThreeName, struct, sampleVueData.getROIThreeCounts(),phdFile); - String gammaFourName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_4.PHD"; - createGammaFile(path, gammaFourName, struct, sampleVueData.getROIFourCounts()); + String gammaFourName = StrUtil.subBefore(sampleFileName, ".PHD", true) + "_ROI_4_r.PHD"; + createGammaFile(path, gammaFourName, struct, sampleVueData.getROIFourCounts(),phdFile); // Gamma文件内容转换为PHD实体 sampleVueData.setROIOneFileName(gammaOneName); - if (roi) { - sampleVueData.setROIOnePHDFile(createGammaPHD(struct, gammaOneName, path, sampleVueData.getROIOneCounts())); - } else { - sampleVueData.setROIOnePHDFile(createGammaPHD(struct, gammaOneName, path, sampleVueData.getROIOneCounts())); - } + sampleVueData.setROIOnePHDFile(createGammaPHD(struct, gammaOneName, path, sampleVueData.getROIOneCounts())); + sampleVueData.setROITwoFileName(gammaTwoName); sampleVueData.setROITwoPHDFile(createGammaPHD(struct, gammaTwoName, path, sampleVueData.getROITwoCounts())); sampleVueData.setROIThreeFileName(gammaThreeName);