From e89fca372bafd4fb601747688281d57b31023c1c Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Thu, 7 Dec 2023 15:31:37 +0800 Subject: [PATCH] =?UTF-8?q?beta=EF=BC=8Cgamma=E5=90=91redis=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=E6=97=B6=EF=BC=8C=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=BE=97=E5=88=B0=E7=9A=84=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E7=BC=93=E5=AD=98=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/service/impl/GammaServiceImpl.java | 8 +++----- .../modules/service/impl/SpectrumAnalysisServiceImpl.java | 8 +++----- 2 files changed, 6 insertions(+), 10 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 c6d46bd7..56d57515 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java @@ -140,6 +140,8 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi private IGardsQcCheckSpectrumService qcCheckSpectrumService; @Autowired private IGardsAnalySettingSpectrumService analySettingSpectrumService; + @Autowired + private RedisStreamUtil redisStreamUtil; @Override public Result initValue(Integer sampleId, String dbName, String analyst, String samfileName, HttpServletRequest request) { @@ -4617,13 +4619,9 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi nuclides.put(middleData.nucl_ided_Nuclidename.get(i), middleData.nucl_ided_Concentration.get(i)); } info.setNuclides(nuclides); - RedisStreamUtil.class.newInstance().pushAnalysis(info); + redisStreamUtil.pushAnalysis(info); } catch (ParseException e) { throw new RuntimeException(e); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException 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 9119f892..f19683e5 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 @@ -112,6 +112,8 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements private IGardsSpectrumSpectrumService spectrumService; @Autowired private IGardsHistogramSpectrumService histogramService; + @Autowired + private RedisStreamUtil redisStreamUtil; @Override @@ -3905,13 +3907,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements } } info.setNuclides(nuclides); - RedisStreamUtil.class.newInstance().pushAnalysis(info); + redisStreamUtil.pushAnalysis(info); } catch (ParseException e) { throw new RuntimeException(e); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); } }