From a7ef47a35816e877524bab0e590630656b92e3b2 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Tue, 7 Nov 2023 14:57:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?beta=E5=8A=9F=E8=83=BD=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20PHDFileUtil=E8=A7=A3=E6=9E=90=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E4=BF=A1=E6=81=AF=20beta=E5=8A=9F=E8=83=BD=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=A4=9A=E4=BD=99=E5=8F=82=E6=95=B0=20beta=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=8A=A0=E8=BD=BD=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9=E7=BC=BA=E5=B0=91=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/util/PHDFileUtil.java | 57 +++++++++++-------- .../SpectrumAnalysesController.java | 4 +- .../jeecg/modules/entity/vo/BetaDataFile.java | 28 +++++++++ .../service/ISpectrumAnalysisService.java | 2 +- .../impl/SpectrumAnalysisServiceImpl.java | 17 +++++- 5 files changed, 79 insertions(+), 29 deletions(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java index 86e46a13..50506640 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java @@ -151,6 +151,7 @@ public class PHDFileUtil extends AbstractLogOrReport { seriseData.setY(count); gammaOriginalSeriseData.add(seriseData); } + map.put("gammaOriginalData", gammaOriginalSeriseData); //Gamma Spectrum Projected List gammaProjectedData = new LinkedList<>(); @@ -255,15 +256,23 @@ public class PHDFileUtil extends AbstractLogOrReport { if (type.equalsIgnoreCase("sample")) { betaDataFile.setSampleSpectrumData(spectrumData); betaDataFile.setSampleBoundary(boundaryList); + betaDataFile.setSampleHistogramDataList(histogramDataList); + betaDataFile.setSampleHistogramDataDList(histogramDataDList); } else if (type.equalsIgnoreCase("gas")) { betaDataFile.setGasSpectrumData(spectrumData); betaDataFile.setGasBoundary(boundaryList); + betaDataFile.setGasHistogramDataList(histogramDataList); + betaDataFile.setGasHistogramDataDList(histogramDataDList); } else if (type.equalsIgnoreCase("det")) { betaDataFile.setDetSpectrumData(spectrumData); betaDataFile.setDetBoundary(boundaryList); + betaDataFile.setDetHistogramDataList(histogramDataList); + betaDataFile.setDetHistogramDataDList(histogramDataDList); } else if (type.equalsIgnoreCase("qc")) { betaDataFile.setQcSpectrumData(spectrumData); betaDataFile.setQcBoundary(boundaryList); + betaDataFile.setQcHistogramDataList(histogramDataList); + betaDataFile.setQcHistogramDataDList(histogramDataDList); } } catch (ParseException e) { throw new RuntimeException(e); @@ -1326,10 +1335,10 @@ public class PHDFileUtil extends AbstractLogOrReport { if (bgAnalyseResult.s_b_fitting_c_e.size() > 0) { out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_c_e.get(2))))); } else { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } } else { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } //换行 out.append(System.lineSeparator()); @@ -1338,10 +1347,10 @@ public class PHDFileUtil extends AbstractLogOrReport { if (bgAnalyseResult.s_b_fitting_e_c.size() > 0) { out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_b_fitting_e_c.get(2))))); } else { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } } else { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } //换行 out.append(System.lineSeparator()); @@ -1356,10 +1365,10 @@ public class PHDFileUtil extends AbstractLogOrReport { if (bgAnalyseResult.s_g_fitting_c_e.size() > 0) { out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_c_e.get(2))))); } else { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } } else { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } //换行 out.append(System.lineSeparator()); @@ -1368,10 +1377,10 @@ public class PHDFileUtil extends AbstractLogOrReport { if (bgAnalyseResult.s_g_fitting_e_c.size() > 0) { out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.s_g_fitting_e_c.get(2))))); } else { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } } else { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } //换行 out.append(System.lineSeparator()); @@ -1426,10 +1435,10 @@ public class PHDFileUtil extends AbstractLogOrReport { if (bgAnalyseResult.d_b_fitting_c_e.size() > 0) { out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(2))))); } else { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } } else { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } //换行 @@ -1439,10 +1448,10 @@ public class PHDFileUtil extends AbstractLogOrReport { if (bgAnalyseResult.d_b_fitting_e_c.size() > 0) { out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(2))))); } else { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } } else { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } //换行 out.append(System.lineSeparator()); @@ -1457,10 +1466,10 @@ public class PHDFileUtil extends AbstractLogOrReport { if (bgAnalyseResult.d_g_fitting_c_e.size() > 0) { out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(2))))); } else { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } } else { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } //换行 out.append(System.lineSeparator()); @@ -1469,10 +1478,10 @@ public class PHDFileUtil extends AbstractLogOrReport { if (bgAnalyseResult.d_g_fitting_e_c.size() > 0) { out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(2))))); } else { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } } else { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } //换行 out.append(System.lineSeparator()); @@ -1522,10 +1531,10 @@ public class PHDFileUtil extends AbstractLogOrReport { if (bgAnalyseResult.g_b_fitting_c_e.size() > 0) { out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(2))))); } else { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } } else { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } //换行 out.append(System.lineSeparator()); @@ -1534,10 +1543,10 @@ public class PHDFileUtil extends AbstractLogOrReport { if (bgAnalyseResult.g_b_fitting_e_c.size() > 0) { out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(2))))); } else { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } } else { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } //换行 out.append(System.lineSeparator()); @@ -1552,10 +1561,10 @@ public class PHDFileUtil extends AbstractLogOrReport { if (bgAnalyseResult.g_g_fitting_c_e.size() > 0) { out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(2))))); } else { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } } else { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } //换行 out.append(System.lineSeparator()); @@ -1564,10 +1573,10 @@ public class PHDFileUtil extends AbstractLogOrReport { if (bgAnalyseResult.g_g_fitting_e_c.size() > 0) { out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(2))))); } else { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } } else { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?", "?", "?")); + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } //换行 out.append(System.lineSeparator()); 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 fc770dc1..5004e51d 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 @@ -57,8 +57,8 @@ public class SpectrumAnalysesController { @DeleteMapping("deleteSpectrumCacheData") @ApiOperation(value = "删除缓存数据",notes = "删除缓存数据") - public void deleteSpectrumCacheData(String sampleFileName, String qcFileName, HttpServletRequest request) { - spectrumAnalysisService.deleteSpectrumCacheData(sampleFileName, qcFileName, request); + public void deleteSpectrumCacheData(String sampleFileName, HttpServletRequest request) { + spectrumAnalysisService.deleteSpectrumCacheData(sampleFileName, request); } @GetMapping("viewComment") diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BetaDataFile.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BetaDataFile.java index 39bc0113..2c150bef 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BetaDataFile.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/BetaDataFile.java @@ -112,6 +112,30 @@ public class BetaDataFile implements Serializable { private SpectrumData qcSpectrumData; + private List betaFittingParaOld; + + private List betaFittingParaToUiOld; + + private List gammaFittingParaOld; + + private List gammaFittingParaToUiOld; + + private List sampleHistogramDataList; + + private List sampleHistogramDataDList; + + private List gasHistogramDataList; + + private List gasHistogramDataDList; + + private List detHistogramDataList; + + private List detHistogramDataDList; + + private List qcHistogramDataList; + + private List qcHistogramDataDList; + //存储分析结果信息 private List xeDataList; private List gammaCalibrationSpectrumList; @@ -157,6 +181,10 @@ public class BetaDataFile implements Serializable { gasSpectrumData = new SpectrumData(); detSpectrumData = new SpectrumData(); qcSpectrumData = new SpectrumData(); + betaFittingParaOld = new LinkedList<>(); + betaFittingParaToUiOld = new LinkedList<>(); + gammaFittingParaOld = new LinkedList<>(); + gammaFittingParaToUiOld = new LinkedList<>(); } } 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 45128b75..f88bfdd8 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 @@ -24,7 +24,7 @@ public interface ISpectrumAnalysisService { Result getFileSpectrumChart(String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request); - void deleteSpectrumCacheData(String sampleFileName, String qcFileName, HttpServletRequest request); + void deleteSpectrumCacheData(String sampleFileName, HttpServletRequest request); Result viewComment(Integer sampleId, String sampleFileName, HttpServletRequest request); 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 4f5705be..abdfea6d 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 @@ -27,6 +27,7 @@ import org.jeecg.common.properties.SpectrumPathProperties; import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.*; +import org.jeecg.modules.base.abstracts.AbstractLogOrReport; import org.jeecg.modules.base.bizVo.BetaRLR; import org.jeecg.modules.base.dto.ESStructDto; import org.jeecg.modules.base.dto.ROIChannelsDto; @@ -68,7 +69,7 @@ import static org.jeecg.modules.base.enums.ExportTemplate.*; @Service("spectrumAnalysisService") @DS("ora") -public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { +public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements ISpectrumAnalysisService { @Autowired private SpectrumAnalysisMapper spectrumAnalysisMapper; @@ -398,6 +399,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(sampleTmp.getAbsolutePath()); betaDataFile.setSampleStruct(struct); sampleMap = phdFileUtil.getSourceData(struct, sample.getSampleId(), sample.getStatus(), "sample", betaDataFile); + sampleMap.put("fileName", betaDataFile.getSampleFileName()); resultMap.put("sample",sampleMap); } } @@ -410,6 +412,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(gasTmp.getAbsolutePath()); betaDataFile.setGasStruct(struct); gasBgMap = phdFileUtil.getSourceData(struct, gasBg.getSampleId(), gasBg.getStatus(), "gas", betaDataFile); + gasBgMap.put("fileName", betaDataFile.getGasFileName()); resultMap.put("gasBg",gasBgMap); } } @@ -422,6 +425,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(detTmp.getAbsolutePath()); betaDataFile.setDetStruct(struct); detBgMap = phdFileUtil.getSourceData(struct, detBg.getSampleId(), detBg.getStatus(), "det", betaDataFile); + detBgMap.put("fileName", betaDataFile.getDetFileName()); resultMap.put("detBg",detBgMap); } } @@ -434,6 +438,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { EnergySpectrumStruct struct = EnergySpectrumHandler.getSourceData(qcTmp.getAbsolutePath()); betaDataFile.setQcStruct(struct); qcMap = phdFileUtil.getSourceData(struct, qc.getSampleId(), qc.getStatus(), "qc", betaDataFile); + qcMap.put("fileName", betaDataFile.getQcFileName()); resultMap.put("qc",qcMap); } } @@ -535,6 +540,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { betaDataFile.setSampleFilePathName(sampleFilePath); betaDataFile.setSampleFileName(sampleFileName); sampleMap = phdFileUtil.getSourceData(struct, null, null, "sample", betaDataFile); + sampleMap.put("fileName", betaDataFile.getSampleFileName()); resultMap.put("sample", sampleMap); } } @@ -545,6 +551,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { betaDataFile.setGasFilePathName(gasBgFilePath); betaDataFile.setGasFileName(gasFileName); gasBgMap = phdFileUtil.getSourceData(struct, null, null, "gas", betaDataFile); + gasBgMap.put("fileName", betaDataFile.getGasFileName()); resultMap.put("gasBg", gasBgMap); } } @@ -555,6 +562,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { betaDataFile.setDetFilePathName(detBgFilePath); betaDataFile.setDetFileName(detFileName); detBgMap = phdFileUtil.getSourceData(struct, null, null, "det", betaDataFile); + detBgMap.put("fileName", betaDataFile.getDetFileName()); resultMap.put("detBg", detBgMap); } } @@ -565,6 +573,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { betaDataFile.setQcFilePathName(dbQcFilePath); betaDataFile.setQcFileName(qcFileName); qcMap = phdFileUtil.getSourceData(struct, null, null, "qc", betaDataFile); + qcMap.put("fileName", betaDataFile.getQcFileName()); resultMap.put("qc", qcMap); } } @@ -653,7 +662,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { } @Override - public void deleteSpectrumCacheData(String sampleFileName, String qcFileName, HttpServletRequest request) { + public void deleteSpectrumCacheData(String sampleFileName, HttpServletRequest request) { String userName = JwtUtil.getUserNameByToken(request); String betaKey = sampleFileName + "-" + userName; betaCache.deleteBetaCache(betaKey); @@ -1617,6 +1626,8 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { betaDataFile.setGammaList(oldScatterSeries); betaDataFile.setGammaFittingPara(fittingParaStr); betaDataFile.setGammaFittingParaToUi(fittingParaToUiStr); + betaDataFile.setGammaFittingParaOld(fittingParaStr); + betaDataFile.setGammaFittingParaToUiOld(fittingParaToUiStr); } result.setSuccess(true); result.setResult(map); @@ -1723,6 +1734,8 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { betaDataFile.setBetaList(oldScatterSeries); betaDataFile.setBetaFittingPara(fittingParaStr); betaDataFile.setBetaFittingParaToUi(fittingParaToUiStr); + betaDataFile.setBetaFittingParaOld(fittingParaStr); + betaDataFile.setBetaFittingParaToUiOld(fittingParaToUiStr); } result.setSuccess(true); result.setResult(map); From c9c1ab26bf07580f4fd408831ad9da8d26f277a6 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Tue, 7 Nov 2023 15:29:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?beta=E9=87=8D=E6=96=B0=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1=E6=95=A3=E7=82=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20gamma=E7=BC=93=E5=AD=98=E7=94=A8=E6=88=B7=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E6=A0=B8=E7=B4=A0=E4=BF=A1=E6=81=AF=E4=B8=8D?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C=EF=BC=8C?= =?UTF-8?q?key=E6=94=B9=E4=B8=BA=E7=94=A8=E6=88=B7=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/service/impl/GammaServiceImpl.java | 13 ++++++------- .../service/impl/SpectrumAnalysisServiceImpl.java | 12 ++++++++++++ 2 files changed, 18 insertions(+), 7 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 66d85061..8d153171 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 @@ -188,7 +188,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi String pathName = ftpUtil.getFtpRootPath() + spectrumPathProperties.getUploadPath() + StringPool.SLASH + userName; String fileName = samfileName; boolean flag = gammaFileUtil.loadFile(pathName, fileName, phd, result); - if (!redisUtil.hasKey(fileName+"-"+userName)) { + if (!redisUtil.hasKey(userName)) { // 查询当前用户关联的核素信息 List userLib = new LinkedList<>(); // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的 @@ -197,7 +197,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase()); } Map nuclideMap = GetNuclideLines(userLib); - redisUtil.set(fileName+"-"+userName, nuclideMap); + redisUtil.set(userName, nuclideMap); } if (!flag) { return result; @@ -472,7 +472,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi } // 从数据库中读取phd其他相关信息 boolean bRet = getResultFromDB(dbName, userName, sampleId, phd, result); - if (!redisUtil.hasKey(fileName+"-"+userName)) { + if (!redisUtil.hasKey(userName)) { // 查询当前用户关联的核素信息 List userLib = new LinkedList<>(); // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的 @@ -481,7 +481,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase()); } Map nuclideMap = GetNuclideLines(userLib); - redisUtil.set(fileName+"-"+userName, nuclideMap); + redisUtil.set(userName, nuclideMap); } // 判断数据库信息是否读取正常 if (!bRet) { @@ -837,7 +837,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi if (!bRet) { return result; } - if (!redisUtil.hasKey(fileName+"-"+userName)) { + if (!redisUtil.hasKey(userName)) { // 查询当前用户关联的核素信息 List userLib = new LinkedList<>(); // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的 @@ -846,7 +846,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase()); } Map nuclideMap = GetNuclideLines(userLib); - redisUtil.set(fileName+"-"+userName, nuclideMap); + redisUtil.set(userName, nuclideMap); } } // 更新 ‘QC Flags’ 状态 @@ -882,7 +882,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi String key = fileName + StrUtil.DASHED + username; // 删除指定key的Cache localCache.deletePHDCache(key); - redisUtil.del(key); } @Override 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 abdfea6d..033ddfbc 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 @@ -643,21 +643,33 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Map map = new HashMap<>(); SpectrumData spectrumData = new SpectrumData(); List boundaryList = new LinkedList<>(); + List histogramDataList = new LinkedList<>(); + List histogramDataDList = new LinkedList<>(); if (type.equalsIgnoreCase("sample")) { spectrumData = betaDataFile.getSampleSpectrumData(); boundaryList = betaDataFile.getSampleBoundary(); + histogramDataList = betaDataFile.getSampleHistogramDataList(); + histogramDataDList = betaDataFile.getSampleHistogramDataDList(); } else if (type.equalsIgnoreCase("gas")) { spectrumData = betaDataFile.getGasSpectrumData(); boundaryList = betaDataFile.getGasBoundary(); + histogramDataList = betaDataFile.getGasHistogramDataList(); + histogramDataDList = betaDataFile.getGasHistogramDataDList(); } else if (type.equalsIgnoreCase("det")) { spectrumData = betaDataFile.getDetSpectrumData(); boundaryList = betaDataFile.getDetBoundary(); + histogramDataList = betaDataFile.getDetHistogramDataList(); + histogramDataDList = betaDataFile.getDetHistogramDataDList(); } else if (type.equalsIgnoreCase("qc")) { spectrumData = betaDataFile.getQcSpectrumData(); boundaryList = betaDataFile.getQcBoundary(); + histogramDataList = betaDataFile.getQcHistogramDataList(); + histogramDataDList = betaDataFile.getQcHistogramDataDList(); } map.put("spectrumData", spectrumData); map.put("Boundary", boundaryList); + map.put("histogramDataList", histogramDataList); + map.put("histogramDataDList", histogramDataDList); return map; } From e087e801961fe931239ae39c6468fea974212e42 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Tue, 7 Nov 2023 17:27:02 +0800 Subject: [PATCH 3/5] =?UTF-8?q?gamma=E7=BC=93=E5=AD=98=E6=A0=B8=E7=B4=A0?= =?UTF-8?q?=E4=BF=A1=E6=81=AFkey=E4=BF=AE=E6=94=B9=20gamma=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=97=A5=E5=BF=97=EF=BC=8C=E6=8A=A5=E5=91=8A=EF=BC=8C?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=85=AC=E7=94=A8=E6=96=B9=E6=B3=95=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=A0=87=E8=AF=86=E5=8C=BA=E5=88=86=20beta=E6=9F=A5?= =?UTF-8?q?=E7=9C=8BBG=20Log=20Viewer=E6=8E=A5=E5=8F=A3=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=88=99=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=A9=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/common/util/FTPUtil.java | 10 ++- .../modules/spectrum/Sample_G_Analysis.java | 2 +- .../org/jeecg/common/util/GammaFileUtil.java | 24 ++++--- .../service/impl/GammaServiceImpl.java | 62 ++++++++++--------- .../impl/SpectrumAnalysisServiceImpl.java | 19 +++--- 5 files changed, 64 insertions(+), 53 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 6a13e013..497bf8a5 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 @@ -12,14 +12,18 @@ import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPFile; import org.apache.commons.net.ftp.FTPReply; import org.jeecg.common.constant.SymbolConstant; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; +import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java index b1353709..9d2ccbab 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java @@ -152,7 +152,7 @@ public class Sample_G_Analysis { } // 执行分析业务代码 - gammaFileUtil.GetMiddleData(phdFile, CommonConstant.REPORT_PREFIX_AUTO, nuclideLibs, middleData, MiddleDataType.Auto.getType()); + gammaFileUtil.GetMiddleData(phdFile, CommonConstant.REPORT_PREFIX_AUTO, nuclideLibs, middleData, MiddleDataType.Auto.getType(), ""); // 数据插入数据库 this.storageDataToDatabase(middleData, phdFile.getQcItems()); 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 ab332212..6081c18a 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 @@ -274,7 +274,9 @@ public class GammaFileUtil extends AbstractLogOrReport { String baselineFileName = prefixName+"_"+subFileName + ".baseline"; String fromPathBase = pathName + StringPool.SLASH + baselineFileName; - inputStreamBase = ftpUtil.downloadFileStream(fromPathBase); + File file = ftpUtil.downloadFile(fromPathBase, "betaGamma"); + inputStreamBase = new FileInputStream(file); +// inputStreamBase = ftpUtil.downloadFileStream(fromPathBase); // 调用处理BaseCtrl的方法 ReadBaseCtrlInfo(phd, inputStreamBase); // 将phdFile的BaseCtrls的BaseLine部分数据 赋值给 phdFile的vBase @@ -2228,9 +2230,9 @@ public class GammaFileUtil extends AbstractLogOrReport { map.put("AllData", datalist); } - public String GetReportContent(PHDFile phd, String userName, boolean bLog) { + public String GetReportContent(PHDFile phd, String userName, boolean bLog, String flag) { GStoreMiddleProcessData middleData = new GStoreMiddleProcessData(); - GetInterMiddlData(phd, userName, middleData); + GetInterMiddlData(phd, userName, middleData, flag); if(bLog) { return GetLogContent(middleData); } else { @@ -2238,11 +2240,11 @@ public class GammaFileUtil extends AbstractLogOrReport { } } - public boolean GetInterMiddlData(PHDFile phd, String userName, GStoreMiddleProcessData middleData) { + public boolean GetInterMiddlData(PHDFile phd, String userName, GStoreMiddleProcessData middleData, String flag) { boolean bRet = true; Map temp = new HashMap<>(); try { - bRet = GetMiddleData(phd, userName, temp,middleData, MiddleDataType.InterAction.getType()); + bRet = GetMiddleData(phd, userName, temp,middleData, MiddleDataType.InterAction.getType(), flag); middleData.analyses_type ="Interactive"; } catch (ParseException e) { throw new RuntimeException(e); @@ -2989,7 +2991,7 @@ public class GammaFileUtil extends AbstractLogOrReport { return name; } - public boolean GetMiddleData(PHDFile fileAnlyse, String userName,Map nucline,GStoreMiddleProcessData middleData, String type) throws ParseException { + public boolean GetMiddleData(PHDFile fileAnlyse, String userName,Map nucline,GStoreMiddleProcessData middleData, String type, String flag) throws ParseException { boolean bRet=true; //标准名称规范化 String dataType = fileAnlyse.getMsgInfo().getData_type(); @@ -3024,7 +3026,7 @@ public class GammaFileUtil extends AbstractLogOrReport { anylseEnd = DateUtils.formatDate(new Date(), "yyyy/MM/dd HH:mm:ss"); middleData.analyses_analysisBegin = anylseBegin; middleData.analyses_analysisEnd = anylseEnd; - } else if (type.equals(MiddleDataType.InterAction.getType())){ //如果是人工交互分析 则先上传phd对应文件信息 + } else if (type.equals(MiddleDataType.InterAction.getType()) && flag.equalsIgnoreCase("save")){ //如果是人工交互分析 则先上传phd对应文件信息 //上传本次文件到ftp人工交互存储路径下 File sampleTmp = null; try { @@ -3055,9 +3057,11 @@ public class GammaFileUtil extends AbstractLogOrReport { String qsSaveBaseLine = savePath + StringPool.SLASH + qsBaseLinePath; String qsSaveLc = savePath + StringPool.SLASH + qsLcPath; String qsSaveScac = savePath + StringPool.SLASH + qsScacPath; - GammaReportUtil.writeFile(fileAnlyse.getBaseCtrls(), rootPath + qsSaveBaseLine); - GammaReportUtil.writeFile(fileAnlyse.getVLc(), "LC", rootPath + qsSaveLc); - GammaReportUtil.writeFile(fileAnlyse.getVScac(), "SCSC", rootPath + qsSaveScac); + if((type.equals(MiddleDataType.Auto.getType())) || (type.equals(MiddleDataType.InterAction.getType()) && flag.equalsIgnoreCase("save")) ) { + GammaReportUtil.writeFile(fileAnlyse.getBaseCtrls(), rootPath + qsSaveBaseLine); + GammaReportUtil.writeFile(fileAnlyse.getVLc(), "LC", rootPath + qsSaveLc); + GammaReportUtil.writeFile(fileAnlyse.getVScac(), "SCSC", rootPath + qsSaveScac); + } double totalNumber = 0.0; for(int m=0;m userLib = new LinkedList<>(); // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的 @@ -178,7 +180,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase()); } Map nuclideMap = GetNuclideLines(userLib); - redisUtil.set(fileName+"-"+userName, nuclideMap); + redisUtil.set(userName+"-"+phd.getHeader().getSystem_type(), nuclideMap); } if (!bRet) { return result; @@ -188,7 +190,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi String pathName = ftpUtil.getFtpRootPath() + spectrumPathProperties.getUploadPath() + StringPool.SLASH + userName; String fileName = samfileName; boolean flag = gammaFileUtil.loadFile(pathName, fileName, phd, result); - if (!redisUtil.hasKey(userName)) { + if (!redisUtil.hasKey(userName+"-"+phd.getHeader().getSystem_type())) { // 查询当前用户关联的核素信息 List userLib = new LinkedList<>(); // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的 @@ -197,7 +199,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase()); } Map nuclideMap = GetNuclideLines(userLib); - redisUtil.set(userName, nuclideMap); + redisUtil.set(userName+"-"+phd.getHeader().getSystem_type(), nuclideMap); } if (!flag) { return result; @@ -224,7 +226,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi result.error500("Please select the parse file first！"); return result; } - Map nuclideLinesMap = (Map) redisUtil.get(fileName+"-"+userName);//GetNuclideLines(nuclides); + Map nuclideLinesMap = (Map) redisUtil.get(userName+"-"+phd.getHeader().getSystem_type());//GetNuclideLines(nuclides); // 解析获取临时文件信息 File tmpFile = gammaFileUtil.analyzeFile(ftpUtil.getFtpRootPath() + spectrumPathProperties.getUploadPath() + StringPool.SLASH + userName, fileName); ObjectMapper mapper = new ObjectMapper(); @@ -472,7 +474,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi } // 从数据库中读取phd其他相关信息 boolean bRet = getResultFromDB(dbName, userName, sampleId, phd, result); - if (!redisUtil.hasKey(userName)) { + if (!redisUtil.hasKey(userName+"-"+phd.getHeader().getSystem_type())) { // 查询当前用户关联的核素信息 List userLib = new LinkedList<>(); // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的 @@ -481,7 +483,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase()); } Map nuclideMap = GetNuclideLines(userLib); - redisUtil.set(userName, nuclideMap); + redisUtil.set(userName+"-"+phd.getHeader().getSystem_type(), nuclideMap); } // 判断数据库信息是否读取正常 if (!bRet) { @@ -837,7 +839,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi if (!bRet) { return result; } - if (!redisUtil.hasKey(userName)) { + if (!redisUtil.hasKey(userName+"-"+phd.getHeader().getSystem_type())) { // 查询当前用户关联的核素信息 List userLib = new LinkedList<>(); // 从postgreSql中获取当前用户关注的核素信息 如果当前用户没有 则返回管理员的 @@ -846,7 +848,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase()); } Map nuclideMap = GetNuclideLines(userLib); - redisUtil.set(userName, nuclideMap); + redisUtil.set(userName+"-"+phd.getHeader().getSystem_type(), nuclideMap); } } // 更新 ‘QC Flags’ 状态 @@ -1051,7 +1053,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi "2. You didn't change any setting or calibration."; result.error500(warning); } else if (flag == -1) { - Map nuclideLinesMap = (Map) redisUtil.get(fileName+"-"+userName);//GetNuclideLines(nuclides); + Map nuclideLinesMap = (Map) redisUtil.get(userName+"-"+phd.getHeader().getSystem_type());//GetNuclideLines(nuclides); gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap); gammaFileUtil.RunQC(phd); String warning = "Finish three tasks:\n" + @@ -1060,7 +1062,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi "\t3.Test QC again."; result.error500(warning); } else { - Map nuclideLinesMap = (Map) redisUtil.get(fileName+"-"+userName);//GetNuclideLines(nuclides); + Map nuclideLinesMap = (Map) redisUtil.get(userName+"-"+phd.getHeader().getSystem_type());//GetNuclideLines(nuclides); gammaFileUtil.AnalyseSpectrum(phd, nuclideLinesMap); // 重新分析各峰值对应的核素信息 // gammaFileUtil.NuclidesIdent(phd, nuclideLinesMap); @@ -1467,8 +1469,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi Result result = new Result(); //获取用户名称 String userName = JwtUtil.getUserNameByToken(request); - //获取缓存的核素信息 - Map nuclideMap = (Map) redisUtil.get(fileName + "-" + userName); //获取PHDFile的缓存信息 Cache phdCache = localCache.getPHDCache(); PHDFile phd = phdCache.getIfPresent(fileName + "-" + userName); @@ -1476,6 +1476,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi result.error500("Please select the parse file first！"); return result; } + //获取缓存的核素信息 + Map nuclideMap = (Map) redisUtil.get(userName+"-"+phd.getHeader().getSystem_type()); //获取颜色信息 Map colorMap = sysUserColorService.initColor(userName); //声明一个结果的map @@ -1657,7 +1659,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi // if (CollectionUtils.isEmpty(userLib)) { // userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase()); // } - Map mapNucLines = (Map) redisUtil.get(fileName+"-"+userName);//GetNuclideLines(userLib); + Map mapNucLines = (Map) redisUtil.get(userName+"-"+phd.getHeader().getSystem_type());//GetNuclideLines(userLib); // 查询出核素信息 NuclideLines it_line = mapNucLines.get(nuclideName); // 如果核素信息不存在返回 @@ -1686,8 +1688,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi Result result = new Result(); //获取用户名 String userName = JwtUtil.getUserNameByToken(request); - Map map = new HashMap<>(); - Map nuclideMap = (Map) redisUtil.get(fileName + "-" + userName); //缓存中获取缓存信息 Cache phdCache = localCache.getPHDCache(); PHDFile phd = phdCache.getIfPresent(fileName + "-" + userName); @@ -1695,6 +1695,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi result.error500("Please select the parse file first！"); return result; } + Map map = new HashMap<>(); + Map nuclideMap = (Map) redisUtil.get(userName+"-"+phd.getHeader().getSystem_type()); //判断当前选择的核素名称是否包含在当前Peak的核素列表中 int index = list_identify.indexOf(nuclideName); if (index >= 0) { @@ -3575,7 +3577,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi userLib = defaultNuclideSpectrumService.findNuclidesByUserName("admin", phd.getHeader().getSystem_type().toUpperCase()); } Map nuclideMap = GetNuclideLines(userLib); - redisUtil.set(fileName+"-"+userName, nuclideMap); + redisUtil.set(userName+"-"+phd.getHeader().getSystem_type(), nuclideMap); } else { result.success("Modification failure！"); } @@ -3683,7 +3685,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi String pathName = ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + reportPath.substring(0, reportPath.lastIndexOf(StringPool.SLASH)); String fileName = reportPath.substring(reportPath.lastIndexOf(StringPool.SLASH) + 1) + ".txt"; // 连接ftp - FTPClient ftpClient = ftpUtil.LoginFTP(); if (Objects.isNull(ftpClient)) { throw new RuntimeException("ftp connection failed"); } @@ -3711,14 +3712,15 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi throw new RuntimeException(e); } finally { try { - if (Objects.nonNull(ftpClient)) { - ftpClient.disconnect(); - } +// if (Objects.nonNull(ftpClient)) { +// ftpClient.disconnect(); +// } if (ObjectUtil.isNotNull(inputStream)) { inputStream.close(); } if (ObjectUtil.isNotNull(outputStream)) { outputStream.close(); + ftpClient.completePendingCommand(); } } catch (IOException e) { throw new RuntimeException(e); @@ -3733,7 +3735,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi String pathName = ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + reportPath.substring(0, reportPath.lastIndexOf(StringPool.SLASH)); String fileName = reportPath.substring(reportPath.lastIndexOf(StringPool.SLASH) + 1) + ".txt"; // 连接ftp - FTPClient ftpClient = ftpUtil.LoginFTP(); + FTPClient ftpClient = null; if (Objects.isNull(ftpClient)) { throw new RuntimeException("ftp connection failed"); } @@ -3765,14 +3767,15 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi throw new RuntimeException(e); } finally { try { - if (Objects.nonNull(ftpClient)) { - ftpClient.disconnect(); - } +// if (Objects.nonNull(ftpClient)) { +// ftpClient.disconnect(); +// } if (ObjectUtil.isNotNull(inputStream)) { inputStream.close(); } if (ObjectUtil.isNotNull(outputStream)) { outputStream.close(); + ftpClient.completePendingCommand(); } } catch (IOException e) { throw new RuntimeException(e); @@ -3790,7 +3793,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi result.error500("Please select the parse file first！"); return result; } - String reportContent = gammaFileUtil.GetReportContent(phd, userName, false); + String reportContent = gammaFileUtil.GetReportContent(phd, userName, false, "log"); result.setSuccess(true); result.setResult(reportContent); return result; @@ -3804,7 +3807,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi if (Objects.isNull(phd)) { return; } - String reportContent = gammaFileUtil.GetReportContent(phd, userName, false); + String reportContent = gammaFileUtil.GetReportContent(phd, userName, false, "log"); OutputStream fos = null; try { // 设置响应类型 @@ -4271,7 +4274,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi String pathName = ftpUtil.getFtpRootPath() + spectrumPathProperties.getLogPath() + StringPool.SLASH + logPath.substring(0, logPath.lastIndexOf(StringPool.SLASH)); String fileName = logPath.substring(logPath.lastIndexOf(StringPool.SLASH) + 1); // 连接ftp - FTPClient ftpClient = ftpUtil.LoginFTP(); if (Objects.isNull(ftpClient)) { throw new RuntimeException("ftp connection failed"); } @@ -4324,7 +4326,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi result.error500("Please select the parse file first！"); return result; } - String reportContent = gammaFileUtil.GetReportContent(phd, userName, true); + String reportContent = gammaFileUtil.GetReportContent(phd, userName, true, "log"); result.setSuccess(true); result.setResult(reportContent); return result; @@ -4416,7 +4418,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi // 如果有权限则开始保存数据库操作 // 将PHDFile数据 生成用于数据库存储的数据结构 GStoreMiddleProcessData middleData = new GStoreMiddleProcessData(); - bRet = gammaFileUtil.GetInterMiddlData(phd, userName, middleData); + bRet = gammaFileUtil.GetInterMiddlData(phd, userName, middleData, "save"); if (!bRet) { result.error500("Transform PHDFile into structGStoreMiddleProcessData failed."); return result; 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 033ddfbc..aebdfc37 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 @@ -518,8 +518,6 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Map gasBgMap = new HashMap<>(); Map detBgMap = new HashMap<>(); Map qcMap = new HashMap<>(); - boolean bProcessed = false; - boolean savedAnalysisResult = false; //页面展示结果数组 List xeResultsSpectrumList = new LinkedList<>(); //获取本地缓存信息 @@ -3494,13 +3492,16 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements FileInputStream inputStream = null; OutputStream fos = null; try { - inputStream = new FileInputStream(new File(logFilePath)); - fos = response.getOutputStream(); - byte[] buffer = new byte[1024]; - int bytesRead; - // 将文件输出流写入到输出流中 - while ((bytesRead = inputStream.read(buffer)) != -1) { - fos.write(buffer, 0, bytesRead); + File file = new File(logFilePath); + if (file.exists()) { + inputStream = new FileInputStream(file); + fos = response.getOutputStream(); + byte[] buffer = new byte[1024]; + int bytesRead; + // 将文件输出流写入到输出流中 + while ((bytesRead = inputStream.read(buffer)) != -1) { + fos.write(buffer, 0, bytesRead); + } } } catch (Exception e) { e.printStackTrace(); From f865b1045e4a24cc3cd9f7e6172245e3822cc0bf Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Wed, 8 Nov 2023 08:48:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?gamma=E8=AF=BB=E5=8F=96baseline=EF=BC=8Clc?= =?UTF-8?q?=EF=BC=8Cscac=E6=95=B0=E6=8D=AEnan=E8=B5=8B=E5=80=BCnull=20beta?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E5=8F=A5=E4=B8=AD=E6=96=87=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/util/GammaFileUtil.java | 5 ++-- .../service/impl/GammaServiceImpl.java | 20 ++++++------- .../impl/SpectrumAnalysisServiceImpl.java | 30 +++++++++---------- 3 files changed, 26 insertions(+), 29 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 6081c18a..0242ec63 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 @@ -345,7 +345,7 @@ public class GammaFileUtil extends AbstractLogOrReport { } else if (StringUtils.isNotBlank(strList.get(k)) && strList.get(k).equalsIgnoreCase("nan")) { //如果数据不为空 但 数据匹配任意大小写的nan //结果数组中补充0.0 - vData.add(0.0); + vData.add(null); } } } @@ -386,8 +386,7 @@ public class GammaFileUtil extends AbstractLogOrReport { data.add(d); } else if (StringUtils.isNotBlank(str) && str.equalsIgnoreCase("nan")) { //如果当前数据不为空 但 数据匹配任意大小写的nan - //将0.0填充到 double中 - data.add(0.0); + data.add(null); } } } 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 ee6432de..0d98087d 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 @@ -138,8 +138,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi private IGardsQcCheckSpectrumService qcCheckSpectrumService; @Autowired private IGardsAnalySettingSpectrumService analySettingSpectrumService; - @Autowired - private FTPClient ftpClient; @Override public Result initValue(Integer sampleId, String dbName, String samfileName, HttpServletRequest request) { @@ -3685,6 +3683,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi String pathName = ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + reportPath.substring(0, reportPath.lastIndexOf(StringPool.SLASH)); String fileName = reportPath.substring(reportPath.lastIndexOf(StringPool.SLASH) + 1) + ".txt"; // 连接ftp + FTPClient ftpClient = ftpUtil.LoginFTP(); if (Objects.isNull(ftpClient)) { throw new RuntimeException("ftp connection failed"); } @@ -3712,15 +3711,14 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi throw new RuntimeException(e); } finally { try { -// if (Objects.nonNull(ftpClient)) { -// ftpClient.disconnect(); -// } + if (Objects.nonNull(ftpClient)) { + ftpClient.disconnect(); + } if (ObjectUtil.isNotNull(inputStream)) { inputStream.close(); } if (ObjectUtil.isNotNull(outputStream)) { outputStream.close(); - ftpClient.completePendingCommand(); } } catch (IOException e) { throw new RuntimeException(e); @@ -3735,7 +3733,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi String pathName = ftpUtil.getFtpRootPath() + spectrumPathProperties.getSaveFilePath() + StringPool.SLASH + reportPath.substring(0, reportPath.lastIndexOf(StringPool.SLASH)); String fileName = reportPath.substring(reportPath.lastIndexOf(StringPool.SLASH) + 1) + ".txt"; // 连接ftp - FTPClient ftpClient = null; + FTPClient ftpClient = ftpUtil.LoginFTP(); if (Objects.isNull(ftpClient)) { throw new RuntimeException("ftp connection failed"); } @@ -3767,15 +3765,14 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi throw new RuntimeException(e); } finally { try { -// if (Objects.nonNull(ftpClient)) { -// ftpClient.disconnect(); -// } + if (Objects.nonNull(ftpClient)) { + ftpClient.disconnect(); + } if (ObjectUtil.isNotNull(inputStream)) { inputStream.close(); } if (ObjectUtil.isNotNull(outputStream)) { outputStream.close(); - ftpClient.completePendingCommand(); } } catch (IOException e) { throw new RuntimeException(e); @@ -4274,6 +4271,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi String pathName = ftpUtil.getFtpRootPath() + spectrumPathProperties.getLogPath() + StringPool.SLASH + logPath.substring(0, logPath.lastIndexOf(StringPool.SLASH)); String fileName = logPath.substring(logPath.lastIndexOf(StringPool.SLASH) + 1); // 连接ftp + FTPClient ftpClient = ftpUtil.LoginFTP(); if (Objects.isNull(ftpClient)) { throw new RuntimeException("ftp connection failed"); } 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 aebdfc37..7051e0c9 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 @@ -688,7 +688,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } EnergySpectrumStruct struct = betaDataFile.getSampleStruct(); @@ -759,7 +759,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(rrrLogInfo.getSampleFileName() + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } GardsCalibrationSpectrum gammaCalibrationParamS = new GardsCalibrationSpectrum(); @@ -1224,7 +1224,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } Map> map = new HashMap<>(); @@ -1258,7 +1258,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } if (StringUtils.isNotBlank(betaDataFile.getSampleFilePathName())){ @@ -1348,7 +1348,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } QCResult qcResult = new QCResult(); @@ -1481,7 +1481,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } List xeDataList = betaDataFile.getXeResultsSpectrumList(); @@ -1549,7 +1549,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } //获取qc的分析结果数据 @@ -1654,7 +1654,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } //判断qc的分析结果是否为空 @@ -1762,7 +1762,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } //读取文件信息 @@ -1849,7 +1849,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(extInfo.getSampleFileName() + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } //获取sample文件的文件读取信息 @@ -2117,7 +2117,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } //读取文件信息 @@ -2470,7 +2470,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } Map map = new HashMap<>(); @@ -2618,7 +2618,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } //选择矩形框高度 @@ -2668,7 +2668,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements String sampleFileName = analyseData.getSampleFileNames().get(0); BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } map = BetaGammaAnalyzeCurrentProcess(analyseData, betaDataFile); @@ -3231,7 +3231,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements Cache cache = betaCache.getBetaCache(); BetaDataFile betaDataFile = cache.getIfPresent(sampleFileName + "-" + userName); if (Objects.isNull(betaDataFile)) { - result.error500("请先加载文件基础信息!"); + result.error500("Load basic file information first!"); return result; } Map map = new HashMap<>(); From f4319af3629a354ba9d265123a6b07f415e41452 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Wed, 8 Nov 2023 10:11:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?gamma=E7=94=9F=E6=88=90RRR=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E5=89=8D=E8=B0=83=E7=94=A8=E5=88=86=E6=9E=90=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E8=BF=9B=E8=A1=8C=E5=88=86=E6=9E=90=20beta=E9=87=8D?= =?UTF-8?q?=E6=96=B0=E5=88=86=E6=9E=90=E8=AE=A1=E7=AE=97=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=95=B0=E7=BB=84=E7=A9=BA=E5=80=BC=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/common/util/PHDFileUtil.java | 91 ++++++++++++++----- .../service/impl/GammaServiceImpl.java | 11 ++- 2 files changed, 73 insertions(+), 29 deletions(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java index 50506640..28d84f59 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java @@ -840,10 +840,17 @@ public class PHDFileUtil extends AbstractLogOrReport { gammaCalibrationSpectrumList.add(gammaCalibrationS); } 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)); + if (bgAnalyseResult.s_g_fitting_c_e.size() < 0) { + gammaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType()); + gammaCalibrationS.setCoeff1(Double.valueOf(gammaFittingPara.get(0))); + gammaCalibrationS.setCoeff2(Double.valueOf(gammaFittingPara.get(1))); + gammaCalibrationS.setCoeff3(Double.valueOf(gammaFittingPara.get(2))); + } else { + 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)); + } gammaCalibrationSpectrumList.add(gammaCalibrationS); } if (betaDataFile.isBGammaEnergyValidGas()) { @@ -855,10 +862,18 @@ public class PHDFileUtil extends AbstractLogOrReport { gammaCalibrationSpectrumList.add(gammaCalibrationG); } 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)); + if (bgAnalyseResult.g_g_fitting_c_e.size() < 0) { + gammaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType()); + gammaCalibrationG.setCoeff1(Double.valueOf(gammaFittingPara.get(0))); + gammaCalibrationG.setCoeff2(Double.valueOf(gammaFittingPara.get(1))); + gammaCalibrationG.setCoeff3(Double.valueOf(gammaFittingPara.get(2))); + } else { + 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)); + } + gammaCalibrationSpectrumList.add(gammaCalibrationG); } if (betaDataFile.isBGammaEnergyValidDet()) { @@ -870,10 +885,17 @@ public class PHDFileUtil extends AbstractLogOrReport { gammaCalibrationSpectrumList.add(gammaCalibrationD); } 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)); + if (bgAnalyseResult.d_g_fitting_c_e.size() < 0) { + gammaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType()); + gammaCalibrationD.setCoeff1(Double.valueOf(gammaFittingPara.get(0))); + gammaCalibrationD.setCoeff2(Double.valueOf(gammaFittingPara.get(1))); + gammaCalibrationD.setCoeff3(Double.valueOf(gammaFittingPara.get(2))); + } else { + 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)); + } gammaCalibrationSpectrumList.add(gammaCalibrationD); } betaDataFile.setGammaCalibrationSpectrumList(gammaCalibrationSpectrumList); @@ -889,10 +911,17 @@ public class PHDFileUtil extends AbstractLogOrReport { betaCalibrationSpectrumList.add(betaCalibrationS); } 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)); + if (bgAnalyseResult.s_b_fitting_c_e.size() < 0) { + betaCalibrationS.setDataType(DataTypeAbbr.SAMPLEPHD.getType()); + betaCalibrationS.setCoeff1(Double.valueOf(betaFittingPara.get(0))); + betaCalibrationS.setCoeff2(Double.valueOf(betaFittingPara.get(1))); + betaCalibrationS.setCoeff3(Double.valueOf(betaFittingPara.get(2))); + } else { + 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)); + } betaCalibrationSpectrumList.add(betaCalibrationS); } if (betaDataFile.isBBetaEnergyValidGas()) { @@ -904,10 +933,17 @@ public class PHDFileUtil extends AbstractLogOrReport { betaCalibrationSpectrumList.add(betaCalibrationG); } 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)); + if (bgAnalyseResult.g_b_fitting_c_e.size() < 0) { + betaCalibrationG.setDataType(DataTypeAbbr.GASBKPHD.getType()); + betaCalibrationG.setCoeff1(Double.valueOf(betaFittingPara.get(0))); + betaCalibrationG.setCoeff2(Double.valueOf(betaFittingPara.get(1))); + betaCalibrationG.setCoeff3(Double.valueOf(betaFittingPara.get(2))); + } else { + 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)); + } betaCalibrationSpectrumList.add(betaCalibrationG); } if (betaDataFile.isBBetaEnergyValidDet()) { @@ -919,10 +955,17 @@ public class PHDFileUtil extends AbstractLogOrReport { betaCalibrationSpectrumList.add(betaCalibrationD); } 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)); + if (bgAnalyseResult.d_b_fitting_c_e.size() < 0) { + betaCalibrationD.setDataType(DataTypeAbbr.DETBKPHD.getType()); + betaCalibrationD.setCoeff1(Double.valueOf(betaFittingPara.get(0))); + betaCalibrationD.setCoeff2(Double.valueOf(betaFittingPara.get(1))); + betaCalibrationD.setCoeff3(Double.valueOf(betaFittingPara.get(2))); + } else { + 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)); + } betaCalibrationSpectrumList.add(betaCalibrationD); } betaDataFile.setBetaCalibrationSpectrumList(betaCalibrationSpectrumList); 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 0d98087d..c774fa9c 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 @@ -722,8 +722,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi phd.getMapNucActMda().get(str_key).setEfficiency(nuclLinesIdedSpectrum.getEffic()); phd.getMapNucActMda().get(str_key).setEffi_err(nuclLinesIdedSpectrum.getUnEffic()); phd.getMapNucActMda().get(str_key).setMda(nuclLinesIdedSpectrum.getMda()); - phd.getMapNucActMda().get(str_key).setMdc(nuclLinesIdedSpectrum.getMdc().equalsIgnoreCase("inf") ? 0.0 : Double.valueOf(nuclLinesIdedSpectrum.getMdc())); - phd.getMapNucActMda().get(str_key).setConcentration(nuclLinesIdedSpectrum.getConcentration().equalsIgnoreCase("inf") ? 0.0 : Double.valueOf(nuclLinesIdedSpectrum.getConcentration())); + phd.getMapNucActMda().get(str_key).setMdc(nuclLinesIdedSpectrum.getMdc().equalsIgnoreCase("inf") ? null : Double.valueOf(nuclLinesIdedSpectrum.getMdc())); + phd.getMapNucActMda().get(str_key).setConcentration(nuclLinesIdedSpectrum.getConcentration().equalsIgnoreCase("inf") ? null : Double.valueOf(nuclLinesIdedSpectrum.getConcentration())); if (phd.getMapNucActMda().get(str_key).getActivity() > 0) { phd.getMapNucActMda().get(str_key).setBCalculateMDA(true); } @@ -1244,7 +1244,6 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi insertInput.curChan = curChan; insertInput.vCount = m_vCount; StructInsertOutput structInsertOutput = CalValuesHandler.insertPeaks(insertInput); - List newPeak = new LinkedList<>(); List newPeaks = new LinkedList<>(); newPeaks.addAll(phd.getVPeak()); if (structInsertOutput.vIdx.size() > 0) { @@ -1256,9 +1255,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi PeakInfo peak = new PeakInfo(); peak.index = a + 1; peak.left = structInsertOutput.vLeft.get(j).intValue(); - ; peak.right = structInsertOutput.vRight.get(j).intValue(); - ; peak.peakCentroid = structInsertOutput.peakCentroid.get(j); peak.energy = structInsertOutput.energy.get(j); peak.area = structInsertOutput.area.get(j); @@ -3790,6 +3787,10 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi result.error500("Please select the parse file first！"); return result; } + //分析gamma文件 + Map nuclideLinesMap = (Map) redisUtil.get(userName+"-"+phd.getHeader().getSystem_type());//GetNuclideLines(nuclides); + gammaFileUtil.AnalyseSpectrum(phd, nuclideLinesMap); + //生成对应报告内容 String reportContent = gammaFileUtil.GetReportContent(phd, userName, false, "log"); result.setSuccess(true); result.setResult(reportContent);