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