From d0e015e57d712bc976418eb09945085e2ef7010f Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Wed, 27 Dec 2023 11:50:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=A4=84=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E5=90=91redis=E4=B8=AD?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=B0=B1=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E6=9E=90=E5=91=98=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/jeecg/modules/base/dto/Info.java | 3 +++ .../java/org/jeecg/modules/spectrum/Sample_B_Analysis.java | 2 ++ .../java/org/jeecg/modules/spectrum/Sample_G_Analysis.java | 1 + .../org/jeecg/modules/service/impl/GammaServiceImpl.java | 1 + .../modules/service/impl/SpectrumAnalysisServiceImpl.java | 5 +++-- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/Info.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/Info.java index 83e9cb8d..cba0cc14 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/Info.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/Info.java @@ -36,6 +36,9 @@ public class Info implements Serializable{ // 谱类型 (Gamma|Beta) private String betaOrGamma; + // 分析员 + private String analyst; + // 核素名称-浓度值 private Map nuclides; diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java index 224a4296..1ab500e1 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_B_Analysis.java @@ -3,6 +3,7 @@ package org.jeecg.modules.spectrum; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.StringConstant; import org.jeecg.common.properties.SpectrumPathProperties; import org.jeecg.common.util.DateUtils; @@ -337,6 +338,7 @@ public class Sample_B_Analysis implements BlockConstant { nuclides.put(XE_133m,String.valueOf(analyseResult.Xe133m_con)); nuclides.put(XE_135,String.valueOf(analyseResult.Xe135_con)); info.setNuclides(nuclides); + info.setAnalyst(CommonConstant.REPORT_PREFIX_AUTO); spectrumServiceQuotes.getRedisStreamUtil().pushAnalysis(info); } 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 03efead5..532fcc0a 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 @@ -297,6 +297,7 @@ public class Sample_G_Analysis { nuclides.put(middleData.nucl_ided_Nuclidename.get(i), middleData.nucl_ided_Concentration.get(i)); } info.setNuclides(nuclides); + info.setAnalyst(middleData.analyses_analyst); serviceQuotes.getRedisStreamUtil().pushAnalysis(info); } catch (ParseException e) { throw new RuntimeException(e); 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 04a7155d..56217ca2 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 @@ -5116,6 +5116,7 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi nuclides.put(middleData.nucl_ided_Nuclidename.get(i), middleData.nucl_ided_Concentration.get(i)); } info.setNuclides(nuclides); + info.setAnalyst(middleData.analyses_analyst); redisStreamUtil.pushAnalysis(info); } catch (ParseException e) { throw new RuntimeException(e); 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 161cce2c..76558a79 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 @@ -4002,7 +4002,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements map.put("qc", qcData); } //发送数据到redis - pushToRedis(betaDataFile); + pushToRedis(betaDataFile, userName); result.setSuccess(true); result.setResult(map); return result; @@ -4011,7 +4011,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements /** * 分析成功数据发送到Redis */ - private void pushToRedis(BetaDataFile betaDataFile){ + private void pushToRedis(BetaDataFile betaDataFile, String userName){ try { Info info = new Info(); info.setStationId(betaDataFile.getStationId()); @@ -4037,6 +4037,7 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } } info.setNuclides(nuclides); + info.setAnalyst(userName); redisStreamUtil.pushAnalysis(info); } catch (ParseException e) { throw new RuntimeException(e);