From ba17537b44f81210eacb80d79b1b09aa78734a89 Mon Sep 17 00:00:00 2001 From: nieziyan Date: Thu, 1 Aug 2024 14:43:57 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9AbetaEnergyData=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/jeecg/common/util/PHDFileUtil.java | 2 +- .../org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java index 18c73448..53f01642 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java @@ -312,7 +312,7 @@ public class PHDFileUtil extends AbstractLogOrReport { betaDataFile.setDetGammaEnergyList(gammaEnergyList); betaDataFile.setDetBetaOriginalSeriseData(betaOriginalSeriseData); betaDataFile.setDetBetaProjectedSeriseData(betaProjectedSeriseData); - betaDataFile.setSampleBetaEnergyList(betaEnergyList); + betaDataFile.setDetBetaEnergyList(betaEnergyList); } else if (type.equalsIgnoreCase("qc")) { betaDataFile.setQcSpectrumData(spectrumData); betaDataFile.setQcBoundary(boundaryList); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java index e9a46635..404a97d5 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java @@ -194,6 +194,7 @@ public class SpectrumFileServiceImpl implements ISpectrumFileService { String[] names = name.split(comma); ftpFiles = ftpFiles.stream() .filter(file -> containsAllIgnoreCase(file.getName(),names)) + .filter(file -> !StrUtil.contains(file.getName(), "_ROI_")) .collect(Collectors.toList()); } for (File ftpFile : ftpFiles) {