From 3a1567f853038b46ebfc5fa4008b96a33b447a4d Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Fri, 26 Apr 2024 11:25:27 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=BB=BA=E5=8F=B0=E7=AB=99=E5=88=86?= =?UTF-8?q?=E6=94=AF=E5=88=9D=E5=A7=8B=E5=8C=96=E6=95=B0=E6=8D=AE=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E5=85=B3=E9=94=AE=E5=AD=97=E6=94=B9=E4=B8=BA?= =?UTF-8?q?void?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/controller/SelfStationController.java | 4 ++-- .../java/org/jeecg/modules/service/ISelfStationService.java | 2 +- .../jeecg/modules/service/impl/SelfStationServiceImpl.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java index b759b6cc..7f694766 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java @@ -22,8 +22,8 @@ public class SelfStationController { @GetMapping("initValue") @ApiOperation(value = "预加载谱文件数据", notes = "预加载谱文件数据") - public Result initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String detFileName, HttpServletRequest request) { - return selfStationService.initValue(dbName, sampleId, analyst, sampleFileName, detFileName, request); + public void initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String detFileName, HttpServletRequest request) { + selfStationService.initValue(dbName, sampleId, analyst, sampleFileName, detFileName, request); } @GetMapping("loadFromDB") diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java index ced25ceb..ce1bff40 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java @@ -10,7 +10,7 @@ import java.util.List; public interface ISelfStationService { - Result initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String detFileName, HttpServletRequest request); + void initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String detFileName, HttpServletRequest request); Result loadFromDB(String dbName, Integer sampleId, String analyst, HttpServletRequest request); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java index 55bc8808..fa9b3f06 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java @@ -46,11 +46,11 @@ public class SelfStationServiceImpl implements ISelfStationService { private SpectrumAnalysisMapper spectrumAnalysisMapper; @Override - public Result initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String detFileName, HttpServletRequest request) { + public void initValue(String dbName, Integer sampleId, String analyst, String sampleFileName, String detFileName, HttpServletRequest request) { if (StringUtils.isNotBlank(dbName) && Objects.nonNull(sampleId)) { - return loadFromDB(dbName, sampleId, analyst, request); + loadFromDB(dbName, sampleId, analyst, request); } else { - return loadSelfStationByFile(sampleFileName, detFileName, request); + loadSelfStationByFile(sampleFileName, detFileName, request); } }