Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb_21

jinpengyong

2023-08-23 8c741905bff160816524a54df00a4acca684b770

 screen-api/src/main/java/com/moral/api/controller/SupervisionController.java

@@ -5,17 +5,21 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
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;
@@ -32,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());
@@ -42,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"),
@@ -51,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());
        }

@@ -61,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());
@@ -69,4 +80,14 @@
        return ResultMessage.ok();
    }

    @ApiOperation(value = "删除督办单", notes = "删除督办单")
    @GetMapping("delete")
    public ResultMessage delete(Integer supervisionId) {
        if (ObjectUtils.isEmpty(supervisionId)) {
            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
        }
        supervisionService.deleteSupervision(supervisionId);
        return ResultMessage.ok();
    }

}