兰宝车间质量管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
疯狂的狮子Li
2024-04-25 2472d531f5221db0b35ed397d72e3f2981b25373 
 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java


@@ -3,11 +3,11 @@


import cn.hutool.core.bean.BeanUtil;


import cn.hutool.core.codec.Base64;


import cn.hutool.core.collection.CollUtil;


import cn.hutool.core.io.IoUtil;


import cn.hutool.core.util.ObjectUtil;


import lombok.RequiredArgsConstructor;


import lombok.SneakyThrows;


import lombok.extern.slf4j.Slf4j;


import org.apache.commons.io.IOUtils;


import org.dromara.common.core.exception.ServiceException;


import org.dromara.common.core.utils.StreamUtils;


import org.dromara.common.core.utils.StringUtils;


@@ -21,10 +21,7 @@


import org.dromara.workflow.domain.bo.ProcessInstanceBo;


import org.dromara.workflow.domain.bo.ProcessInvalidBo;


import org.dromara.workflow.domain.bo.TaskUrgingBo;


import org.dromara.workflow.domain.vo.ActHistoryInfoVo;


import org.dromara.workflow.domain.vo.GraphicInfoVo;


import org.dromara.workflow.domain.vo.ProcessInstanceVo;


import org.dromara.workflow.domain.vo.TaskVo;


import org.dromara.workflow.domain.vo.*;


import org.dromara.workflow.flowable.CustomDefaultProcessDiagramGenerator;


import org.dromara.workflow.flowable.cmd.DeleteExecutionCmd;


import org.dromara.workflow.flowable.cmd.ExecutionChildByExecutionIdCmd;


@@ -32,6 +29,7 @@


import org.dromara.workflow.flowable.strategy.FlowProcessEventHandler;


import org.dromara.workflow.service.IActHiProcinstService;


import org.dromara.workflow.service.IActProcessInstanceService;


import org.dromara.workflow.service.IWfNodeConfigService;


import org.dromara.workflow.service.IWfTaskBackNodeService;


import org.dromara.workflow.utils.QueryUtils;


import org.dromara.workflow.utils.WorkflowUtils;


@@ -54,14 +52,11 @@


import org.springframework.transaction.annotation.Transactional;




import java.awt.*;


import java.io.IOException;


import java.io.InputStream;


import java.nio.charset.StandardCharsets;


import java.util.List;


import java.util.*;


import java.util.stream.Collectors;




import static org.dromara.workflow.common.constant.FlowConstant.PROCESS_DEFINITION_ID;




/**


 * 流程实例 服务层实现


@@ -81,6 +76,7 @@


    private final ManagementService managementService;


    private final FlowEventStrategy flowEventStrategy;


    private final IWfTaskBackNodeService iWfTaskBackNodeService;


    private final IWfNodeConfigService iWfNodeConfigService;




    @Value("${flowable.activity-font-name}")


    private String activityFontName;


@@ -125,10 +121,18 @@


        }


        if (CollUtil.isNotEmpty(list)) {


            List<String> processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId);


            WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);


            List<WfNodeConfigVo> wfNodeConfigVoList = iWfNodeConfigService.selectByDefIds(processDefinitionIds);


            for (ProcessInstanceVo processInstanceVo : list) {


                if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {


                    wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(processInstanceVo.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(processInstanceVo::setWfNodeConfigVo);


                }


            }


        }


        long count = query.count();


        return new TableDataInfo<>(list, count);


        TableDataInfo<ProcessInstanceVo> build = TableDataInfo.build();


        build.setRows(list);


        build.setTotal(count);


        return build;


    }




    /**


@@ -164,10 +168,18 @@


        }


        if (CollUtil.isNotEmpty(list)) {


            List<String> processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId);


            WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);


            List<WfNodeConfigVo> wfNodeConfigVoList = iWfNodeConfigService.selectByDefIds(processDefinitionIds);


            for (ProcessInstanceVo processInstanceVo : list) {


                if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {


                    wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(processInstanceVo.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(processInstanceVo::setWfNodeConfigVo);


                }


            }


        }


        long count = query.count();


        return new TableDataInfo<>(list, count);


        TableDataInfo<ProcessInstanceVo> build = TableDataInfo.build();


        build.setRows(list);


        build.setTotal(count);


        return build;


    }




    /**


@@ -223,7 +235,7 @@


        BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);


        CustomDefaultProcessDiagramGenerator diagramGenerator = new CustomDefaultProcessDiagramGenerator();


        InputStream inputStream = diagramGenerator.generateDiagram(bpmnModel, "png", highLightedNodeList, highLightedFlows, activityFontName, labelFontName, annotationFontName, null, 1.0, true);


        return Base64.encode(IOUtils.toByteArray(inputStream));


        return Base64.encode(IoUtil.readBytes(inputStream));


    }




    /**


@@ -269,14 +281,9 @@


        map.put("taskList", taskList);


        List<ActHistoryInfoVo> historyTaskList = getHistoryTaskList(processInstanceId);


        map.put("historyList", historyTaskList);


        InputStream inputStream;


        try {


            inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), processDefinition.getResourceName());


            xml.append(IOUtils.toString(inputStream, String.valueOf(StandardCharsets.UTF_8)));


            map.put("xml", xml.toString());


        } catch (IOException e) {


            e.printStackTrace();


        }


        InputStream inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), processDefinition.getResourceName());


        xml.append(IoUtil.read(inputStream, StandardCharsets.UTF_8));


        map.put("xml", xml.toString());


        return map;


    }




@@ -666,10 +673,18 @@


        }


        if (CollUtil.isNotEmpty(list)) {


            List<String> processDefinitionIds = StreamUtils.toList(list, ProcessInstanceVo::getProcessDefinitionId);


            WorkflowUtils.setWfFormDefinitionVo(list, processDefinitionIds, PROCESS_DEFINITION_ID);


            List<WfNodeConfigVo> wfNodeConfigVoList = iWfNodeConfigService.selectByDefIds(processDefinitionIds);


            for (ProcessInstanceVo processInstanceVo : list) {


                if (CollUtil.isNotEmpty(wfNodeConfigVoList)) {


                    wfNodeConfigVoList.stream().filter(e -> e.getDefinitionId().equals(processInstanceVo.getProcessDefinitionId()) && FlowConstant.TRUE.equals(e.getApplyUserTask())).findFirst().ifPresent(processInstanceVo::setWfNodeConfigVo);


                }


            }


        }


        long count = query.count();


        return new TableDataInfo<>(list, count);


        TableDataInfo<ProcessInstanceVo> build = TableDataInfo.build();


        build.setRows(list);


        build.setTotal(count);


        return build;


    }




    /**