技术监督退运流程

2024-04-16 15:10:54 +08:00
parent dfd38dbb24
commit ba2df7c268
13 changed files with 644 additions and 27 deletions
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RFlowProcessController.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RFlowProcessController.java
@@ -0,0 +1,100 @@
+package com.njcn.process.controller;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.minioss.bo.MinIoUploadResDTO;
+import com.njcn.oss.constant.OssPath;
+import com.njcn.oss.utils.FileStorageUtil;
+import com.njcn.process.pojo.param.RFlowProcessParm;
+import com.njcn.process.service.RFlowProcessPOService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2022/11/11  14:50【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+@Slf4j
+@RestController
+@RequestMapping("/rFlowProcess")
+@Api(tags = "申请单")
+@AllArgsConstructor
+public class RFlowProcessController extends BaseController {
+
+    private final RFlowProcessPOService rFlowProcessPOService;
+    private final FileStorageUtil fileStorageUtil;
+
+    /**
+     * @Description: 新增申请单
+     * @Param: [rGeneralSurveyPlanAddParm]
+     * @return: com.njcn.common.pojo.response.HttpResult<java.lang.Boolean>
+     * @Author: clam
+     * @Date: 2022/11/22
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/add")
+    @ApiOperation("新增申请单")
+    @ApiImplicitParam(name = "rFlowProcessParm", value = "新增普测计划参数", required = true)
+    public HttpResult<Boolean> add(@RequestBody @Validated RFlowProcessParm rFlowProcessParm) {
+        String methodDescribe = getMethodDescribe("add");
+        Boolean addFlag = rFlowProcessPOService.add(rFlowProcessParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, addFlag, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/update")
+    @ApiOperation("更新申请单")
+    @ApiImplicitParam(name = "rFlowProcessParm", value = "新增普测计划参数", required = true)
+    public HttpResult<Boolean> update(@RequestBody @Validated RFlowProcessParm.RFlowProcessUpdate rFlowProcessParm) {
+        String methodDescribe = getMethodDescribe("update");
+        Boolean addFlag = rFlowProcessPOService.update(rFlowProcessParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, addFlag, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/check")
+    @ApiOperation("审核申请单")
+    @ApiImplicitParam(name = "rFlowProcessCheck", value = "新增普测计划参数", required = true)
+    public HttpResult<Boolean> check(@RequestBody @Validated RFlowProcessParm.RFlowProcessCheck rFlowProcessCheck) {
+        String methodDescribe = getMethodDescribe("check");
+        Boolean addFlag = rFlowProcessPOService.check(rFlowProcessCheck);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, addFlag, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/file")
+    @ApiOperation("归档")
+    public HttpResult<Boolean> file(@RequestParam String id) {
+        String methodDescribe = getMethodDescribe("file");
+        Boolean addFlag = rFlowProcessPOService.file(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, addFlag, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPLOAD)
+    @PostMapping("/uploadFile")
+    @ApiOperation("上传文件")
+    @ApiImplicitParam(name = "file", value = "文件", required = true)
+    public HttpResult<MinIoUploadResDTO> uploadFile(@RequestParam("file") MultipartFile file){
+        String methodDescribe = getMethodDescribe("uploadFile");
+        String filePath = fileStorageUtil.getFileUrl( fileStorageUtil.uploadMultipart(file, OssPath.ELECTRICITY_QUALITY));
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,new MinIoUploadResDTO(file.getOriginalFilename(),filePath), methodDescribe);
+    }
+
+
+}
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowDefinitionController.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowDefinitionController.java
@@ -7,24 +7,15 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.process.pojo.dto.flowable.FlowProcDefDto;
 import com.njcn.process.pojo.dto.flowable.FlowSaveXmlVo;
 import com.njcn.process.service.flowable.IFlowDefinitionService;
-import com.njcn.process.service.flowable.IFlowTaskService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
-import org.flowable.common.engine.api.FlowableObjectNotFoundException;
-import org.flowable.engine.HistoryService;
 import org.flowable.engine.RepositoryService;
-import org.flowable.engine.RuntimeService;
-import org.flowable.engine.TaskService;
-import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.repository.Deployment;
 import org.flowable.engine.repository.ProcessDefinition;
-import org.flowable.engine.runtime.ProcessInstance;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

 import java.io.ByteArrayInputStream;
@@ -35,8 +26,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;

-import static cn.hutool.core.util.CharsetUtil.UTF_8;
-
 /**
 * pqs
 * 工作流
--- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowTaskController.java
+++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowTaskController.java
@@ -15,15 +15,8 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.Map;

 /**
@@ -53,6 +46,13 @@ public class FlowTaskController extends BaseController {
        return null;
    }

+    @ApiOperation(value = "工作流_流转")
+    @PostMapping(value = "/toNextTaskUser")
+    public HttpResult toNextTaskUser(@RequestBody FlowTaskVo flowTaskVo) {
+        flowTaskService.toNextTaskUser(flowTaskVo);
+        return null;
+    }
+


    /**