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

fix：修改 updateROI 更改其他谱失败问题

Browse Source
This commit is contained in:
xiaoguangbin 2024-08-01 19:02:58 +08:00
parent 8cac8a6099
commit 441a4ee6f6
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,12 +58,13 @@ public class SelfStationController {
@PutMapping("updateROI") @PutMapping("updateROI")
@ApiOperation(value = "更新ROI范围", notes = "更新ROI范围") @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)) { if (StrUtil.isBlank(roiParams)) {
return Result.error("roiParams cannot be empty!"); return Result.error("roiParams cannot be empty!");
} }
List<ROIParam> roiParamList = JSONArray.parseArray(roiParams, ROIParam.class); List<ROIParam> roiParamList = JSONArray.parseArray(roiParams, ROIParam.class);
return selfStationService.updateROI(roiParamList, sampleFileName, request); return selfStationService.updateROI(roiParamList, sampleFileName, dataType, request);
} }
@GetMapping("energyCalibration") @GetMapping("energyCalibration")

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

@ -21,7 +21,7 @@ public interface ISelfStationService {
Result updateROI(Integer startChannel, Integer endChannel, Integer ROINum, String sampleFileName, HttpServletRequest request); Result updateROI(Integer startChannel, Integer endChannel, Integer ROINum, String sampleFileName, HttpServletRequest request);
Result updateROI(List<ROIParam> roiParams, String sampleFileName, HttpServletRequest request); Result updateROI(List<ROIParam> roiParams, String sampleFileName, String dataType, HttpServletRequest request);
Result energyCalibration(String fileName, String currentText, Double width, HttpServletRequest request); Result energyCalibration(String fileName, String currentText, Double width, HttpServletRequest request);

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

@ -627,7 +627,7 @@ public class SelfStationServiceImpl implements ISelfStationService {
} }
@Override @Override
public Result updateROI(List<ROIParam> roiParams, String sampleFileName, HttpServletRequest request) { public Result updateROI(List<ROIParam> roiParams, String sampleFileName, String dataType, HttpServletRequest request) {
Result result = new Result(); Result result = new Result();
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
//获取用户名 //获取用户名
@ -640,7 +640,24 @@ public class SelfStationServiceImpl implements ISelfStationService {
result.error500("Load basic file information first!"); result.error500("Load basic file information first!");
return result; 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) { for (ROIParam roiParam : roiParams) {
Integer ROINum = roiParam.getRoiNum(); Integer ROINum = roiParam.getRoiNum();
Map<String, Object> resultMap = selfStationUtil.statisticsROIList(roiParam.getStartChannel(), roiParam.getEndChannel(), Map<String, Object> resultMap = selfStationUtil.statisticsROIList(roiParam.getStartChannel(), roiParam.getEndChannel(),