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

Compare commits

base: xiaoguangbin:d64a0be200f3444c281a5a49108aa8e4f73ded1b
Branches Tags
xiaoguangbin:mdc
xiaoguangbin:SelfStation
xiaoguangbin:SelfStation-pgsql
xiaoguangbin:SelfStation-testdll
xiaoguangbin:mdc-merge
xiaoguangbin:sleepDownload
xiaoguangbin:noFtp-seflStation
xiaoguangbin:noFtp
xiaoguangbin:noFtp-F
xiaoguangbin:onlyDownload
xiaoguangbin:master
..
compare: xiaoguangbin:1f94e14a704322645e7aa9c6cc14fe6ba296426d
Branches Tags
xiaoguangbin:SelfStation
xiaoguangbin:mdc
xiaoguangbin:SelfStation-pgsql
xiaoguangbin:SelfStation-testdll
xiaoguangbin:mdc-merge
xiaoguangbin:sleepDownload
xiaoguangbin:noFtp-seflStation
xiaoguangbin:noFtp
xiaoguangbin:noFtp-F
xiaoguangbin:onlyDownload
xiaoguangbin:master

No commits in common. "d64a0be200f3444c281a5a49108aa8e4f73ded1b" and "1f94e14a704322645e7aa9c6cc14fe6ba296426d" have entirely different histories.
d64a0be200 ... 1f94e14a70

1 changed files with 1 additions and 8 deletions
Show Stats Expand all files Collapse all files

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

@ -1,9 +1,6 @@
package org.jeecg.modules.controller; package org.jeecg.modules.controller;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -20,7 +17,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -59,10 +55,7 @@ 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, HttpServletRequest request) {
if (StrUtil.isBlank(roiParams)) { ArrayList<ROIParam> roiParamList = (ArrayList<ROIParam>) new Gson().fromJson(roiParams, List.class);
return Result.error("roiParams cannot be empty!");
}
List<ROIParam> roiParamList = JSONArray.parseArray(roiParams, ROIParam.class);
return selfStationService.updateROI(roiParamList, sampleFileName, request); return selfStationService.updateROI(roiParamList, sampleFileName, request);
} }