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 484516d3..62b6028d 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 @@ -58,12 +58,13 @@ public class SelfStationController { @PutMapping("updateROI") @ApiOperation(value = "更新ROI范围", notes = "更新ROI范围") - public Result updateROI(@RequestParam String roiParams, @RequestParam String sampleFileName, HttpServletRequest request) { + public Result updateROI(@RequestParam String roiParams, @RequestParam String sampleFileName, + @RequestParam String dataType, HttpServletRequest request) { if (StrUtil.isBlank(roiParams)) { return Result.error("roiParams cannot be empty!"); } List roiParamList = JSONArray.parseArray(roiParams, ROIParam.class); - return selfStationService.updateROI(roiParamList, sampleFileName, request); + return selfStationService.updateROI(roiParamList, sampleFileName, dataType, request); } @GetMapping("energyCalibration") 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 3fde6491..6b082749 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 @@ -21,7 +21,7 @@ public interface ISelfStationService { Result updateROI(Integer startChannel, Integer endChannel, Integer ROINum, String sampleFileName, HttpServletRequest request); - Result updateROI(List roiParams, String sampleFileName, HttpServletRequest request); + Result updateROI(List roiParams, String sampleFileName, String dataType, HttpServletRequest request); Result energyCalibration(String fileName, String currentText, Double width, 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 83b32488..04b03179 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 @@ -627,7 +627,7 @@ public class SelfStationServiceImpl implements ISelfStationService { } @Override - public Result updateROI(List roiParams, String sampleFileName, HttpServletRequest request) { + public Result updateROI(List roiParams, String sampleFileName, String dataType, HttpServletRequest request) { Result result = new Result(); Map map = new HashMap<>(); //获取用户名 @@ -640,7 +640,24 @@ public class SelfStationServiceImpl implements ISelfStationService { result.error500("Load basic file information first!"); return result; } - EnergySpectrumStruct struct = selfStationData.getSampleStruct(); + if (StrUtil.isBlank(dataType)) { + result.error500("Update failed!"); + return result; + } + EnergySpectrumStruct struct = null; + switch (dataType) { + case "SAMPLEPHD": + struct = selfStationData.getSampleStruct(); + break; + case "QCPHD": + struct = selfStationData.getQcStruct(); + break; + case "DETPHD": + struct = selfStationData.getDetStruct(); + break; + default: + break; + } for (ROIParam roiParam : roiParams) { Integer ROINum = roiParam.getRoiNum(); Map resultMap = selfStationUtil.statisticsROIList(roiParam.getStartChannel(), roiParam.getEndChannel(),