From fc1ff16fac475d70f84d03841101a77ac346036a Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Fri, 2 Feb 2024 17:27:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=B4=E6=97=B6=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6=EF=BC=8C=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=A0=E9=99=A4=20=E4=BA=BA=E5=B7=A5?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E6=A8=A1=E5=9D=97beta=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=85=AC=E5=BC=8F=E5=8F=82=E6=95=B0=E5=AD=98=E5=82=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GammaServiceImpl.java | 4 ++ .../impl/SpectrumAnalysisServiceImpl.java | 68 +++++++++++-------- 2 files changed, 44 insertions(+), 28 deletions(-) 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 7e874087..fdafe929 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 @@ -5129,6 +5129,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi ftpUtil.saveFile(logPathName, logFileName, in); } catch (FileNotFoundException e) { throw new RuntimeException(e); + } finally { + logFile.delete(); } } { @@ -5141,6 +5143,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi ftpUtil.saveFile(rptPathName, rptFileName, in); } catch (FileNotFoundException e) { throw new RuntimeException(e); + } finally { + rptFile.delete(); } } List paths = new LinkedList<>(); 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 49071139..03765e22 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 @@ -564,8 +564,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements xeData.setConcErr(Double.valueOf(NumberFormatUtil.numberSixLen(String.valueOf(xeData.getConcErr())))); } } - betaDataFile.setGammaCalibrationSpectrumList(gammaCalibrationSpectrumList); - betaDataFile.setBetaCalibrationSpectrumList(betaCalibrationSpectrumList); + betaDataFile.setGammaCalibrationSpectrumEList(gammaCalibrationSpectrumList); + betaDataFile.setBetaCalibrationSpectrumEList(betaCalibrationSpectrumList); betaDataFile.setRoiChannelsSpectrumList(roiChannelsSpectrumList); betaDataFile.setRoiResultsSpectrumList(roiResultsSpectrumList); betaDataFile.setGammaCalibrationPairsList(gammaCalibrationPairsList); @@ -1089,16 +1089,24 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements strBuffer.append(rowFormat("%sOld Beta%-43sOld Gamma%-42s", StringPool.SPACE, StringPool.SPACE, StringPool.SPACE)); strBuffer.append(System.lineSeparator()); //拼接历史计算公式 CH - String oldBetaSampleCHStr = rowFormat("%sCH(x) = (%s)+(%s)*x+(%s)x*x", StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), - NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2))); - String oldGammaSampleCHStr = rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x%-24s", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), + String oldBetaSampleCHStr = rowFormat("%sCH(x) = (%s)+(%s)*x+(%s)x*x", StringPool.SPACE, + NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)), + NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2))); + String oldGammaSampleCHStr = rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x%-24s", + NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)), StringPool.SPACE); strBuffer.append(rowFormat("%s%-"+(52-oldBetaSampleCHStr.length())+"s%s", oldBetaSampleCHStr, StringPool.SPACE, oldGammaSampleCHStr)); strBuffer.append(System.lineSeparator()); //拼接历史计算公式 E - String oldBetaSampleEStr = rowFormat("%sE(x) = (%s)+(%s)*x+(%s)x*x", StringPool.SPACE, NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), - NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2))); - String oldGammaSampleEStr = rowFormat("E(x) = (%s)+(%s)*x+(%s)x*x%-24s", NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), + String oldBetaSampleEStr = rowFormat("%sE(x) = (%s)+(%s)*x+(%s)x*x", StringPool.SPACE, + NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)), + NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2))); + String oldGammaSampleEStr = rowFormat("E(x) = (%s)+(%s)*x+(%s)x*x%-24s", + NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)), + NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)), NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)), StringPool.SPACE); strBuffer.append(rowFormat("%s%-"+(52-oldBetaSampleEStr.length())+"s%s", oldBetaSampleEStr, StringPool.SPACE, oldGammaSampleEStr)); strBuffer.append(System.lineSeparator()); @@ -1112,7 +1120,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements (Objects.isNull(betaCalibrationParamES.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff1()))), (Objects.isNull(betaCalibrationParamES.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff2()))), (Objects.isNull(betaCalibrationParamES.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamES.getCoeff3())))); - String newGammaSampleCHStr = rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x%-24s", (Objects.isNull(gammaCalibrationParamES.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff1()))), + String newGammaSampleCHStr = rowFormat("CH(x) = (%s)+(%s)*x+(%s)x*x%-24s", + (Objects.isNull(gammaCalibrationParamES.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff1()))), (Objects.isNull(gammaCalibrationParamES.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff2()))), (Objects.isNull(gammaCalibrationParamES.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaToUiOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamES.getCoeff3()))), StringPool.SPACE); @@ -1123,7 +1132,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements (Objects.isNull(betaCalibrationParamS.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff1()))), (Objects.isNull(betaCalibrationParamS.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff2()))), (Objects.isNull(betaCalibrationParamS.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getBetaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(betaCalibrationParamS.getCoeff3())))); - String newGammaSampleEStr = rowFormat("E(x) = (%s)+(%s)*x+(%s)x*x%-24s", (Objects.isNull(gammaCalibrationParamS.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff1()))), + String newGammaSampleEStr = rowFormat("E(x) = (%s)+(%s)*x+(%s)x*x%-24s", + (Objects.isNull(gammaCalibrationParamS.getCoeff1())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(0)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff1()))), (Objects.isNull(gammaCalibrationParamS.getCoeff2())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(1)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff2()))), (Objects.isNull(gammaCalibrationParamS.getCoeff3())?NumberFormatUtil.numberSixLen(betaDataFile.getGammaFittingParaOld().get(2)):NumberFormatUtil.numberSixLen(String.valueOf(gammaCalibrationParamS.getCoeff3()))), StringPool.SPACE); @@ -4073,6 +4083,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements ftpUtil.saveFile(rptPathName, rptFileName, in); } catch (FileNotFoundException e) { throw new RuntimeException(e); + } finally { + rptFile.delete(); } } } catch (FileNotFoundException e) { @@ -5391,9 +5403,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } else { GardsCalibrationSpectrum gammaCalibrationS = new GardsCalibrationSpectrum(); gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType()); - gammaCalibrationS.setCoeff1(bgAnalyseResult.s_g_fitting_c_e.get(0)); - gammaCalibrationS.setCoeff2(bgAnalyseResult.s_g_fitting_c_e.get(1)); - gammaCalibrationS.setCoeff3(bgAnalyseResult.s_g_fitting_c_e.get(2)); + gammaCalibrationS.setCoeff1(bgAnalyseResult.s_g_fitting_e_c.get(0)); + gammaCalibrationS.setCoeff2(bgAnalyseResult.s_g_fitting_e_c.get(1)); + gammaCalibrationS.setCoeff3(bgAnalyseResult.s_g_fitting_e_c.get(2)); gammaCalibrationSpectrumList.add(gammaCalibrationS); } if (anlyseResultIn.isBGammaEnergyValidGas()) { @@ -5406,9 +5418,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } else { GardsCalibrationSpectrum gammaCalibrationG = new GardsCalibrationSpectrum(); gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType()); - gammaCalibrationG.setCoeff1(bgAnalyseResult.g_g_fitting_c_e.get(0)); - gammaCalibrationG.setCoeff2(bgAnalyseResult.g_g_fitting_c_e.get(1)); - gammaCalibrationG.setCoeff3(bgAnalyseResult.g_g_fitting_c_e.get(2)); + gammaCalibrationG.setCoeff1(bgAnalyseResult.g_g_fitting_e_c.get(0)); + gammaCalibrationG.setCoeff2(bgAnalyseResult.g_g_fitting_e_c.get(1)); + gammaCalibrationG.setCoeff3(bgAnalyseResult.g_g_fitting_e_c.get(2)); gammaCalibrationSpectrumList.add(gammaCalibrationG); } if (anlyseResultIn.isBGammaEnergyValidDet()) { @@ -5421,9 +5433,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } else { GardsCalibrationSpectrum gammaCalibrationD = new GardsCalibrationSpectrum(); gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType()); - gammaCalibrationD.setCoeff1(bgAnalyseResult.d_g_fitting_c_e.get(0)); - gammaCalibrationD.setCoeff2(bgAnalyseResult.d_g_fitting_c_e.get(1)); - gammaCalibrationD.setCoeff3(bgAnalyseResult.d_g_fitting_c_e.get(2)); + gammaCalibrationD.setCoeff1(bgAnalyseResult.d_g_fitting_e_c.get(0)); + gammaCalibrationD.setCoeff2(bgAnalyseResult.d_g_fitting_e_c.get(1)); + gammaCalibrationD.setCoeff3(bgAnalyseResult.d_g_fitting_e_c.get(2)); gammaCalibrationSpectrumList.add(gammaCalibrationD); } anlyseResultIn.setGammaCalibrationSpectrumList(gammaCalibrationSpectrumList); @@ -5439,9 +5451,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } else { GardsCalibrationSpectrum betaCalibrationS = new GardsCalibrationSpectrum(); betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType()); - betaCalibrationS.setCoeff1(bgAnalyseResult.s_b_fitting_c_e.get(0)); - betaCalibrationS.setCoeff2(bgAnalyseResult.s_b_fitting_c_e.get(1)); - betaCalibrationS.setCoeff3(bgAnalyseResult.s_b_fitting_c_e.get(2)); + betaCalibrationS.setCoeff1(bgAnalyseResult.s_b_fitting_e_c.get(0)); + betaCalibrationS.setCoeff2(bgAnalyseResult.s_b_fitting_e_c.get(1)); + betaCalibrationS.setCoeff3(bgAnalyseResult.s_b_fitting_e_c.get(2)); betaCalibrationSpectrumList.add(betaCalibrationS); } if (anlyseResultIn.isBBetaEnergyValidGas()) { @@ -5454,9 +5466,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } else { GardsCalibrationSpectrum betaCalibrationG = new GardsCalibrationSpectrum(); betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType()); - betaCalibrationG.setCoeff1(bgAnalyseResult.g_b_fitting_c_e.get(0)); - betaCalibrationG.setCoeff2(bgAnalyseResult.g_b_fitting_c_e.get(1)); - betaCalibrationG.setCoeff3(bgAnalyseResult.g_b_fitting_c_e.get(2)); + betaCalibrationG.setCoeff1(bgAnalyseResult.g_b_fitting_e_c.get(0)); + betaCalibrationG.setCoeff2(bgAnalyseResult.g_b_fitting_e_c.get(1)); + betaCalibrationG.setCoeff3(bgAnalyseResult.g_b_fitting_e_c.get(2)); betaCalibrationSpectrumList.add(betaCalibrationG); } if (anlyseResultIn.isBBetaEnergyValidDet()) { @@ -5469,9 +5481,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } else { GardsCalibrationSpectrum betaCalibrationD = new GardsCalibrationSpectrum(); betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType()); - betaCalibrationD.setCoeff1(bgAnalyseResult.d_b_fitting_c_e.get(0)); - betaCalibrationD.setCoeff2(bgAnalyseResult.d_b_fitting_c_e.get(1)); - betaCalibrationD.setCoeff3(bgAnalyseResult.d_b_fitting_c_e.get(2)); + betaCalibrationD.setCoeff1(bgAnalyseResult.d_b_fitting_e_c.get(0)); + betaCalibrationD.setCoeff2(bgAnalyseResult.d_b_fitting_e_c.get(1)); + betaCalibrationD.setCoeff3(bgAnalyseResult.d_b_fitting_e_c.get(2)); betaCalibrationSpectrumList.add(betaCalibrationD); } anlyseResultIn.setBetaCalibrationSpectrumList(betaCalibrationSpectrumList);