bak 修改 获取版本数据前

kimi

2020-05-18 c8aee7b9bfd79cfd741d7e5692520f4f51a31a86

 src/main/java/com/highdatas/mdm/controller/ActivitiController.java

@@ -3,22 +3,21 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.highdatas.mdm.entity.Flows;
import com.highdatas.mdm.entity.Maintain;
import com.highdatas.mdm.entity.MaintainField;
import com.highdatas.mdm.entity.TUser;
import com.highdatas.mdm.entity.*;
import com.highdatas.mdm.mapper.FlowsMapper;
import com.highdatas.mdm.pojo.*;
import com.highdatas.mdm.service.*;
import com.highdatas.mdm.service.act.*;
import com.highdatas.mdm.util.Constant;
import com.highdatas.mdm.util.DbUtils;
import com.highdatas.mdm.util.TodoClient;
import lombok.extern.slf4j.Slf4j;
import org.activiti.engine.history.HistoricActivityInstance;
import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.task.Task;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
@@ -74,6 +73,12 @@
    IMaintainFieldService maintainFieldService;
    @Autowired
    ISysFieldService fieldService;
    @Autowired
    TodoClient client;
    @Autowired
    IMenuMappingService menuMappingService;



    @RequestMapping(value = "/list/{pageNo}", method = RequestMethod.GET)
    public Result<List<Map<String, Object>>> list(@PathVariable Integer pageNo, HttpServletRequest request) {
@@ -96,10 +101,13 @@
        }
        return fieldService.getPagedDataByList(list, pageNo, size);
    }

    @RequestMapping(value = "/img/{modelId}", method = RequestMethod.GET)
    public void image(@PathVariable String modelId, HttpServletResponse response)  {
        InputStream is = repositoryService.getModelImg(modelId);

        if (is == null) {
            return;
        }
        response.setHeader("Content-Type", "image/png");
        try{
            OutputStream outputStream = response.getOutputStream();
@@ -108,11 +116,9 @@
            while ((len = is.read(b, 0, 1024)) != -1) {
                outputStream.write(b, 0, len);
            }
        }
        catch (Exception e) {
        } catch (Exception e) {
            e.printStackTrace();
        }
        finally {
        } finally {
            if (is != null) {
                try {
                    is.close();
@@ -124,6 +130,7 @@
        }

    }

    @RequestMapping(value = "/deleteModel/{modelId}", method = RequestMethod.GET)
    public Result deleteModel(@PathVariable String modelId)  {
        boolean b = repositoryService.deleteModel(modelId);
@@ -133,6 +140,7 @@
            return Result.error(CodeMsg.DELETE_ERROR);
        }
    }

    @RequestMapping(value = "/processlist", method = RequestMethod.GET)
    public Result<Result<JSONArray>> processlist(HttpServletRequest request)  {
        Result<JSONArray> processList   = repositoryService.getProcessList();
@@ -145,13 +153,18 @@
        return Result.success(processList);
    }


    @RequestMapping(value = "/start/{key}", method = RequestMethod.GET)
    public Result<Object> start(@PathVariable String key,@RequestParam String businessId, HttpServletRequest request)  {
        if (StringUtils.isEmpty(key)) {
            return Result.error(new CodeMsg(1000, "key is not found"));
    @RequestMapping(value = "/started", method = RequestMethod.POST)
    public Result<Object> startRun(@RequestBody JSONArray result) {
        for (int i = 0; i < result.size(); i++) {
            String flowId = result.getString(i);
            log.info(flowId);
        }
        String desp = request.getParameter("desp");
        return Result.success(null);
    }

    @RequestMapping(value = "/startRun/{key}", method = RequestMethod.GET)
    public Result<Object> startRun(@PathVariable String key, @RequestParam String businessId, HttpServletRequest request) {
        TUser user = DbUtils.getUser(request);
        String businessType = request.getParameter("businessType");
        ActivitiBusinessType type;
        if (StringUtils.isEmpty(businessType)) {
@@ -159,28 +172,79 @@
        } else {
            type = ActivitiBusinessType.valueOf(businessType);
        }
        String content;
        if (type.equals(ActivitiBusinessType.maintain)) {
            Maintain maintain = maintainService.selectById(businessId);
            SysMenu menuByTableName = menuMappingService.getMenuByTableName(maintain.getTableName());
            content = menuByTableName.getName() + "主题新增版本需要审批";
        } else {
            MaintainField maintainField = maintainFieldService.selectById(businessId);
            SysMenu menuByTableName = menuMappingService.getMenuByTableName(maintainField.getTableName());
            content = menuByTableName.getName() + "主题修改字段需要审批";
        }
        boolean open = client.open(key, businessId, content, user.getUserId(), type);
        if (open) {
            return Result.success(CodeMsg.SUCCESS);
        } else {
            return Result.error(CodeMsg.Client_fail);
        }
    }

    @RequestMapping(value = "/start/{key}", method = RequestMethod.POST)
    public Result<Object> start(@PathVariable String key, @RequestBody JSONObject reqObj, HttpServletRequest request) {
        log.info("process start..");
        if (StringUtils.isEmpty(key)) {
            return Result.error(new CodeMsg(1000, "key is not found"));
        }

        String businessId = reqObj.getString("businessId");
        if (StringUtils.isEmpty(businessId)) {
            return Result.error(new CodeMsg(1000, "businessId is not found"));
        }
        String businessType = reqObj.getString("businessType");
        JSONObject variableObj = reqObj.getJSONObject("variableMap");
        Map<String, Object> variableMap = new HashMap<>();
        if (variableObj != null) {
            variableMap = DbUtils.JsonObjectToHashMap(variableObj);
        }
        ActivitiBusinessType type;
        if (StringUtils.isEmpty(businessType)) {
            type = ActivitiBusinessType.maintain;
        } else {
            type = ActivitiBusinessType.valueOf(businessType);
        }
        Object descObj = variableMap.get("desc");
        String desc;
        if (descObj == null) {
            desc = "创建新版本";
        } else {
            desc = descObj.toString();
        }
        HttpSession session = request.getSession();
        Flows flows = activitiService.start(key, session, businessId, type);
        Date startDate = new Date();
        Flows flows = activitiService.start(key, session, businessId, type, variableMap);
        Date endDate = new Date();
        log.info("process start:" + (endDate.getTime() - startDate.getTime()) + "ms");
        if (flows == null) {
            return Result.error(CodeMsg.INSERT_ERROR);
        }  else {
            if (type.equals(ActivitiBusinessType.field)) {
                MaintainField maintainField = maintainFieldService.selectById(businessId);
                maintainField.setFlowId(flows.getId());
                maintainField.setDesp(desp);
                maintainField.setDesp(desc);
                maintainField.updateById();
                return Result.success(flows.getId());
            }
            else if (type.equals(ActivitiBusinessType.maintain)) {
            } else if (type.equals(ActivitiBusinessType.maintain)) {
                Maintain maintain = maintainService.selectById(businessId);
                maintain.setFlowId(flows.getId());
                maintain.setDesp(desp);
                maintain.setDesp(desc);
                maintain.updateById();
                return Result.success(flows.getId());
            }else if (type.equals(ActivitiBusinessType.exists)) {
            }
            startDate = new Date();
            log.info("process save status:" + (startDate.getTime() - endDate.getTime()) + "ms");
                HashMap<String, Object> body=new HashMap();
                NextTaskUserInfo nestTaskAssignee = taskService.getNestTaskAssignee(flows.getWorkflowId());

            endDate = new Date();
            log.info("process find user info:" + (endDate.getTime() - startDate.getTime()) + "ms");
                body.put("activitiId", flows.getId());
                if (nestTaskAssignee == null) {
                    body.put("roleIdList", null);
@@ -191,8 +255,6 @@
                }
                return Result.success(body);
            }
        }
        return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
    }

    @RequestMapping(value = "/status/{flowid}", method = RequestMethod.GET)
@@ -290,6 +352,7 @@
        String workflowid = flows.getWorkflowId();
        runtimeService.getDiagram(workflowid, response);
    }

    @RequestMapping(value = "/run", method = RequestMethod.GET)
    public List<Map<String, String>> runTask(HttpServletRequest request){
        historyService.setSession(request.getSession());
@@ -310,8 +373,9 @@
        return activitiService.todoTask(request.getSession(), request.getParameter(Constant.tableName), Integer.valueOf(pageNo), Integer.valueOf(pageSize));
    }

    @RequestMapping(value = "/deal/{flowid}", method = RequestMethod.GET)
    public Result doTask(@PathVariable String flowid, @RequestParam boolean pass, HttpServletRequest request)  {
    @RequestMapping(value = "/deal/{flowid}", method = RequestMethod.POST)
    @Transactional(rollbackFor = {RuntimeException.class, Error.class})
    public Result doTask(@PathVariable String flowid, @RequestBody JSONObject reqObj, HttpServletRequest request) {
        if (StringUtils.isEmpty(flowid)) {
            return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
        }
@@ -319,12 +383,22 @@
        if (flows == null) {
            return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
        }
        HttpSession session = request.getSession();
        //todo 判断当前task是否是当前人能审批的
        Boolean pass;
        try {
            pass = (boolean) reqObj.get("pass");
            if (pass == null) {
                return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
            }

        } catch (Exception e) {
            e.printStackTrace();
            return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
        }
        HashMap<String, Object> vailableMap = DbUtils.JsonObjectToHashMap(reqObj);

        HttpSession session = request.getSession();
        taskService.setSession(session);
        ActivitiStatus status = flows.getStatus();

        String workflowId = flows.getWorkflowId();
//        Task task = TimeTaskService.geTask(workflowId);
//        String id = task.getId();
@@ -334,9 +408,11 @@
        }

        String reason;
        reason = request.getParameter("reason");
        if (StringUtils.isEmpty(reason)) {
        Object reasonObj = vailableMap.get("reason");
        if (reasonObj == null) {
            reason = "确认处理";
        }else  {
            reason = reasonObj.toString();
        }
        if (taskId == null) {
            Task task = taskService.geTask(workflowId);
@@ -346,7 +422,7 @@
            taskId = task.getId();
        }

        boolean completed = taskService.completeTask(taskId, pass, reason);
        boolean completed = taskService.completeTask(taskId, pass, reason, vailableMap);

        if (completed) {
                NextTaskUserInfo nextTaskDefinition = null;
@@ -362,7 +438,6 @@
                        flows.setStatus(ActivitiStatus.close);
                    }


                    flowsService.aduitFinish(flows);

                } else {
@@ -375,7 +450,7 @@

                }
            HashMap<String, Object> body=new HashMap();
            if (flows.getBusinessType().equals(ActivitiBusinessType.exists)){

                body.put("status", flows.getStatus().name());
                if (nextTaskDefinition == null) {
                    body.put("roleIdList", null);
@@ -383,7 +458,6 @@
                } else {
                    body.put("roleIdList", nextTaskDefinition.getRoleIdList());
                    body.put("userIdList", nextTaskDefinition.getUserIdList());
                }
            }

            flows.setUpdateTime(new Date());
@@ -408,6 +482,7 @@
    public Result addActUserRole(@RequestParam String roleId, @RequestParam String userId){
        return identityService.addUserRole(roleId,userId);
    }

    @RequestMapping(value = "/deleteActUserRole")
    public Result deleteActUserRole(@RequestParam String roleId, @RequestParam String userId){
        return identityService.deleteUserRole(roleId,userId);