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

人工交互模块初始化数据接口改为无返回值

Browse Source
This commit is contained in:
qiaoqinzheng 2024-03-11 09:16:38 +08:00
parent fdd3838e9b
commit cdd9ef1a30
6 changed files with 12 additions and 14 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/GammaController.java
View File

@ -29,8 +29,8 @@ public class GammaController {
@GetMapping("initValue") @GetMapping("initValue")
@ApiOperation(value = "初始化gamma数据", notes = "初始化gamma数据") @ApiOperation(value = "初始化gamma数据", notes = "初始化gamma数据")
public Result initValue(Integer sampleId, String dbName, String analyst, String fileName, HttpServletRequest request) { public void initValue(Integer sampleId, String dbName, String analyst, String fileName, HttpServletRequest request) {
return gammaService.initValue(sampleId, dbName, analyst, fileName, request); gammaService.initValue(sampleId, dbName, analyst, fileName, request);
} }

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

@ -26,8 +26,8 @@ public class SpectrumAnalysesController {
@GetMapping("initValue") @GetMapping("initValue")
@ApiOperation(value = "初始化数据", notes = "初始化数据") @ApiOperation(value = "初始化数据", notes = "初始化数据")
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) {
return spectrumAnalysisService.initValue(dbName, sampleId, analyst, sampleFileName, gasFileName, detFileName, qcFileName, request); spectrumAnalysisService.initValue(dbName, sampleId, analyst, sampleFileName, gasFileName, detFileName, qcFileName, request);
} }
@GetMapping("getDBSearchList") @GetMapping("getDBSearchList")

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

@ -15,7 +15,7 @@ import java.util.List;
public interface IGammaService{ 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); Result testFun(String fileName, HttpServletRequest request);

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

@ -14,7 +14,7 @@ import java.util.List;
public interface ISpectrumAnalysisService { 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); Result getDBSearchList(HttpServletRequest request, boolean AllUsers, String sampleType);

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

@ -156,14 +156,12 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
private IDataService dataService; private IDataService dataService;
@Override @Override
public Result initValue(Integer sampleId, String dbName, String analyst, String samfileName, HttpServletRequest request) { public void initValue(Integer sampleId, String dbName, String analyst, String samfileName, HttpServletRequest request) {
Result result = new Result();
if (Objects.nonNull(sampleId) && StringUtils.isNotBlank(dbName)) { if (Objects.nonNull(sampleId) && StringUtils.isNotBlank(dbName)) {
result = this.gammaByDB(dbName, sampleId, analyst, request); gammaByDB(dbName, sampleId, analyst, request);
} else { } else {
result = this.gammaByFile(samfileName, request); gammaByFile(samfileName, request);
} }
return result;
} }
@Override @Override

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

@ -125,11 +125,11 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport implements
@Override @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)) { if (StringUtils.isNotBlank(dbName) && Objects.nonNull(sampleId)) {
return getDBSpectrumChart(dbName, sampleId, analyst, request); getDBSpectrumChart(dbName, sampleId, analyst, request);
} else { } else {
return getFileSpectrumChart(sampleFileName, gasFileName, detFileName, qcFileName, request); getFileSpectrumChart(sampleFileName, gasFileName, detFileName, qcFileName, request);
} }
} }