From cdd9ef1a308e2cb258ec00512ca24e1f034e710b Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 11 Mar 2024 09:16:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=94=B9=E4=B8=BA=E6=97=A0=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/controller/GammaController.java | 4 ++-- .../modules/controller/SpectrumAnalysesController.java | 4 ++-- .../java/org/jeecg/modules/service/IGammaService.java | 2 +- .../jeecg/modules/service/ISpectrumAnalysisService.java | 2 +- .../org/jeecg/modules/service/impl/GammaServiceImpl.java | 8 +++----- .../modules/service/impl/SpectrumAnalysisServiceImpl.java | 6 +++--- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java index 483b6765..2fd05653 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java @@ -29,8 +29,8 @@ public class GammaController { @GetMapping("initValue") @ApiOperation(value = "初始化gamma数据", notes = "初始化gamma数据") - public Result initValue(Integer sampleId, String dbName, String analyst, String fileName, HttpServletRequest request) { - return gammaService.initValue(sampleId, dbName, analyst, fileName, request); + public void initValue(Integer sampleId, String dbName, String analyst, String fileName, HttpServletRequest request) { + gammaService.initValue(sampleId, dbName, analyst, fileName, request); } 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 9a923ae3..936c02e9 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 @@ -26,8 +26,8 @@ public class SpectrumAnalysesController { @GetMapping("initValue") @ApiOperation(value = "初始化数据", notes = "初始化数据") - public Result initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) { - return spectrumAnalysisService.initValue(dbName, sampleId, analyst, sampleFileName, gasFileName, detFileName, qcFileName, request); + public void initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) { + spectrumAnalysisService.initValue(dbName, sampleId, analyst, sampleFileName, gasFileName, detFileName, qcFileName, request); } @GetMapping("getDBSearchList") diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java index ea573b19..205d57ec 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java @@ -15,7 +15,7 @@ import java.util.List; public interface IGammaService{ - Result initValue(Integer sampleId, String dbName, String analyst, String fileName, HttpServletRequest request); + void initValue(Integer sampleId, String dbName, String analyst, String fileName, HttpServletRequest request); Result testFun(String fileName, HttpServletRequest request); 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 39dac872..15ff5d0a 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 @@ -14,7 +14,7 @@ import java.util.List; public interface ISpectrumAnalysisService { - Result initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request); + void initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request); Result getDBSearchList(HttpServletRequest request, boolean AllUsers, String sampleType); 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 bd0fe6e8..54f6cd89 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 @@ -156,14 +156,12 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi private IDataService dataService; @Override - public Result initValue(Integer sampleId, String dbName, String analyst, String samfileName, HttpServletRequest request) { - Result result = new Result(); + public void initValue(Integer sampleId, String dbName, String analyst, String samfileName, HttpServletRequest request) { if (Objects.nonNull(sampleId) && StringUtils.isNotBlank(dbName)) { - result = this.gammaByDB(dbName, sampleId, analyst, request); + gammaByDB(dbName, sampleId, analyst, request); } else { - result = this.gammaByFile(samfileName, request); + gammaByFile(samfileName, request); } - return result; } @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 86f642b6..5b7bc57d 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 @@ -125,11 +125,11 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements @Override - public Result initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) { + public void initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String gasFileName, String detFileName, String qcFileName, HttpServletRequest request) { if (StringUtils.isNotBlank(dbName) && Objects.nonNull(sampleId)) { - return getDBSpectrumChart(dbName, sampleId, analyst, request); + getDBSpectrumChart(dbName, sampleId, analyst, request); } else { - return getFileSpectrumChart(sampleFileName, gasFileName, detFileName, qcFileName, request); + getFileSpectrumChart(sampleFileName, gasFileName, detFileName, qcFileName, request); } }