Compare commits

..

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

View File

@ -1,9 +1,6 @@
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.JsonArray;
import com.google.gson.JsonObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -20,7 +17,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
@ -59,10 +55,7 @@ public class SelfStationController {
@PutMapping("updateROI")
@ApiOperation(value = "更新ROI范围", notes = "更新ROI范围")
public Result updateROI(@RequestParam String roiParams, @RequestParam String sampleFileName, HttpServletRequest request) {
if (StrUtil.isBlank(roiParams)) {
return Result.error("roiParams cannot be empty!");
}
List<ROIParam> roiParamList = JSONArray.parseArray(roiParams, ROIParam.class);
ArrayList<ROIParam> roiParamList = (ArrayList<ROIParam>) new Gson().fromJson(roiParams, List.class);
return selfStationService.updateROI(roiParamList, sampleFileName, request);
}