From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-api/src/main/java/com/moral/api/controller/SupervisionController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 9ecaf4b..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());
@@ -63,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