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 e072f946..08d144b6 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 @@ -1,6 +1,9 @@ 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; @@ -17,6 +20,7 @@ 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; @@ -55,7 +59,10 @@ public class SelfStationController { @PutMapping("updateROI") @ApiOperation(value = "更新ROI范围", notes = "更新ROI范围") public Result updateROI(@RequestParam String roiParams, @RequestParam String sampleFileName, HttpServletRequest request) { - ArrayList roiParamList = (ArrayList) new Gson().fromJson(roiParams, List.class); + if (StrUtil.isBlank(roiParams)) { + return Result.error("roiParams cannot be empty!"); + } + List roiParamList = JSONArray.parseArray(roiParams, ROIParam.class); return selfStationService.updateROI(roiParamList, sampleFileName, request); }