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); } }