xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

自建台站分支初始化数据返回值关键字改为void

Browse Source
This commit is contained in:
qiaoqinzheng 2024-04-26 11:25:27 +08:00
parent d5b18e57b5
commit 3a1567f853
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SelfStationController.java
View File

@ -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")

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISelfStationService.java
View File

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

6
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SelfStationServiceImpl.java
View File

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