From 0ebc9d0378e56c55932c50dae0a10cfe6ce7276e Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 13 Nov 2023 11:55:49 +0800 Subject: [PATCH 1/8] =?UTF-8?q?beta=E7=94=9F=E6=88=90RRR=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8A=A0=E8=BD=BD=E6=95=B0=E6=8D=AE?= =?UTF-8?q?new=E5=85=AC=E5=BC=8F=E7=BC=BA=E5=A4=B1=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 --- .../impl/SpectrumAnalysisServiceImpl.java | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index 2a7c1fdc..d83553a6 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -1010,21 +1010,21 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements strBuffer.append("\n"); strBuffer.append("#SAMPLE New CALIBRATION").append("\n"); strBuffer.append(" New Beta New Gamma ").append("\n"); - strBuffer.append(" CH(x) = ("+ (Objects.isNull(betaCalibrationParamS.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff1()))) - +")+("+ (Objects.isNull(betaCalibrationParamS.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff2()))) - +")*x+("+ (Objects.isNull(betaCalibrationParamS.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff3()))) + strBuffer.append(" CH(x) = ("+ (Objects.isNull(betaCalibrationParamS.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff1()))) + +")+("+ (Objects.isNull(betaCalibrationParamS.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff2()))) + +")*x+("+ (Objects.isNull(betaCalibrationParamS.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff3()))) +")x*x ") - .append(" CH(x) = ("+ (Objects.isNull(gammaCalibrationParamS.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff1()))) - +")+("+ (Objects.isNull(gammaCalibrationParamS.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff2()))) - +")*x+("+ (Objects.isNull(gammaCalibrationParamS.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff3()))) + .append(" CH(x) = ("+ (Objects.isNull(gammaCalibrationParamS.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff1()))) + +")+("+ (Objects.isNull(gammaCalibrationParamS.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff2()))) + +")*x+("+ (Objects.isNull(gammaCalibrationParamS.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff3()))) +")x*x ").append("\n"); - strBuffer.append(" E(x) = ("+ (Objects.isNull(betaCalibrationParamES.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff1()))) - +")+("+ (Objects.isNull(betaCalibrationParamES.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff2()))) - +")*x+("+ (Objects.isNull(betaCalibrationParamES.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff3()))) + strBuffer.append(" E(x) = ("+ (Objects.isNull(betaCalibrationParamES.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff1()))) + +")+("+ (Objects.isNull(betaCalibrationParamES.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff2()))) + +")*x+("+ (Objects.isNull(betaCalibrationParamES.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff3()))) +")x*x ") - .append(" E(x) = ("+ (Objects.isNull(gammaCalibrationParamES.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff1()))) - +")+("+ (Objects.isNull(gammaCalibrationParamES.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff2()))) - +")*x+("+ (Objects.isNull(gammaCalibrationParamES.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff3()))) + .append(" E(x) = ("+ (Objects.isNull(gammaCalibrationParamES.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff1()))) + +")+("+ (Objects.isNull(gammaCalibrationParamES.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff2()))) + +")*x+("+ (Objects.isNull(gammaCalibrationParamES.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff3()))) +")x*x").append("\n"); strBuffer.append("\n"); strBuffer.append("#SAMPLE: LIMITS PER ROI").append("\n"); @@ -1064,21 +1064,21 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements strBuffer.append("\n"); strBuffer.append("#DET New CALIBRATION").append("\n"); strBuffer.append(" New Beta New Gamma ").append("\n"); - strBuffer.append(" CH(x) = ("+ (Objects.isNull(betaCalibrationParamD.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff1()))) - +")+("+ (Objects.isNull(betaCalibrationParamD.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff2()))) - +")*x+("+ (Objects.isNull(betaCalibrationParamD.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff3()))) + strBuffer.append(" CH(x) = ("+ (Objects.isNull(betaCalibrationParamD.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff1()))) + +")+("+ (Objects.isNull(betaCalibrationParamD.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff2()))) + +")*x+("+ (Objects.isNull(betaCalibrationParamD.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff3()))) +")x*x ") - .append(" CH(x) = ("+ (Objects.isNull(gammaCalibrationParamD.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff1()))) - +")+("+ (Objects.isNull(gammaCalibrationParamD.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff2()))) - +")*x+("+ (Objects.isNull(gammaCalibrationParamD.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff3()))) + .append(" CH(x) = ("+ (Objects.isNull(gammaCalibrationParamD.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff1()))) + +")+("+ (Objects.isNull(gammaCalibrationParamD.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff2()))) + +")*x+("+ (Objects.isNull(gammaCalibrationParamD.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff3()))) +")x*x").append("\n"); - strBuffer.append(" E(x) = ("+ (Objects.isNull(betaCalibrationParamED.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff1()))) - +")+("+ (Objects.isNull(betaCalibrationParamED.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff2()))) - +")*x+("+ (Objects.isNull(betaCalibrationParamED.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff3()))) + strBuffer.append(" E(x) = ("+ (Objects.isNull(betaCalibrationParamED.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff1()))) + +")+("+ (Objects.isNull(betaCalibrationParamED.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff2()))) + +")*x+("+ (Objects.isNull(betaCalibrationParamED.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff3()))) +")x*x ") - .append(" E(x) = ("+ (Objects.isNull(gammaCalibrationParamED.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff1()))) - +")+("+ (Objects.isNull(gammaCalibrationParamED.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff2()))) - +")*x+("+ (Objects.isNull(gammaCalibrationParamED.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff3()))) + .append(" E(x) = ("+ (Objects.isNull(gammaCalibrationParamED.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff1()))) + +")+("+ (Objects.isNull(gammaCalibrationParamED.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff2()))) + +")*x+("+ (Objects.isNull(gammaCalibrationParamED.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff3()))) +")x*x").append("\n"); strBuffer.append("\n"); strBuffer.append("#DET: LIMITS PER ROI").append("\n"); @@ -1118,21 +1118,21 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements strBuffer.append("\n"); strBuffer.append("#GAS New CALIBRATION").append("\n"); strBuffer.append(" New Beta New Gamma ").append("\n"); - strBuffer.append(" CH(x) = ("+ (Objects.isNull(betaCalibrationParamG.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff1()))) - +")+("+ (Objects.isNull(betaCalibrationParamG.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff2()))) - +")*x+("+ (Objects.isNull(betaCalibrationParamG.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff3()))) + strBuffer.append(" CH(x) = ("+ (Objects.isNull(betaCalibrationParamG.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff1()))) + +")+("+ (Objects.isNull(betaCalibrationParamG.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff2()))) + +")*x+("+ (Objects.isNull(betaCalibrationParamG.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff3()))) +")x*x ") - .append(" CH(x) = ("+ (Objects.isNull(gammaCalibrationParamG.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff1()))) - +")+("+ (Objects.isNull(gammaCalibrationParamG.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff2()))) - +")*x+("+ (Objects.isNull(gammaCalibrationParamG.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff3()))) + .append(" CH(x) = ("+ (Objects.isNull(gammaCalibrationParamG.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff1()))) + +")+("+ (Objects.isNull(gammaCalibrationParamG.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff2()))) + +")*x+("+ (Objects.isNull(gammaCalibrationParamG.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff3()))) +")x*x").append("\n"); - strBuffer.append(" E(x) = ("+ (Objects.isNull(betaCalibrationParamEG.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff1()))) - +")+("+ (Objects.isNull(betaCalibrationParamEG.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff2()))) - +")*x+("+ (Objects.isNull(betaCalibrationParamEG.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff3()))) + strBuffer.append(" E(x) = ("+ (Objects.isNull(betaCalibrationParamEG.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff1()))) + +")+("+ (Objects.isNull(betaCalibrationParamEG.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff2()))) + +")*x+("+ (Objects.isNull(betaCalibrationParamEG.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff3()))) +")x*x ") - .append(" E(x) = ("+ (Objects.isNull(gammaCalibrationParamEG.getCoeff1())?"?1":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff1()))) - +")+("+ (Objects.isNull(gammaCalibrationParamEG.getCoeff2())?"?2":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff2()))) - +")*x+("+ (Objects.isNull(gammaCalibrationParamEG.getCoeff3())?"?3":NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff3()))) + .append(" E(x) = ("+ (Objects.isNull(gammaCalibrationParamEG.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff1()))) + +")+("+ (Objects.isNull(gammaCalibrationParamEG.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff2()))) + +")*x+("+ (Objects.isNull(gammaCalibrationParamEG.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff3()))) +")x*x").append("\n"); strBuffer.append("\n"); strBuffer.append("#GAS: LIMITS PER ROI").append("\n"); From 1329ec62a2b6c7d8bade3e797fcc4ae97e3ab93c Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 13 Nov 2023 14:03:59 +0800 Subject: [PATCH 2/8] =?UTF-8?q?gamma=E8=B5=8B=E5=80=BCrecoilBetaChan?= =?UTF-8?q?=EF=BC=8CrecoilDeltaChan=E5=80=BC=E4=B8=BAnan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/common/util/GammaFileUtil.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 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 af3cfb79..51a1e4b6 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 @@ -3864,15 +3864,14 @@ public class GammaFileUtil extends AbstractLogOrReport { } public List InitPeakTable(List vPeak) { + //遍历vPeak + for (PeakInfo info:vPeak) { + info.recoilBetaChan = "nan"; + info.recoilDeltaChan = "nan"; + } List result = new LinkedList<>(); for(int i=0; i Date: Mon, 13 Nov 2023 15:14:47 +0800 Subject: [PATCH 3/8] =?UTF-8?q?gamma=E5=8A=9F=E8=83=BDnan=EF=BC=8Cinf?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98=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 | 16 ++++++---- .../service/impl/GammaServiceImpl.java | 30 +++++++++++-------- 2 files changed, 28 insertions(+), 18 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 51a1e4b6..5bf3ae61 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 @@ -3363,8 +3363,8 @@ public class GammaFileUtil extends AbstractLogOrReport { dvctUPPERTAIL.add(fileAnlyse.getVPeak().get(m).upperTail); dvctUPPERTAILALPHA.add(fileAnlyse.getVPeak().get(m).upperTailAlpha); dvctBWWIDTHCHAN.add(fileAnlyse.getVPeak().get(m).BWWidthChan); - dvctRECOILBETACHAN.add(Double.valueOf(fileAnlyse.getVPeak().get(m).recoilBetaChan)); - dvctRECOILDELTACHAN.add(Double.valueOf(fileAnlyse.getVPeak().get(m).recoilDeltaChan)); + dvctRECOILBETACHAN.add(fileAnlyse.getVPeak().get(m).recoilBetaChan.equalsIgnoreCase("nan")?Double.NaN:Double.valueOf(fileAnlyse.getVPeak().get(m).recoilBetaChan)); + dvctRECOILDELTACHAN.add(fileAnlyse.getVPeak().get(m).recoilDeltaChan.equalsIgnoreCase("nan")?Double.NaN:Double.valueOf(fileAnlyse.getVPeak().get(m).recoilDeltaChan)); dvctSTEPRAIO.add(fileAnlyse.getVPeak().get(m).stepRatio); dvctBACKGROUNDAREA.add(fileAnlyse.getVPeak().get(m).backgroundArea); dvctMEANBACKCOUNT.add(fileAnlyse.getVPeak().get(m).meanBackCount); @@ -3508,8 +3508,8 @@ public class GammaFileUtil extends AbstractLogOrReport { dvctACTIV_KEY.add(itor_v.getValue().getActivity()); dvctACTIV_KEY_ERR.add(itor_v.getValue().getAct_err()); dvctMDA.add(String.format("%e", itor_v.getValue().getMda())); - dvctMDC.add(itor_v.getValue().getMdc()>0?String.format("%e", itor_v.getValue().getMdc()):"0.0"); - dvctCONCENTRATION.add(String.format("%e", itor_v.getValue().getConcentration())); + dvctMDC.add(itor_v.getValue().getMdc().isInfinite()?"inf":(itor_v.getValue().getMdc()>0?String.format("%e", itor_v.getValue().getMdc()):"0.0")); + dvctCONCENTRATION.add(itor_v.getValue().getConcentration().isInfinite()?"inf":String.format("%e", itor_v.getValue().getConcentration())); dvctCSC_RATIO.add(1.0); dvctCSC_RATIO_ERR.add(0.0); if(itor_v.getValue().getCalculateIdx() >= 0 && itor_v.getValue().getCalculateIdx() InitPeakTable(List vPeak) { //遍历vPeak for (PeakInfo info:vPeak) { - info.recoilBetaChan = "nan"; - info.recoilDeltaChan = "nan"; + if (Objects.isNull(info.recoilBetaChan)) { + info.recoilBetaChan = "nan"; + } + if (Objects.isNull(info.recoilDeltaChan)) { + info.recoilDeltaChan = "nan"; + } } List result = new LinkedList<>(); for(int i=0; i vE_Rg.get(1)) { @@ -1573,7 +1579,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi gammaFileUtil.PeaksChanged(phd); for (int i = 0; i < phd.getVPeak().size(); i++) { PeakInfo peakInfo = phd.getVPeak().get(i); - peakInfo.index = i + 1; + peakInfo.index = i; } List vPeak = gammaFileUtil.InitPeakTable(phd.getVPeak()); map.put("table", vPeak); From f2f9eb49f31ef1809bf90d44afb2ac5a205b6522 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 13 Nov 2023 15:41:19 +0800 Subject: [PATCH 4/8] =?UTF-8?q?PeakInfo=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E5=A4=8D=E5=88=B6=E5=AE=9E=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/entity/vo/PeakInfo.java | 2 + .../org/jeecg/modules/entity/vo/PeakInfo.java | 71 ------------------- 2 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/entity/vo/PeakInfo.java diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/PeakInfo.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/PeakInfo.java index 459421d3..f9844239 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/PeakInfo.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/PeakInfo.java @@ -64,6 +64,8 @@ public class PeakInfo implements Serializable { public PeakInfo(){ nuclides = new LinkedList<>(); comments = ""; + recoilBetaChan = "nan"; + recoilDeltaChan = "nan"; } } diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/entity/vo/PeakInfo.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/entity/vo/PeakInfo.java deleted file mode 100644 index f9844239..00000000 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/modules/entity/vo/PeakInfo.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.jeecg.modules.entity.vo; - - -import java.io.Serializable; -import java.util.LinkedList; -import java.util.List; - -public class PeakInfo implements Serializable { - - public int index; //峰序号 - - public int multiIndex; //重峰序号 - - public int left; //峰的左边界 - - public int right; //峰的右边界 - - public double peakCentroid; //峰拟合后加权峰中心道 - - public double energy; - - public double fwhmc; //半高宽 - - public double fwhm; //以keV为单位的半高宽 - - public double area; //净面积 - - public double areaErr; // - - public double efficiency; - - public double lc; - - public double ld; - - public double meanBackCount; - - public double backgroundArea; - - public double significance; - - public double sensitivity; - - public double stepRatio; - - public double tail; - - public double tailAlpha; - - public double upperTail; - - public double upperTailAlpha; - - public double BWWidthChan; - - public String recoilBetaChan; - - public String recoilDeltaChan; - - public String comments; - - public List nuclides; - - public PeakInfo(){ - nuclides = new LinkedList<>(); - comments = ""; - recoilBetaChan = "nan"; - recoilDeltaChan = "nan"; - } - -} From 4f29d3235c22f4c02a687b8df54e8df916cfef50 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 13 Nov 2023 18:09:31 +0800 Subject: [PATCH 5/8] =?UTF-8?q?gamma=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/util/GammaFileUtil.java | 24 +++++++++++-------- .../service/impl/GammaServiceImpl.java | 2 +- 2 files changed, 15 insertions(+), 11 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 5bf3ae61..1d9d2d33 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 @@ -3508,8 +3508,8 @@ public class GammaFileUtil extends AbstractLogOrReport { dvctACTIV_KEY.add(itor_v.getValue().getActivity()); dvctACTIV_KEY_ERR.add(itor_v.getValue().getAct_err()); dvctMDA.add(String.format("%e", itor_v.getValue().getMda())); - dvctMDC.add(itor_v.getValue().getMdc().isInfinite()?"inf":(itor_v.getValue().getMdc()>0?String.format("%e", itor_v.getValue().getMdc()):"0.0")); - dvctCONCENTRATION.add(itor_v.getValue().getConcentration().isInfinite()?"inf":String.format("%e", itor_v.getValue().getConcentration())); + dvctMDC.add(Objects.isNull(itor_v.getValue().getMdc())?null:(itor_v.getValue().getMdc().isInfinite()?"inf":(itor_v.getValue().getMdc()>0?String.format("%e", itor_v.getValue().getMdc()):"0.0"))); + dvctCONCENTRATION.add(Objects.isNull(itor_v.getValue().getConcentration())?null:itor_v.getValue().getConcentration().isInfinite()?"inf":String.format("%e", itor_v.getValue().getConcentration())); dvctCSC_RATIO.add(1.0); dvctCSC_RATIO_ERR.add(0.0); if(itor_v.getValue().getCalculateIdx() >= 0 && itor_v.getValue().getCalculateIdx() Date: Tue, 14 Nov 2023 14:58:57 +0800 Subject: [PATCH 6/8] =?UTF-8?q?beta=E5=8A=9F=E8=83=BD=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E5=BD=93=E5=A4=A9?= =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=8F=B0=E7=AB=99=E5=8F=8A=E6=8E=A2=E6=B5=8B?= =?UTF-8?q?=E5=99=A8=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=8B=BE=E9=80=89allUser?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=85=A8=E9=83=A8=E5=8F=B0=E7=AB=99=EF=BC=8C?= =?UTF-8?q?=E6=8E=A2=E6=B5=8B=E5=99=A8=E4=BF=A1=E6=81=AF=20gamma=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=8A=A0=E8=BD=BD=E4=B8=BB=E9=A1=B5=E9=9D=A2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?analyst=E8=8E=B7=E5=8F=96=E5=AF=B9=E5=BA=94=E5=88=86=E6=9E=90?= =?UTF-8?q?=E5=91=98=E7=9A=84=E5=88=86=E6=9E=90=E7=BB=93=E6=9E=9C=20web?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0downloadFile=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E7=94=A8=E4=BA=8E=E4=B8=8B=E8=BD=BDsample=E5=8F=8Asam?= =?UTF-8?q?ple=E7=9B=B8=E5=85=B3=E5=88=86=E6=9E=90=E8=B0=B1=E6=96=87?= =?UTF-8?q?=E4=BB=B6=20mapper=E7=B1=BB=E7=BC=BA=E5=B0=91=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/common/util/FTPUtil.java | 11 +- .../modules/controller/GammaController.java | 8 +- .../SpectrumAnalysesController.java | 4 +- .../entity/GardsSampleDataSpectrum.java | 3 + .../jeecg/modules/service/IGammaService.java | 4 +- .../service/ISpectrumAnalysisService.java | 2 +- .../service/impl/GammaServiceImpl.java | 14 +- .../impl/SpectrumAnalysisServiceImpl.java | 81 ++++++---- .../controller/WebStatisticsController.java | 6 + .../mapper/GardsBgEfficiencyPairsMapper.java | 2 + .../GardsCalibrationPairsOrigMapper.java | 2 + .../modules/mapper/GardsHistogramMapper.java | 2 + .../modules/mapper/GardsRoiLimitsMapper.java | 2 + .../mapper/GardsSampleCertLineMapper.java | 2 + .../modules/mapper/GardsSampleCertMapper.java | 2 + .../mapper/GardsSampleDataWebMapper.java | 10 ++ .../mapper/GardsSampleDescriptionMapper.java | 2 + .../mapper/GardsSampleRatiosMapper.java | 2 + .../modules/mapper/GardsSpectrumMapper.java | 2 + .../mapper/xml/GardsSampleDataWebMapper.xml | 40 +++++ .../service/IGardsSampleDataWebService.java | 2 + .../impl/GardsSampleDataWebServiceImpl.java | 151 +++++++++++++++++- 22 files changed, 295 insertions(+), 59 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java index d101e593..2891313e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java @@ -437,6 +437,8 @@ public class FTPUtil { public File downloadFile(String fromPath, String toPath) { FTPClient ftpClient = null; InputStream inputStream = null; + // 声明一个临时文件 + File tempFile = null; try { ftpClient = LoginFTP(); // 切换被动模式 @@ -446,10 +448,11 @@ public class FTPUtil { ftpClient.setControlEncoding("UTF-8"); ftpClient.setFileTransferMode(FTPClient.STREAM_TRANSFER_MODE); inputStream = ftpClient.retrieveFileStream(fromPath); - // 声明一个临时文件 - File tempFile = File.createTempFile(toPath, null); - // 将FTP文件的输入流复制给临时文件 - FileUtils.copyInputStreamToFile(inputStream, tempFile); + if (Objects.nonNull(inputStream)) { + tempFile = File.createTempFile(toPath, null); + // 将FTP文件的输入流复制给临时文件 + FileUtils.copyInputStreamToFile(inputStream, tempFile); + } return tempFile; } catch (IOException e) { e.printStackTrace(); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java index 0787d5a1..7c448ca5 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java @@ -32,8 +32,8 @@ public class GammaController { @GetMapping("initValue") @ApiOperation(value = "初始化gamma数据", notes = "初始化gamma数据") - public Result initValue(Integer sampleId, String dbName, String fileName, HttpServletRequest request) { - return gammaService.initValue(sampleId, dbName, fileName, request); + public Result initValue(Integer sampleId, String dbName, String analyst, String fileName, HttpServletRequest request) { + return gammaService.initValue(sampleId, dbName, analyst, fileName, request); } @@ -43,8 +43,8 @@ public class GammaController { } @GetMapping("gammaByDB") - public Result gammaByDB(Integer sampleId, String dbName, HttpServletRequest request){ - return gammaService.gammaByDB(dbName, sampleId, request); + public Result gammaByDB(Integer sampleId, String dbName, String analyst, HttpServletRequest request){ + return gammaService.gammaByDB(dbName, sampleId, analyst, request); } @GetMapping("gammaByFile") diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java index 312732e4..8abeac18 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java @@ -26,8 +26,8 @@ public class SpectrumAnalysesController { @GetMapping("getDBSearchList") @ApiOperation(value = "查询查询条件数据接口", notes = "查询查询条件数据接口") - public Result getDBSearchList(HttpServletRequest request, boolean AllUsers, String dbName, String[] menuTypes) { - return spectrumAnalysisService.getDBSearchList(request, AllUsers, dbName, menuTypes); + public Result getDBSearchList(HttpServletRequest request, boolean AllUsers) { + return spectrumAnalysisService.getDBSearchList(request, AllUsers); } @GetMapping("getDBSpectrumList") diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java index 8360d816..a5ce048a 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/GardsSampleDataSpectrum.java @@ -31,6 +31,9 @@ public class GardsSampleDataSpectrum extends GardsSampleData { @TableField(exist = false) private String dbName; + @TableField(exist = false) + private String analyst; + @TableField(exist = false) @Excel(name = "NO" ,orderNum = "1") private Integer no; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java index 02306622..bf837927 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java @@ -12,11 +12,11 @@ import java.util.List; public interface IGammaService{ - Result initValue(Integer sampleId, String dbName, String fileName, HttpServletRequest request); + Result initValue(Integer sampleId, String dbName, String analyst, String fileName, HttpServletRequest request); Result testFun(String fileName, HttpServletRequest request); - Result gammaByDB(String dbName, Integer sampleId, HttpServletRequest request); + Result gammaByDB(String dbName, Integer sampleId, String analyst, HttpServletRequest request); Result gammaByFile(String fileName, HttpServletRequest request); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java index 9a57ecc5..b2c23688 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java @@ -14,7 +14,7 @@ import java.util.List; public interface ISpectrumAnalysisService { - Result getDBSearchList(HttpServletRequest request, boolean AllUsers, String dbName, String[] menuTypes); + Result getDBSearchList(HttpServletRequest request, boolean AllUsers); Result getDBSpectrumList(QueryRequest queryRequest, GardsSampleDataSpectrum gardsSampleData, String dbName, String[] menuTypes, boolean AllUsers, boolean CollectStopB, boolean AcqStartB, Date startDate, Date endDate, HttpServletRequest request); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java index 5fd36fd0..928330e0 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java @@ -140,7 +140,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi private IGardsAnalySettingSpectrumService analySettingSpectrumService; @Override - public Result initValue(Integer sampleId, String dbName, String samfileName, HttpServletRequest request) { + public Result initValue(Integer sampleId, String dbName, String analyst, String samfileName, HttpServletRequest request) { Result result = new Result(); //获取用户名 String userName = JwtUtil.getUserNameByToken(request); @@ -168,7 +168,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi if (dbName.equals("auto")) { gammaFileUtil.SetBaseInfo(phd, "RNAUTO"); } else if (dbName.equals("man")) { - gammaFileUtil.SetBaseInfo(phd, userName); + gammaFileUtil.SetBaseInfo(phd, analyst); } // 从数据库中读取phd其他相关信息 boolean bRet = getResultFromDB(dbName, userName, sampleId, phd, result); @@ -433,7 +433,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi } @Override - public Result gammaByDB(String dbName, Integer sampleId, HttpServletRequest request) { + public Result gammaByDB(String dbName, Integer sampleId, String analyst, HttpServletRequest request) { Result result = new Result(); // 通过token获取用户名 String userName = JwtUtil.getUserNameByToken(request); @@ -466,7 +466,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi if (dbName.equals("auto")) { gammaFileUtil.SetBaseInfo(phd, "RNAUTO"); } else if (dbName.equals("man")) { - gammaFileUtil.SetBaseInfo(phd, userName); + gammaFileUtil.SetBaseInfo(phd, analyst); } // 从数据库中读取phd其他相关信息 boolean bRet = getResultFromDB(dbName, userName, sampleId, phd, result); @@ -1459,13 +1459,13 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi } if (!tablePeaksList.get(j).isNetAreaB()) { - Af.add(Integer.valueOf(tablePeaksList.get(j).getLab())); + Af.add(Integer.valueOf(tablePeaksList.get(j).getLab())-1); } if (!tablePeaksList.get(j).isCentroid()) { - Cf.add(Integer.valueOf(tablePeaksList.get(j).getLab())); + Cf.add(Integer.valueOf(tablePeaksList.get(j).getLab())-1); } if (!tablePeaksList.get(j).isFwhmB()) { - Ff.add(Integer.valueOf(tablePeaksList.get(j).getLab())); + Ff.add(Integer.valueOf(tablePeaksList.get(j).getLab())-1); } } ObjectMapper mapper = new ObjectMapper(); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index d83553a6..d3abab0c 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.cache.Cache; +import io.swagger.models.auth.In; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.shiro.SecurityUtils; @@ -108,26 +109,20 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements @Autowired private IGardsHistogramSpectrumService histogramService; - @Autowired - private JdbcTemplate jdbcTemplate; - @Override - public Result getDBSearchList(HttpServletRequest request, boolean AllUsers, String dbName, String[] menuTypes) { + public Result getDBSearchList(HttpServletRequest request, boolean AllUsers) { Result result = new Result(); Map> map = new HashMap<>(); - List menuTypeList = Arrays.asList(menuTypes); - //查询谱对应的台站类型 - if (CollectionUtils.isEmpty(menuTypeList)){ - result.error500("The spectrum type cannot be empty"); - return result; - } - List stationTypes = sysDictService.findStationType(menuTypeList); - if (CollectionUtils.isEmpty(stationTypes)) { - result.error500("Please add the station type corresponding to the current system type in the data dictionary"); - return result; - } + //获取台站编码 + List stationCodes = new LinkedList<>(); + List detectorCodes = new LinkedList<>(); + //根据台站id查询台站名称 + Map stationMap = (Map)redisUtil.get("stationMap"); + //从redis中获取探测器信息 + Map detectorInfoMap = (Map)redisUtil.get("detectorsMap"); + //获取台站信息 List userStations = new LinkedList<>(); //如果没有勾选AllUsers if (Objects.nonNull(AllUsers) && !AllUsers){ @@ -137,23 +132,43 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements return result; } userStations = userTaskUtil.findUserStation(userName); + //判断当前用户在当天是否有排班任务的台站信息 + if (CollectionUtils.isNotEmpty(userStations)) { + if (CollectionUtils.isNotEmpty(stationMap)){ + for (Map.Entry entry:stationMap.entrySet()) { + if (userStations.contains(entry.getKey())) { + stationCodes.add(entry.getValue()); + } + } + } + if (CollectionUtils.isNotEmpty(detectorInfoMap)) { + for (Map.Entry entry:detectorInfoMap.entrySet()) { + if (String.valueOf(entry.getKey()).length() <= 3) { + if (userStations.contains(String.valueOf(entry.getKey()))) { + detectorCodes.add(entry.getValue()); + } + } else { + if (userStations.contains(String.valueOf(entry.getKey()).substring(0, 3))) { + detectorCodes.add(entry.getValue()); + } + } + } + } + } + } else { + if (CollectionUtils.isNotEmpty(stationMap)) { + for (Map.Entry entry: stationMap.entrySet()) { + stationCodes.add(entry.getValue()); + } + } + if (CollectionUtils.isNotEmpty(detectorInfoMap)) { + for (Map.Entry entry: detectorInfoMap.entrySet()) { + detectorCodes.add(entry.getValue()); + } + } } - if (dbName.equalsIgnoreCase("auto")){ - dbName = "RNAUTO.GARDS_ANALYSES"; - }else if (dbName.equalsIgnoreCase("man")){ - dbName = "RNMAN.GARDS_ANALYSES"; - }else { - result.error500("The database type does not exist"); - return result; - } - List sampleData = spectrumAnalysisMapper.getDBSearchList(dbName, stationTypes, userStations, AllUsers); - //获取台站编码 - List stationCodes = new LinkedList<>(); - List detectorCodes = new LinkedList<>(); - if (CollectionUtils.isNotEmpty(sampleData)){ - stationCodes = sampleData.stream().map(GardsSampleDataSpectrum::getStationName).distinct().collect(Collectors.toList()); - detectorCodes = sampleData.stream().map(GardsSampleDataSpectrum::getDetectorsName).distinct().collect(Collectors.toList()); - } + stationCodes = stationCodes.stream().sorted().collect(Collectors.toList()); + detectorCodes = detectorCodes.stream().sorted().collect(Collectors.toList()); map.put("stationCode", stationCodes); map.put("detectorCode", detectorCodes); result.setSuccess(true); @@ -191,9 +206,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements String tempDBName = dbName; if (dbName.equalsIgnoreCase("auto")){ dbName = "RNAUTO.GARDS_ANALYSES"; - }else if (dbName.equalsIgnoreCase("man")){ + } else if (dbName.equalsIgnoreCase("man")){ dbName = "RNMAN.GARDS_ANALYSES"; - }else { + } else { result.error500("The database type does not exist"); return result; } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java index 55584910..45d583f7 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java @@ -105,6 +105,12 @@ public class WebStatisticsController { return readLineUtil.readFtpFile(filePath,response); } + @GetMapping("downloadFile") + @ApiOperation("查看Radionuclide的文件") + public void downloadFile(@RequestParam Integer sampleId, HttpServletResponse response){ + gardsSampleDataWebService.downloadFile(sampleId, response); + } + @GetMapping("sohFile") @ApiOperation(value = "查看RMSSHO的文件",notes = "查看RMSSHO的文件") public Result sohFile(@RequestParam Integer sohId, diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java index f72fad43..5df1870d 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsBgEfficiencyPairsMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsBgEfficiencyPairs; +@Mapper public interface GardsBgEfficiencyPairsMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java index fac494db..9c107734 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsOrigMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsCalibrationPairsOrig; +@Mapper public interface GardsCalibrationPairsOrigMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java index 073419c8..834a9d30 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsHistogramMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsHistogram; +@Mapper public interface GardsHistogramMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java index 7a0d900e..b46872d0 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsRoiLimitsMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsRoiLimits; +@Mapper public interface GardsRoiLimitsMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java index 2652a089..b5903b28 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertLineMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsSampleCertLine; +@Mapper public interface GardsSampleCertLineMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java index 8bd77ef0..3df55a56 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleCertMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsSampleCert; +@Mapper public interface GardsSampleCertMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java index a84c4edf..b2a22057 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataWebMapper.java @@ -3,8 +3,10 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.entity.GardsSampleDataWeb; +import org.jeecg.modules.entity.vo.SpectrumFileRecord; import java.util.List; @@ -17,4 +19,12 @@ public interface GardsSampleDataWebMapper extends BaseMapper Page findParticulatePage(String dataType, String spectralQualifie, String startDate, String endDate, List stationIdList, Page page); + Integer getAnalysisID(@Param(value = "sampleId") Integer sampleId); + + SpectrumFileRecord getDBSpectrumFilePath(Integer sampleId, Integer analysisID); + + String getQCFilePath(String siteDetCode, String collectStartStr); + + Integer getSampleId(@Param(value = "filePathName") String filePathName); + } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java index 1e1ff9a5..12e07c25 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDescriptionMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsSampleDescription; +@Mapper public interface GardsSampleDescriptionMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java index 87c424fc..8ac8dc3d 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleRatiosMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsSampleRatios; +@Mapper public interface GardsSampleRatiosMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java index 2fafc897..c0ca6b56 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSpectrumMapper.java @@ -1,7 +1,9 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; import org.jeecg.modules.base.entity.original.GardsSpectrum; +@Mapper public interface GardsSpectrumMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml index ac6fd63e..df8797a6 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/xml/GardsSampleDataWebMapper.xml @@ -126,4 +126,44 @@ ORDER BY ACQUISITION_START DESC + + + + + + + + \ No newline at end of file diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java index bfe900d6..66d4af30 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataWebService.java @@ -1,6 +1,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; +import io.swagger.models.auth.In; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.GardsSampleDataWeb; @@ -33,6 +34,7 @@ public interface IGardsSampleDataWebService extends IService Result sampleInfo(Integer sampleId); + void downloadFile(Integer sampleId, HttpServletResponse response); GardsSampleDataWeb getOneSample(Integer sampleId); diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java index b70f9c96..eae41235 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java @@ -5,23 +5,26 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.ZipUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Workbook; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.properties.ParameterProperties; +import org.jeecg.common.properties.SpectrumPathProperties; +import org.jeecg.common.util.*; import org.jeecg.modules.base.enums.SampleFileHeader; -import org.jeecg.common.util.DateUtils; -import org.jeecg.common.util.ExportUtil; -import org.jeecg.common.util.ReadLineUtil; -import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.base.entity.original.*; import org.jeecg.modules.entity.GardsSampleDataWeb; import org.jeecg.modules.entity.data.*; +import org.jeecg.modules.entity.vo.SpectrumFileRecord; import org.jeecg.modules.mapper.*; import org.jeecg.modules.service.IGardsSampleDataWebService; import org.jeecgframework.poi.excel.ExcelExportUtil; @@ -30,8 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; +import java.io.*; +import java.net.URLEncoder; import java.text.ParseException; import java.util.*; import java.util.stream.Collectors; @@ -66,6 +69,12 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl Date: Tue, 14 Nov 2023 17:15:30 +0800 Subject: [PATCH 7/8] =?UTF-8?q?beta=E5=8A=9F=E8=83=BDRRR=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SpectrumAnalysisServiceImpl.java | 445 ++++++++++-------- 1 file changed, 243 insertions(+), 202 deletions(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index d3abab0c..1831012e 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -968,264 +968,305 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements if (Objects.nonNull(detSourceData)) { information.setDet_measid_name(detSourceData.measurement_id); } - strBuffer.append("CNL06 GENERATED REPORT").append("\n"); - strBuffer.append("REVIEWED RADIONUCLIDE REPORT").append("\n"); - strBuffer.append("(Noble Gas Version)").append("\n"); - strBuffer.append("Creation Date "+DateUtils.formatDate(new Date(), "yyyy/MM/dd-HH:mm:ss")).append("\n"); - strBuffer.append("\n"); - strBuffer.append("#FILE INFORMATION").append("\n"); - strBuffer.append(" SampleMeasID: ").append(information.getMeasurementID()).append("\n"); - strBuffer.append(" GASBKMeasID: ").append(information.getGasBkgdMeasurementID()).append("\n"); - strBuffer.append(" SRID: ").append(information.getSampleRefId()).append("\n"); - strBuffer.append(" Detector Type: ").append("3D b-g").append("\n"); - strBuffer.append("\n"); - strBuffer.append("#COLLECTION INFORMATION").append("\n"); - strBuffer.append(" Station CODE: ").append(information.getSit_det_code()).append("\n"); - strBuffer.append(" Detector CODE: ").append(information.getDetect_code()).append("\n"); - strBuffer.append(" Collection Start: ").append(DateUtils.formatDate(information.getCollect_start(), "yyyy/MM/dd HH:mm:ss")).append("\n"); - strBuffer.append(" Collection Stop: ").append(DateUtils.formatDate(information.getCollect_stop(), "yyyy/MM/dd HH:mm:ss")).append("\n"); - strBuffer.append(" Collection TIME(h): ").append((information.getCollect_stop().getTime()/1000-information.getCollect_start().getTime()/1000)/3600).append("\n"); - strBuffer.append(" Air Volume[cm3]: ").append(information.getS_xe_stable_volume()).append("\n"); - strBuffer.append(" Xe Volume[cm3]: ").append(information.getS_volume_of_Xe()).append("\n"); - strBuffer.append("\n"); - strBuffer.append("#ACQUISITION INFORMATION").append("\n"); - strBuffer.append(" Acquisition Start: ").append(DateUtils.formatDate(information.getAcquisition_start(), "yyyy/MM/dd HH:mm:ss")).append("\n"); - strBuffer.append(" Acq Real Time(s): ").append(information.getAcquisition_real_sec()).append("\n"); - strBuffer.append(" Acq Live Time: ").append(information.getAcquisition_live_sec()).append("\n"); - strBuffer.append("\n"); - strBuffer.append("#SOFTWARE").append("\n"); - strBuffer.append(" version: ").append("1.0.1").append("\n"); - strBuffer.append("\n"); - strBuffer.append("#SAMPLE Old CALIBRATION").append("\n"); - strBuffer.append(" Old Beta Old Gamma ").append("\n"); - if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) { - strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)))); - } else { - strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x "); - } - if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) { - strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)))); - strBuffer.append("\n"); - } else { - strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x "); - strBuffer.append("\n"); - } - if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) { - strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)))); - } else { - strBuffer.append(" E(x) = (?1)+(?2)*x+(?3)x*x "); - } - if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) { - strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)))); - strBuffer.append("\n"); - } else { - strBuffer.append(" E(x) = (?1)+(?2)*x+(?3)x*x "); - strBuffer.append("\n"); - } - strBuffer.append("\n"); - strBuffer.append("#SAMPLE New CALIBRATION").append("\n"); - strBuffer.append(" New Beta New Gamma ").append("\n"); - strBuffer.append(" CH(x) = ("+ (Objects.isNull(betaCalibrationParamS.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff1()))) - +")+("+ (Objects.isNull(betaCalibrationParamS.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff2()))) - +")*x+("+ (Objects.isNull(betaCalibrationParamS.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff3()))) - +")x*x ") - .append(" CH(x) = ("+ (Objects.isNull(gammaCalibrationParamS.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff1()))) - +")+("+ (Objects.isNull(gammaCalibrationParamS.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff2()))) - +")*x+("+ (Objects.isNull(gammaCalibrationParamS.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff3()))) - +")x*x ").append("\n"); - strBuffer.append(" E(x) = ("+ (Objects.isNull(betaCalibrationParamES.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff1()))) - +")+("+ (Objects.isNull(betaCalibrationParamES.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff2()))) - +")*x+("+ (Objects.isNull(betaCalibrationParamES.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff3()))) - +")x*x ") - .append(" E(x) = ("+ (Objects.isNull(gammaCalibrationParamES.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff1()))) - +")+("+ (Objects.isNull(gammaCalibrationParamES.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff2()))) - +")*x+("+ (Objects.isNull(gammaCalibrationParamES.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff3()))) - +")x*x").append("\n"); - strBuffer.append("\n"); - strBuffer.append("#SAMPLE: LIMITS PER ROI").append("\n"); - strBuffer.append(" Roi Beta Gamma ").append("\n"); + strBuffer.append(titleFormat("%sCNL06 GENERATED REPORT%s", 60, StringPool.SPACE, StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(titleFormat("%sREVIEWED RADIONUCLIDE REPORT%s", 57, StringPool.SPACE, StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(titleFormat("%s(Noble Gas Version)%s", 61, StringPool.SPACE, StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(titleFormat("%sCreation Date "+DateUtils.formatDate(new Date(), "yyyy/MM/dd-HH:mm:ss")+"%s", 54, StringPool.SPACE, StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#FILE INFORMATION"); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sSampleMeasID:%-38s%s", StringPool.SPACE, StringPool.SPACE, information.getMeasurementID())); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sGASBKMeasID:%-39s%s", StringPool.SPACE, StringPool.SPACE, information.getGasBkgdMeasurementID())); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sSRID:%-46s%s", StringPool.SPACE, StringPool.SPACE, information.getSampleRefId())); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sDetector Type:%-37s%s", StringPool.SPACE, StringPool.SPACE, "3D b-g")); + strBuffer.append(System.lineSeparator()); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#COLLECTION INFORMATION"); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sStation CODE:%-38s%s", StringPool.SPACE, StringPool.SPACE, information.getSit_det_code())); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sDetector CODE:%-37s%s", StringPool.SPACE, StringPool.SPACE, information.getDetect_code())); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sCollection Start:%-34s%s", StringPool.SPACE, StringPool.SPACE, DateUtils.formatDate(information.getCollect_start(), "yyyy/MM/dd HH:mm:ss"))); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sCollection Stop:%-35s%s", StringPool.SPACE, StringPool.SPACE, DateUtils.formatDate(information.getCollect_stop(), "yyyy/MM/dd HH:mm:ss"))); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sCollection TIME(h):%-32s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf((information.getCollect_stop().getTime()/1000-information.getCollect_start().getTime()/1000)/3600))); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sAir Volume[cm3]:%-35s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(information.getS_xe_stable_volume()))); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sXe Volume[cm3]:%-36s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(information.getS_volume_of_Xe()))); + strBuffer.append(System.lineSeparator()); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#ACQUISITION INFORMATION"); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sAcquisition Start:%-33s%s", StringPool.SPACE, StringPool.SPACE, DateUtils.formatDate(information.getAcquisition_start(), "yyyy/MM/dd HH:mm:ss"))); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sAcq Real Time(s):%-34s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(information.getAcquisition_real_sec()))); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sAcq Live Time:%-37s%s", StringPool.SPACE, StringPool.SPACE, String.valueOf(information.getAcquisition_live_sec()))); + strBuffer.append(System.lineSeparator()); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#SOFTWARE"); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sversion:%-43s%s", StringPool.SPACE, StringPool.SPACE, "1.0.1")); + strBuffer.append(System.lineSeparator()); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#SAMPLE Old CALIBRATION"); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sOld Beta%-43sOld Gamma%-42s", StringPool.SPACE, StringPool.SPACE, StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sCH(x) = (%s)+(%s)*x+(%s)x*x%-24sCH(x) = (%s)+(%s)*x+(%s)x*x%-24s", StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)), + StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), + NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)), StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sE(x) = (%s)+(%s)*x+(%s)x*x%-24sE(x) = (%s)+(%s)*x+(%s)x*x%-24s", StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)), + StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), + NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)), StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#SAMPLE New CALIBRATION"); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sNew Beta%-43sNew Gamma%-42s", StringPool.SPACE, StringPool.SPACE, StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sCH(x) = (%s)+(%s)*x+(%s)x*x%-24sCH(x) = (%s)+(%s)*x+(%s)x*x%-24s", StringPool.SPACE, + (Objects.isNull(betaCalibrationParamS.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff1()))), + (Objects.isNull(betaCalibrationParamS.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff2()))), + (Objects.isNull(betaCalibrationParamS.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff3()))), + StringPool.SPACE, + (Objects.isNull(gammaCalibrationParamS.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff1()))), + (Objects.isNull(gammaCalibrationParamS.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff2()))), + (Objects.isNull(gammaCalibrationParamS.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff3()))), + StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sE(x) = (%s)+(%s)*x+(%s)x*x%-24sE(x) = (%s)+(%s)*x+(%s)x*x%-24s", StringPool.SPACE, + (Objects.isNull(betaCalibrationParamES.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff1()))), + (Objects.isNull(betaCalibrationParamES.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff2()))), + (Objects.isNull(betaCalibrationParamES.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff3()))), + StringPool.SPACE, + (Objects.isNull(gammaCalibrationParamES.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff1()))), + (Objects.isNull(gammaCalibrationParamES.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff2()))), + (Objects.isNull(gammaCalibrationParamES.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff3()))), + StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#SAMPLE: LIMITS PER ROI"); + strBuffer.append(System.lineSeparator()); + String limitRoi = "%s%-51s%-51s%-12s"; + strBuffer.append(rowFormat(limitRoi, StringPool.SPACE, "Roi", "Beta", "Gamma")); + strBuffer.append(System.lineSeparator()); if (CollectionUtils.isNotEmpty(roiChannelsSpectrumsSample)) { for (GardsROIChannelsSpectrum channelsSpectrum:roiChannelsSpectrumsSample) { - strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+" "+channelsSpectrum.getBChanStart()+" to "+channelsSpectrum.getBChanStop()+" "+channelsSpectrum.getGChanStart()+" to "+channelsSpectrum.getGChanStop()).append("\n"); + strBuffer.append(rowFormat(limitRoi, StringPool.SPACE, String.valueOf(channelsSpectrum.getRoi()), channelsSpectrum.getBChanStart()+" to "+channelsSpectrum.getBChanStop(), channelsSpectrum.getGChanStart()+" to "+channelsSpectrum.getGChanStop())); + strBuffer.append(System.lineSeparator()); } } - strBuffer.append("\n"); - strBuffer.append("#DET Old CALIBRATION").append("\n"); - strBuffer.append(" Old Beta Old Gamma ").append("\n"); - if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) { - strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)))); - } else { - strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x "); - } - if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) { - strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)))); - strBuffer.append("\n"); - } else { - strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x "); - strBuffer.append("\n"); - } - if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) { - strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)))); - } else { - strBuffer.append(" E(x) = (?1)+(?2)*x+(?3)x*x "); - } - if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) { - strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)))); - strBuffer.append("\n"); - } else { - strBuffer.append(" E(x) = (?1)+(?2)*x+(?3)x*x "); - strBuffer.append("\n"); - } - strBuffer.append("\n"); - strBuffer.append("#DET New CALIBRATION").append("\n"); - strBuffer.append(" New Beta New Gamma ").append("\n"); - strBuffer.append(" CH(x) = ("+ (Objects.isNull(betaCalibrationParamD.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff1()))) - +")+("+ (Objects.isNull(betaCalibrationParamD.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff2()))) - +")*x+("+ (Objects.isNull(betaCalibrationParamD.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff3()))) - +")x*x ") - .append(" CH(x) = ("+ (Objects.isNull(gammaCalibrationParamD.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff1()))) - +")+("+ (Objects.isNull(gammaCalibrationParamD.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff2()))) - +")*x+("+ (Objects.isNull(gammaCalibrationParamD.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff3()))) - +")x*x").append("\n"); - strBuffer.append(" E(x) = ("+ (Objects.isNull(betaCalibrationParamED.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff1()))) - +")+("+ (Objects.isNull(betaCalibrationParamED.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff2()))) - +")*x+("+ (Objects.isNull(betaCalibrationParamED.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff3()))) - +")x*x ") - .append(" E(x) = ("+ (Objects.isNull(gammaCalibrationParamED.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff1()))) - +")+("+ (Objects.isNull(gammaCalibrationParamED.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff2()))) - +")*x+("+ (Objects.isNull(gammaCalibrationParamED.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff3()))) - +")x*x").append("\n"); - strBuffer.append("\n"); - strBuffer.append("#DET: LIMITS PER ROI").append("\n"); - strBuffer.append(" Roi Beta Gamma ").append("\n"); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#DET Old CALIBRATION"); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sOld Beta%-43sOld Gamma%-42s", StringPool.SPACE, StringPool.SPACE, StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sCH(x) = (%s)+(%s)*x+(%s)x*x%-24sCH(x) = (%s)+(%s)*x+(%s)x*x%-24s", StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)), + StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)), + StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sE(x) = (%s)+(%s)*x+(%s)x*x%-24sE(x) = (%s)+(%s)*x+(%s)x*x%-24s", StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)), + StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)), + StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#DET New CALIBRATION"); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sNew Beta%-43sNew Gamma%-42s", StringPool.SPACE, StringPool.SPACE, StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sCH(x) = (%s)+(%s)*x+(%s)x*x%-24sCH(x) = (%s)+(%s)*x+(%s)x*x%-24s", StringPool.SPACE, + (Objects.isNull(betaCalibrationParamD.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff1()))), + (Objects.isNull(betaCalibrationParamD.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff2()))), + (Objects.isNull(betaCalibrationParamD.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamD.getCoeff3()))), + StringPool.SPACE, + (Objects.isNull(gammaCalibrationParamD.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff1()))), + (Objects.isNull(gammaCalibrationParamD.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff2()))), + (Objects.isNull(gammaCalibrationParamD.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamD.getCoeff3()))), + StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sE(x) = (%s)+(%s)*x+(%s)x*x%-24sE(x) = (%s)+(%s)*x+(%s)x*x%-24s", StringPool.SPACE, + (Objects.isNull(betaCalibrationParamED.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff1()))), + (Objects.isNull(betaCalibrationParamED.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff2()))), + (Objects.isNull(betaCalibrationParamED.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamED.getCoeff3()))), + StringPool.SPACE, + (Objects.isNull(gammaCalibrationParamED.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff1()))), + (Objects.isNull(gammaCalibrationParamED.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff2()))), + (Objects.isNull(gammaCalibrationParamED.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamED.getCoeff3()))), + StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#DET: LIMITS PER ROI"); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat(limitRoi, StringPool.SPACE, "Roi", "Beta", "Gamma")); + strBuffer.append(System.lineSeparator()); if (CollectionUtils.isNotEmpty(roiChannelsSpectrumsDet)) { for (GardsROIChannelsSpectrum channelsSpectrum:roiChannelsSpectrumsDet) { - strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+" "+channelsSpectrum.getBChanStart()+" to "+channelsSpectrum.getBChanStop()+" "+channelsSpectrum.getGChanStart()+" to "+channelsSpectrum.getGChanStop()).append("\n"); + strBuffer.append(rowFormat(limitRoi, StringPool.SPACE, String.valueOf(channelsSpectrum.getRoi()), channelsSpectrum.getBChanStart()+" to "+channelsSpectrum.getBChanStop(), channelsSpectrum.getGChanStart()+" to "+channelsSpectrum.getGChanStop())); + strBuffer.append(System.lineSeparator()); } } - strBuffer.append("\n"); - strBuffer.append("#GAS Old CALIBRATION").append("\n"); - strBuffer.append(" Old Beta Old Gamma ").append("\n"); - if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaToUiOld())) { - strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)))); - } else { - strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x "); - } - if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaToUiOld())) { - strBuffer.append(rowFormat(" CH(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)))); - strBuffer.append("\n"); - } else { - strBuffer.append(" CH(x) = (?1)+(?2)*x+(?3)x*x "); - strBuffer.append("\n"); - } - if (CollectionUtils.isNotEmpty(betaDataFile.getBetaFittingParaOld())) { - strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)))); - } else { - strBuffer.append(" E(x) = (?1)+(?2)*x+(?3)x*x "); - } - if (CollectionUtils.isNotEmpty(betaDataFile.getGammaFittingParaOld())) { - strBuffer.append(rowFormat(" E(x) = (%s)+(%s)*x+(%s)x*x ", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)))); - strBuffer.append("\n"); - } else { - strBuffer.append(" E(x) = (?1)+(?2)*x+(?3)x*x "); - strBuffer.append("\n"); - } - strBuffer.append("\n"); - strBuffer.append("#GAS New CALIBRATION").append("\n"); - strBuffer.append(" New Beta New Gamma ").append("\n"); - strBuffer.append(" CH(x) = ("+ (Objects.isNull(betaCalibrationParamG.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff1()))) - +")+("+ (Objects.isNull(betaCalibrationParamG.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff2()))) - +")*x+("+ (Objects.isNull(betaCalibrationParamG.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff3()))) - +")x*x ") - .append(" CH(x) = ("+ (Objects.isNull(gammaCalibrationParamG.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff1()))) - +")+("+ (Objects.isNull(gammaCalibrationParamG.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff2()))) - +")*x+("+ (Objects.isNull(gammaCalibrationParamG.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff3()))) - +")x*x").append("\n"); - strBuffer.append(" E(x) = ("+ (Objects.isNull(betaCalibrationParamEG.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff1()))) - +")+("+ (Objects.isNull(betaCalibrationParamEG.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff2()))) - +")*x+("+ (Objects.isNull(betaCalibrationParamEG.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff3()))) - +")x*x ") - .append(" E(x) = ("+ (Objects.isNull(gammaCalibrationParamEG.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff1()))) - +")+("+ (Objects.isNull(gammaCalibrationParamEG.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff2()))) - +")*x+("+ (Objects.isNull(gammaCalibrationParamEG.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff3()))) - +")x*x").append("\n"); - strBuffer.append("\n"); - strBuffer.append("#GAS: LIMITS PER ROI").append("\n"); - strBuffer.append(" Roi Beta Gamma ").append("\n"); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#GAS Old CALIBRATION"); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sOld Beta%-43sOld Gamma%-42s", StringPool.SPACE, StringPool.SPACE, StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sCH(x) = (%s)+(%s)*x+(%s)x*x%-24sCH(x) = (%s)+(%s)*x+(%s)x*x%-24s", StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)), + StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)), + StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sE(x) = (%s)+(%s)*x+(%s)x*x%-24sE(x) = (%s)+(%s)*x+(%s)x*x%-24s", StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)), + StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)), + StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#GAS New CALIBRATION"); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sNew Beta%-43sNew Gamma%-42s", StringPool.SPACE, StringPool.SPACE, StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sCH(x) = (%s)+(%s)*x+(%s)x*x%-24sCH(x) = (%s)+(%s)*x+(%s)x*x%-24s", StringPool.SPACE, + (Objects.isNull(betaCalibrationParamG.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff1()))), + (Objects.isNull(betaCalibrationParamG.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff2()))), + (Objects.isNull(betaCalibrationParamG.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamG.getCoeff3()))), + StringPool.SPACE, + (Objects.isNull(gammaCalibrationParamG.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff1()))), + (Objects.isNull(gammaCalibrationParamG.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff2()))), + (Objects.isNull(gammaCalibrationParamG.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamG.getCoeff3()))), + StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat("%sE(x) = (%s)+(%s)*x+(%s)x*x%-24sE(x) = (%s)+(%s)*x+(%s)x*x%-24s", StringPool.SPACE, + (Objects.isNull(betaCalibrationParamEG.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff1()))), + (Objects.isNull(betaCalibrationParamEG.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff2()))), + (Objects.isNull(betaCalibrationParamEG.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamEG.getCoeff3()))), + StringPool.SPACE, + (Objects.isNull(gammaCalibrationParamEG.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff1()))), + (Objects.isNull(gammaCalibrationParamEG.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff2()))), + (Objects.isNull(gammaCalibrationParamEG.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamEG.getCoeff3()))), + StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#GAS: LIMITS PER ROI"); + strBuffer.append(System.lineSeparator()); + strBuffer.append(rowFormat(limitRoi, StringPool.SPACE, "Roi", "Beta", "Gamma")); + strBuffer.append(System.lineSeparator()); if (CollectionUtils.isNotEmpty(roiChannelsSpectrumsGas)) { for (GardsROIChannelsSpectrum channelsSpectrum:roiChannelsSpectrumsGas) { - strBuffer.append(StringPool.SPACE+channelsSpectrum.getRoi()+" "+channelsSpectrum.getBChanStart()+" to "+channelsSpectrum.getBChanStop()+" "+channelsSpectrum.getGChanStart()+" to "+channelsSpectrum.getGChanStop()).append("\n"); + strBuffer.append(rowFormat(limitRoi, StringPool.SPACE, String.valueOf(channelsSpectrum.getRoi()), channelsSpectrum.getBChanStart()+" to "+channelsSpectrum.getBChanStop(), channelsSpectrum.getGChanStart()+" to "+channelsSpectrum.getGChanStop())); + strBuffer.append(System.lineSeparator()); } } - strBuffer.append("\n"); - strBuffer.append("#GROSS COUNTS PER ROI").append("\n"); - strBuffer.append(" Roi Sample GasBkgnd DetBkgnd ").append("\n"); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#GROSS COUNTS PER ROI"); + strBuffer.append(System.lineSeparator()); + String grossRoi = "%s%-51s%-51s%-13s%-15s"; + strBuffer.append(rowFormat(grossRoi, StringPool.SPACE, "Roi", "Sample", "GasBkgnd", "DetBkgnd")); + strBuffer.append(System.lineSeparator()); if (CollectionUtils.isNotEmpty(resultsSpectrums)) { for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums) { - strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+resultsSpectrum.getSGross()+" "+resultsSpectrum.getGGross()+" "+resultsSpectrum.getBGross()+"").append("\n"); + strBuffer.append(rowFormat(grossRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), String.valueOf(resultsSpectrum.getSGross()), String.valueOf(resultsSpectrum.getGGross()), String.valueOf(resultsSpectrum.getBGross()))); + strBuffer.append(System.lineSeparator()); } } - strBuffer.append("\n"); - strBuffer.append("#NET COUNTS AND LC PER ROI").append("\n"); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#NET COUNTS AND LC PER ROI"); + strBuffer.append(System.lineSeparator()); + String netRoi = "%s%-51s%-51s%-13s"; if (betaDataFile.isBProcessed()) { if (Objects.isNull(resultsSpectrums.get(0).getLcCts())) { - strBuffer.append(" Roi Net count ").append("\n"); + strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); if (CollectionUtils.isNotEmpty(resultsSpectrums)) { for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){ - strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNetErr()))).append("\n"); + strBuffer.append(rowFormat(netRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNetErr())), StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); } } } else { - strBuffer.append(" Roi Net count LC ").append("\n"); + strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", "LC")); + strBuffer.append(System.lineSeparator()); if (CollectionUtils.isNotEmpty(resultsSpectrums)) { for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){ - strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNetErr()))+ " " + NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLcCts()))).append("\n"); + strBuffer.append(rowFormat(netRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNetErr())), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLcCts())))); + strBuffer.append(System.lineSeparator()); } } } } else { if (Objects.isNull(resultsSpectrums.get(0).getLcCts())) { - strBuffer.append(" Roi Net count ").append("\n"); + strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); if (CollectionUtils.isNotEmpty(resultsSpectrums)) { for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){ - strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(Math.sqrt(resultsSpectrum.getNetErr())))).append("\n"); + strBuffer.append(rowFormat(netRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(Math.sqrt(resultsSpectrum.getNetErr()))), StringPool.SPACE)); + strBuffer.append(System.lineSeparator()); } } } else { - strBuffer.append(" Roi Net count LC ").append("\n"); + strBuffer.append(rowFormat(netRoi, StringPool.SPACE, "Roi", "Net count", "LC")); + strBuffer.append(System.lineSeparator()); if (CollectionUtils.isNotEmpty(resultsSpectrums)) { for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){ - strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(Math.sqrt(resultsSpectrum.getNetErr())))+ " " + NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLcCts()))).append("\n"); + strBuffer.append(rowFormat(netRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getNet()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(Math.sqrt(resultsSpectrum.getNetErr()))), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLcCts())))); + strBuffer.append(System.lineSeparator()); } } } } - strBuffer.append("\n"); - strBuffer.append("#CONCENTRATION AND LC PER ROI").append("\n"); - strBuffer.append(" Roi Conc(mBq/m3) LC(mBq/m3) MDC(mBq/m3): ").append("\n"); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#CONCENTRATION AND LC PER ROI"); + strBuffer.append(System.lineSeparator()); + String conLcRoi = "%s%-51s%-51s%-13s%-15s"; + strBuffer.append(rowFormat(conLcRoi, StringPool.SPACE, "Roi", "Conc(mBq/m3)", "LC(mBq/m3)", "MDC(mBq/m3):")); + strBuffer.append(System.lineSeparator()); if (betaDataFile.isBProcessed()) { if (CollectionUtils.isNotEmpty(resultsSpectrums)) { for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){ - strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConc()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConcErr()))+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLc()))+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getMdc()))).append("\n"); + strBuffer.append(rowFormat(conLcRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConc()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConcErr())), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLc())), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getMdc())))); + strBuffer.append(System.lineSeparator()); } } } else { if (CollectionUtils.isNotEmpty(resultsSpectrums)) { for (GardsROIResultsSpectrum resultsSpectrum:resultsSpectrums){ - strBuffer.append(StringPool.SPACE+resultsSpectrum.getRoi()+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConcErr()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConcErr()))+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLc()))+" "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getMdc()))).append("\n"); + strBuffer.append(rowFormat(conLcRoi, StringPool.SPACE, String.valueOf(resultsSpectrum.getRoi()), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConcErr()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getConcErr())), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getLc())), NumberFormatUtil.numberSixLen(String.valueOf(resultsSpectrum.getMdc())))); + strBuffer.append(System.lineSeparator()); } } } - - strBuffer.append("\n"); - strBuffer.append("#RESULT SUMMARY").append("\n"); - strBuffer.append(" Nuclide Name Conc LC MDC NID Flag ").append("\n"); + strBuffer.append(System.lineSeparator()); + strBuffer.append("#RESULT SUMMARY"); + strBuffer.append(System.lineSeparator()); + String resultSum = "%s%-51s%-51s%-13s%-15s%-11s"; + strBuffer.append(rowFormat(resultSum, StringPool.SPACE, "Nuclide Name", "Conc", "LC", "MDC", "NID Flag")); + strBuffer.append(System.lineSeparator()); if (CollectionUtils.isNotEmpty(xeResultsSpectrums)) { for (GardsXeResultsSpectrum xeResultsSpectrum:xeResultsSpectrums) { - strBuffer.append(StringPool.SPACE+xeResultsSpectrum.getNuclideName()+" "+NumberFormatUtil.numberSixLen(String.valueOf(xeResultsSpectrum.getConc()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(xeResultsSpectrum.getConcErr()))+" "+NumberFormatUtil.numberSixLen(String.valueOf(xeResultsSpectrum.getLc()))+" "+NumberFormatUtil.numberSixLen(String.valueOf(xeResultsSpectrum.getMdc()))+" "+xeResultsSpectrum.getNidFlag()).append("\n"); + strBuffer.append(rowFormat(resultSum, StringPool.SPACE, xeResultsSpectrum.getNuclideName(), NumberFormatUtil.numberSixLen(String.valueOf(xeResultsSpectrum.getConc()))+" +/- "+NumberFormatUtil.numberSixLen(String.valueOf(xeResultsSpectrum.getConcErr())), NumberFormatUtil.numberSixLen(String.valueOf(xeResultsSpectrum.getLc())), NumberFormatUtil.numberSixLen(String.valueOf(xeResultsSpectrum.getMdc())), String.valueOf(xeResultsSpectrum.getNidFlag()))); + strBuffer.append(System.lineSeparator()); } } - strBuffer.append("\n"); + strBuffer.append(System.lineSeparator()); } catch (ParseException e) { throw new RuntimeException(e); } From 65c15847b0f7ee42f384db3e4f996a6554a1ef65 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Tue, 14 Nov 2023 18:06:58 +0800 Subject: [PATCH 8/8] =?UTF-8?q?web=E6=A8=A1=E5=9D=97=E4=B8=8B=E8=BD=BDzip?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8A=9F=E8=83=BD=E5=85=B6=E4=BB=96=E8=B0=B1?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/common/util/FTPUtil.java | 2 +- .../impl/GardsSampleDataWebServiceImpl.java | 62 +++++++++++-------- 2 files changed, 38 insertions(+), 26 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java index 2891313e..c20fb28a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java @@ -167,9 +167,9 @@ public class FTPUtil { response.reset(); //设置响应类型 response.setContentType("application/download"); + response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); //解决中文不能生成文件 response.setHeader("Content-Disposition", "attachment; fileName=" + URLEncoder.encode(fileName,"UTF-8")); - response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); //获取输出流 out = response.getOutputStream(); //声明一个长度参数 diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java index eae41235..a861f26f 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataWebServiceImpl.java @@ -191,9 +191,11 @@ public class GardsSampleDataWebServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(GardsSampleDataWeb::getSampleId,sampleId); - return Optional.ofNullable(getOne(wrapper)) - .orElse(new GardsSampleDataWeb()); + return Optional.ofNullable(getOne(wrapper)).orElse(new GardsSampleDataWeb()); } @Override