From 2d6c5b3f4f72ae3ca6ba155ee3b85892c81f2fe0 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 14:29:02 +0800
Subject: [PATCH] fix:补充提交
---
screen-api/src/main/java/com/moral/api/controller/SupervisionController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java b/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java
index 0aa0248..b266fa9 100644
--- a/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java
@@ -12,11 +12,14 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
+import com.alibaba.fastjson.JSONObject;
import com.moral.api.entity.Supervision;
import com.moral.api.service.SupervisionService;
import com.moral.constant.ResponseCodeEnum;
@@ -33,7 +36,10 @@
private SupervisionService supervisionService;
@PostMapping("add")
- public ResultMessage add(MultipartFile[] files, Supervision supervision) {
+ public ResultMessage add(HttpServletRequest request) {
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");
+ Supervision supervision = JSONObject.parseObject(JSONObject.toJSONString(params), Supervision.class);
Map<String, Object> response = supervisionService.add(files, supervision);
if (!response.isEmpty()) {
return ResultMessage.fail(Integer.parseInt(response.get("code").toString()), response.get("msg").toString());
@@ -43,6 +49,7 @@
@ApiOperation(value = "���������������������", notes = "���������������������")
@ApiImplicitParams({
+ @ApiImplicitParam(name = "organizationId", value = "������id", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "cityCode", value = "���������", required = false, paramType = "query", dataType = "int"),
@ApiImplicitParam(name = "start", value = "������������", required = false, paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "end", value = "������������", required = false, paramType = "query", dataType = "String"),
@@ -52,7 +59,7 @@
@GetMapping("select")
public ResultMessage select(HttpServletRequest request) {
Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
- if (!params.containsKey("cityCode")) {
+ if (!params.containsKey("cityCode") && !params.containsKey("organizationId")) {
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
@@ -62,7 +69,10 @@
@ApiOperation(value = "���������������", notes = "���������������")
@PostMapping("update")
- public ResultMessage update(MultipartFile[] files, Supervision supervision) {
+ public ResultMessage update(HttpServletRequest request) {
+ Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
+ List<MultipartFile> files = ((MultipartHttpServletRequest) request).getFiles("files");
+ Supervision supervision = JSONObject.parseObject(JSONObject.toJSONString(params), Supervision.class);
Map<String, Object> response = supervisionService.updateSupervision(files, supervision);
if (!response.isEmpty()) {
return ResultMessage.fail(Integer.parseInt(response.get("code").toString()), response.get("msg").toString());
--
Gitblit v1.8.0