From 03e093268c170cbf92fbded06d020c0de6504a2e Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Fri, 10 Nov 2023 10:22:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?gamma=E5=88=86=E6=9E=90=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=97=B6=E7=BC=BA=E5=B0=91=E9=83=A8=E5=88=86=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/jeecg/common/util/GammaFileUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java index 2371dc12..33d5ce24 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java @@ -1483,7 +1483,7 @@ public class GammaFileUtil extends AbstractLogOrReport { } List old_ener = phd.getUsedEnerPara().getP(); - List new_ener = CollectionUtils.isNotEmpty(phd.getMapEnerPara())?phd.getMapEnerPara().get(phd.getNewEner()).getP():new LinkedList<>(); + List new_ener = Objects.nonNull(phd.getMapEnerPara().get(phd.getNewEner()))?(CollectionUtils.isNotEmpty(phd.getMapEnerPara().get(phd.getNewEner()).getP())?phd.getMapEnerPara().get(phd.getNewEner()).getP():new LinkedList<>()):new LinkedList<>(); if(old_ener.size() != new_ener.size()) { return 1; } @@ -1494,7 +1494,7 @@ public class GammaFileUtil extends AbstractLogOrReport { } List old_reso = phd.getUsedResoPara().getP(); - List new_reso = CollectionUtils.isNotEmpty(phd.getMapResoPara())?phd.getMapResoPara().get(phd.getNewReso()).getP():new LinkedList<>(); + List new_reso = Objects.nonNull(phd.getMapResoPara().get(phd.getNewReso()))?(CollectionUtils.isNotEmpty(phd.getMapResoPara().get(phd.getNewReso()).getP())?phd.getMapResoPara().get(phd.getNewReso()).getP():new LinkedList<>()):new LinkedList<>(); if(old_reso.size() != new_reso.size()) { return 1; } @@ -1505,7 +1505,7 @@ public class GammaFileUtil extends AbstractLogOrReport { } List old_effi = phd.getUsedEffiPara().getP(); - List new_effi = CollectionUtils.isNotEmpty(phd.getMapEffiPara())?phd.getMapEffiPara().get(phd.getNewEffi()).getP():new LinkedList<>(); + List new_effi = Objects.nonNull(phd.getMapEffiPara().get(phd.getNewEffi()))?(CollectionUtils.isNotEmpty(phd.getMapEffiPara().get(phd.getNewEffi()).getP())?phd.getMapEffiPara().get(phd.getNewEffi()).getP():new LinkedList<>()):new LinkedList<>(); if(old_effi.size() != new_effi.size()) { return -1; } From 42d8b1bb45614cbdf67ef29c4591635e6e2cda6c Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Fri, 10 Nov 2023 10:55:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?gamma=E5=8A=9F=E8=83=BD=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E5=90=8E=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BA=86=E4=B8=B4=E6=97=B6=E6=96=87=E4=BB=B6=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=20gamma?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5=E7=A9=BA=E5=80=BC=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/util/GammaFileUtil.java | 2 -- ...GardsNuclLinesIdedSpectrumServiceImpl.java | 23 ++++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java index 33d5ce24..6d854878 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java @@ -3027,8 +3027,6 @@ public class GammaFileUtil extends AbstractLogOrReport { } } catch (FileNotFoundException e) { throw new RuntimeException(e); - } finally { - sampleTmp.delete(); } } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedSpectrumServiceImpl.java index a89e1c81..ffa833b1 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedSpectrumServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedSpectrumServiceImpl.java @@ -2,6 +2,7 @@ package org.jeecg.modules.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.rnman.GardsNuclLinesIded; import org.jeecg.modules.entity.vo.GStoreMiddleProcessData; @@ -34,18 +35,18 @@ public class GardsNuclLinesIdedSpectrumServiceImpl extends ServiceImpl