master
pengqiang 2021-11-10 11:24:49 +08:00
parent a27460b582
commit f6ecfcc120
15 changed files with 545 additions and 366 deletions

View File

@ -21,7 +21,7 @@ public class DeleteTaskCommand extends NeedsActiveTaskCmd<String> {
//获取当前任务的来源任务及来源节点信息
ExecutionEntity executionEntity = currentTask.getExecution();
//删除当前任务,来源任务
taskEntityManager.deleteTask(currentTask, "jumpReason", false, false);
taskEntityManager.deleteTask(currentTask, "驳回", false, false);
return executionEntity.getId();
}

View File

@ -36,8 +36,9 @@ public class ActModelController extends BaseController {
return "/admin/act_model_list";
}
@GetMapping(value = "/add")
public String add(Map<String, Object> model) {
public String add() {
return "/admin/act_model_input";
}
@ -67,6 +68,12 @@ public class ActModelController extends BaseController {
}
/**
*
*
* @param id
* @return
*/
@ResponseBody
@GetMapping(value = "/deploy")
public ResponseMsg deploy(@RequestParam("id") String id) {

View File

@ -96,7 +96,7 @@ public class ActModelEditorController implements ModelDataJsonConstants {
/**
*
*
*
* @param modelId
* @param values

View File

@ -3,6 +3,7 @@ package cn.palmte.work.controller.backend;
import cn.palmte.work.bean.ResponseMsg;
import cn.palmte.work.service.ActProcDefService;
import cn.palmte.work.utils.ActUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -25,6 +26,9 @@ public class ActProcDefController extends BaseController {
@Autowired
private ActProcDefService actProcDefService;
@Autowired
private ActUtil actUtil;
@RequestMapping("/list")
public String list(@RequestParam(value = "keywords", required = false) String keywords,
@RequestParam(value = PAGE_NUMBER, defaultValue = DEFAULT_PAGE_NUMBER) int pageNumber,
@ -57,7 +61,7 @@ public class ActProcDefController extends BaseController {
*/
@RequestMapping("/xml/{deploymentId}")
public void xml(HttpServletResponse response, @PathVariable("deploymentId") String deploymentId) throws Exception {
actProcDefService.getXmlByDeploymentId(response, deploymentId);
actUtil.responseXml(response, deploymentId);
}

View File

@ -30,6 +30,7 @@ public class ActProcInsController extends BaseController {
/**
*
*
* @param keywords
* @param pageNumber
* @param pageSize
@ -81,10 +82,16 @@ public class ActProcInsController extends BaseController {
*/
@ResponseBody
@GetMapping(value = "/startProcIns")
public ResponseMsg startProcessInstance(@RequestParam String procDefKey) throws Exception{
public ResponseMsg startProcessInstance(@RequestParam String procDefKey) {
Map<String, Object> variables = new HashMap<>();
variables.put(ActConstant.START_PROCESS_USERID, InterfaceUtil.getAdminId());
String procInsId = actProcInsService.startProcessInstance(procDefKey, variables);
String procInsId = null;
try {
procInsId = actProcInsService.startProcessInstance(procDefKey, variables);
} catch (Exception e) {
logger.error("", e);
return ResponseMsg.buildFailedMsg("流程启动失败:" + e.getMessage());
}
return ResponseMsg.buildSuccessMsg("流程启动成功", procInsId);
}

View File

@ -7,11 +7,12 @@ import java.util.Date;
@Data
public class ActHisTask {
private String taskId;
private String actName;
private String taskName;
private String assign;
private Date startTime;
private Date endTime;
private String duration;
private String comments;
private String deleteReason;
}

View File

@ -13,7 +13,7 @@ import java.util.Set;
/**
*
*
*/
@Service
public class ActListenerService {
@ -23,10 +23,15 @@ public class ActListenerService {
@Autowired
private ActTaskDefService actTaskDefService;
/**
*
*
* @param delegateTask
* @throws Exception
*/
public void create(DelegateTask delegateTask) throws Exception {
logger.info("--- {}", JSONObject.toJSONString(delegateTask));
// 每一个任务节点监听运行时都要初始化流程定义规则数据到 流程引擎中
String procDefId = delegateTask.getProcessDefinitionId();
String procInsId = delegateTask.getProcessInstanceId();
String taskDefKey = delegateTask.getTaskDefinitionKey();

View File

@ -2,11 +2,10 @@ package cn.palmte.work.service;
import cn.palmte.work.model.ActTaskDefRepository;
import cn.palmte.work.pojo.ActProcDef;
import cn.palmte.work.utils.ActUtil;
import org.activiti.bpmn.model.BpmnModel;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.repository.ProcessDefinition;
import org.activiti.image.ProcessDiagramGenerator;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -16,29 +15,22 @@ import org.springframework.transaction.annotation.Transactional;
import top.jfunc.common.db.QueryHelper;
import top.jfunc.common.db.bean.Page;
import top.jfunc.common.db.utils.Pagination;
import top.jfunc.common.utils.IoUtil;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
@Service
public class ActProcDefService {
private static final Logger logger = LoggerFactory.getLogger(ActProcDefService.class);
@Autowired
private ProcessEngine processEngine; //流程引擎对象
@Autowired
private RepositoryService repositoryService; //管理流程定义 与流程定义和部署对象相关的Service
@Autowired
private ActTaskDefRepository actTaskDefRepository;
@Autowired
private ActUtil actUtil;
@Autowired
Pagination pagination;
@ -53,35 +45,6 @@ public class ActProcDefService {
return pagination.paginate(queryHelper.getSql(), ActProcDef.class, pageNumber, pageSize);
}
public void getXmlByDeploymentId(HttpServletResponse response, String deploymentId) throws IOException {
InputStream pic=null;
try {
pic= getXmlStreamByDeploymentId(deploymentId);
byte[] b = new byte[1024];
int len = -1;
while ((len = pic.read(b, 0, 1024)) != -1) {
response.getOutputStream().write(b, 0, len);
}
}catch (Exception e){
logger.error("an exception happens in try catch statement", e);
}finally {
if(pic!=null) {
pic.close();
}
}
}
public InputStream getXmlStreamByDeploymentId(String deploymentId) throws IOException{
List<String> names = repositoryService.getDeploymentResourceNames(deploymentId);
for (String name : names) {
if(name.contains("xml") ) {
return repositoryService.getResourceAsStream(deploymentId, name);
}
}
return null;
}
/**
* png
@ -94,22 +57,11 @@ public class ActProcDefService {
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().deploymentId(deploymentId).singleResult();
// 获取bpmnModel
BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinition.getId());
try (InputStream inputStream = generateDiagramInputStream(bpmnModel, new ArrayList<>(), new ArrayList<>())){
IoUtil.copy(inputStream, response.getOutputStream());
}
actUtil.responsePng(response, bpmnModel, new ArrayList<>(), new ArrayList<>());
}
public InputStream generateDiagramInputStream(BpmnModel bpmnModel, List<String> executedActivityIdList, List<String> flowIds) {
try {
ProcessDiagramGenerator processDiagramGenerator = processEngine.getProcessEngineConfiguration().getProcessDiagramGenerator();
return processDiagramGenerator.generateDiagram(bpmnModel, "png", executedActivityIdList,
flowIds, "宋体", "微软雅黑", "黑体", null, 2.0); //使用默认配置获得流程图表生成器,并生成追踪图片字符流
} catch (Exception e) {
logger.error("an exception happens in try catch statement", e);
return null;
}
}
@Transactional(rollbackFor = Exception.class)
public void deleteDeployment(String deploymentId) {
@ -117,13 +69,20 @@ public class ActProcDefService {
actTaskDefRepository.deleteByProcDefId(processDefinition.getId());
//repositoryService.deleteDeployment(deploymentId); //不带级联的删除,此删除只能删除没有启动的流程,否则抛出异常 .act_re_deploymentact_re_procdef 和 act_ge_bytearray 三张表中相关数据都删除
repositoryService.deleteDeployment(deploymentId, true); //级联删除,不管流程是否启动,都可以删除
repositoryService.deleteDeployment(deploymentId, true); //级联删除,不管流程是否启动,都可以删除
}
/**
*
*
* @param procDefId
* @param status
*/
public void suspend(String procDefId, int status) {
if (1 == status) {
repositoryService.activateProcessDefinitionById(procDefId, true, null);
}else{
} else {
repositoryService.suspendProcessDefinitionById(procDefId, true, null);
}
}

View File

@ -1,8 +1,9 @@
package cn.palmte.work.service;
import cn.palmte.work.config.activiti.ActConstant;
import cn.palmte.work.exception.ResponseException;
import cn.palmte.work.model.ActTaskDefRepository;
import cn.palmte.work.pojo.ActProcIns;
import cn.palmte.work.utils.ActUtil;
import cn.palmte.work.utils.InterfaceUtil;
import org.activiti.bpmn.model.BpmnModel;
import org.activiti.bpmn.model.FlowNode;
@ -15,9 +16,7 @@ import org.activiti.engine.history.HistoricActivityInstance;
import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.repository.ProcessDefinition;
import org.activiti.engine.runtime.ProcessInstance;
import org.activiti.engine.task.IdentityLink;
import org.activiti.engine.task.Task;
import org.activiti.image.ProcessDiagramGenerator;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -25,13 +24,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import top.jfunc.common.db.QueryHelper;
import top.jfunc.common.db.bean.Page;
import top.jfunc.common.db.bean.Record;
import top.jfunc.common.db.utils.Pagination;
import top.jfunc.common.utils.IoUtil;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@ -54,12 +50,65 @@ public class ActProcInsService {
Pagination pagination;
@Autowired
private ActProcDefService actProcDefService;
private ActTaskDefService actTaskDefService;
@Autowired
private HistoryService historyService; //历史管理(执行完的数据的管理)
@Autowired
private ActTaskDefRepository actTaskDefRepository;
@Autowired
private ActUtil actUtil;
/**
*
*
* @param procDefKey
* @param variables
* @return
*/
public String startProcessInstance(String procDefKey, Map<String, Object> variables) throws Exception{
List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().processDefinitionKey(procDefKey).active().orderByProcessDefinitionVersion().desc().list();
if (list == null || list.isEmpty()) {
throw new Exception("procDefKey(" + procDefKey + ")未定义");
}
//取最新版本的流程定义进行启动流程实列
ProcessDefinition processDefinition = list.get(0);
//启动流程
ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefinition.getId(), variables);
String procInsId = processInstance.getProcessInstanceId();
Task task = taskService.createTaskQuery().processInstanceId(procInsId).singleResult();
if (task == null) {
throw new Exception("procDefKey(" + procDefKey + ")启动异常");
}
//设置发起人为办理人 然后完成任务 任务转入下一个审批节点
String assignee = InterfaceUtil.getAdminId() + "";
task.setAssignee(assignee);
String taskId = task.getId();
taskService.addComment(taskId, procInsId, "提交审批");
taskService.complete(taskId);
actTaskDefRepository.updateHiTaskAssign(assignee, procInsId, taskId);
actTaskDefRepository.updateHiActAssign(assignee, procInsId, taskId);
return processInstance.getId();
}
/**
*
*
* @param searchInfo
* @param pageNumber
* @param pageSize
* @return
*/
public Page<ActProcIns> list(ConcurrentHashMap<String, String> searchInfo, int pageNumber, int pageSize) {
String select = "select h.proc_inst_id_ as procInsId,h.proc_def_id_ as procDefId," +
"h.start_time_ as startTime,h.end_time_ as endTime,p.key_ as procKey," +
@ -74,12 +123,8 @@ public class ActProcInsService {
for (ActProcIns ins : list) {
//查询流程发起人
Record record = getVariable(ActConstant.START_PROCESS_USERID, ins.getProcInsId());
if (record != null) {
String userId = getStartUserId(ins.getProcInsId());
ins.setUser(accountService.getNameById(Integer.parseInt(userId)));
}
String userId = actUtil.getStartUserId(ins.getProcInsId());
ins.setUser(accountService.getNameById(Integer.parseInt(userId)));
//查询当前任务审批人
String currentTaskId = ins.getCurrentTaskId();
@ -87,56 +132,18 @@ public class ActProcInsService {
String[] split = currentTaskId.split(",");
String candidateUsers = "";
for (String taskId : split) {
List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(taskId);
for (IdentityLink identityLink : identityLinksForTask) {
if ("assignee".equals(identityLink.getType()) || "candidate".equals(identityLink.getType())) {
String userId = identityLink.getUserId();
if (StringUtils.isNotBlank(candidateUsers)) {
candidateUsers = candidateUsers + ",";
}
candidateUsers += accountService.getNameById(Integer.parseInt(userId));
}
}
candidateUsers = actUtil.getAssigneeByIdentityLink(taskId);
}
ins.setCandidateUsers(candidateUsers);
}
}
return paginate;
}
/**
*
*
* @param variableName
* @param procInsId
* @return
*/
public Record getVariable(String variableName, String procInsId) {
String sql = "select TEXT_ as text from ACT_HI_VARINST where NAME_=? and PROC_INST_ID_=?";
return pagination.findFirst(sql, variableName, procInsId);
}
public String getStartUserId(String procInsId) {
Record record = getVariable(ActConstant.START_PROCESS_USERID, procInsId);
if (record != null) {
return record.getStr("text");
}
return "0";
}
public List<Record> getVariables(String procInsId) {
String sql = "select NAME_ as name, TEXT_ as text from ACT_HI_VARINST where PROC_INST_ID_=?";
return pagination.find(sql, procInsId);
}
public void deleteProcessInstance(String procInsId, String reason) {
runtimeService.deleteProcessInstance(procInsId, reason); //作废流程
runtimeService.deleteProcessInstance(procInsId, reason);
}
@ -184,10 +191,7 @@ public class ActProcInsService {
}
BpmnModel bpmnModel = repositoryService.getBpmnModel(historicProcessInstance.getProcessDefinitionId()); // 获取bpmnModel
List<String> flowIds = this.getExecutedFlows(bpmnModel, newHisTaskInstanceList); // 获取流程已发生流转的线ID集合
try (InputStream inputStream = actProcDefService.generateDiagramInputStream(bpmnModel, executedActivityIdList, flowIds)){
IoUtil.copy(inputStream, response.getOutputStream());
}
actUtil.responsePng(response, bpmnModel, executedActivityIdList, flowIds);
} catch (Exception e) {
logger.error("an exception happens in try catch statement", e);
}
@ -274,28 +278,4 @@ public class ActProcInsService {
}
return flowIdList;
}
public String startProcessInstance(String procDefKey, Map<String, Object> variables) {
List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().processDefinitionKey(procDefKey).active().orderByProcessDefinitionVersion().desc().list();
if (list == null || list.isEmpty()) {
throw new ResponseException("procDefKey" + procDefKey + " 未定义");
}
//取最新版本的流程定义进行启动流程实列
ProcessDefinition processDefinition = list.get(0);
//启动流程
ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefinition.getId(), variables);
Task task = taskService.createTaskQuery().processInstanceId(processInstance.getProcessInstanceId()).singleResult();
if (task == null) {
throw new ResponseException("procDefKey" + procDefKey + " 启动异常");
}
//设置发起人为办理人 然后完成任务 任务转入下一个审批节点
task.setAssignee(InterfaceUtil.getAdminId() + "");
taskService.complete(task.getId());
return processInstance.getId();
}
}

View File

@ -1,13 +1,12 @@
package cn.palmte.work.service;
import cn.palmte.work.config.activiti.ActConstant;
import cn.palmte.work.config.activiti.DeleteTaskCommand;
import cn.palmte.work.config.activiti.JumpCommand;
import cn.palmte.work.model.*;
import cn.palmte.work.pojo.ActHisTask;
import cn.palmte.work.utils.ActUtil;
import cn.palmte.work.utils.InterfaceUtil;
import com.alibaba.fastjson.JSONObject;
import org.activiti.bpmn.model.FlowNode;
import org.activiti.engine.*;
import org.activiti.engine.task.IdentityLink;
import org.activiti.engine.task.Task;
@ -15,19 +14,11 @@ import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.stereotype.Service;
import top.jfunc.common.db.QueryHelper;
import top.jfunc.common.db.bean.Record;
import top.jfunc.common.db.utils.Pagination;
import javax.annotation.Resource;
import javax.persistence.EntityManager;
import javax.transaction.Transactional;
import java.lang.reflect.Method;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@Service
@ -38,107 +29,19 @@ public class ActTaskDefService {
@Autowired
private ProcessEngine processEngine; //流程引擎对象
@Autowired
private RuntimeService runtimeService; //与正在执行的流程实例和执行对象相关的Service(执行管理,包括启动、推进、删除流程实例等操作)
@Autowired
private TaskService taskService; //任务管理 与正在执行的任务管理相关的Service
@Autowired
private ActTaskDefRepository actTaskDefRepository;
@Autowired
private AccountService accountService;
@Autowired
private ActProcInsService actProcInsService;
@Resource
private ApplicationContext applicationContext;
@Autowired
private ActScriptRepository actScriptRepository;
@Autowired
Pagination pagination;
public List<ActTaskDef> findByProcDefId(String procDefId) {
List<ActTaskDef> list = actTaskDefRepository.findByProcDefId(procDefId);
for (ActTaskDef actTaskDef : list) {
ids2List(actTaskDef);
}
return list;
}
public ActTaskDef findFirstByProcDefIdAndTaskKey(String procDefId, String taskKey) {
ActTaskDef def = actTaskDefRepository.findFirstByProcDefIdAndTaskKey(procDefId, taskKey);
ids2List(def);
return def;
}
public void saveConfig(ActTaskDef taskDef) {
ActTaskDef one = actTaskDefRepository.findOne(taskDef.getId());
one.setCandidateUsers(taskDef.getCandidateUsers());
one.setCandidateRoles(taskDef.getCandidateRoles());
one.setRollbackTaskKey(taskDef.getRollbackTaskKey());
one.setEndScript(taskDef.getEndScript());
one.setRollbackScript(taskDef.getRollbackScript());
one.setLastUpdatedTime(new Date());
actTaskDefRepository.save(one);
logger.info("saveTaskConfig uerId:{}, config:{}", InterfaceUtil.getAdminId(), JSONObject.toJSONString(one));
}
private void ids2List(ActTaskDef actTaskDef) {
String candidateUsers = actTaskDef.getCandidateUsers();
List<String> userIdList = new ArrayList<>();
if (StringUtils.isNotBlank(candidateUsers)) {
userIdList = Arrays.asList(candidateUsers.split("#"));
}
actTaskDef.setCandidateUserList(userIdList);
String candidateRoles = actTaskDef.getCandidateRoles();
List<String> roleIdList = new ArrayList<>();
if (StringUtils.isNotBlank(candidateRoles)) {
roleIdList = Arrays.asList(candidateRoles.split("#"));
}
actTaskDef.setCandidateRoleList(roleIdList);
}
public Set<String> findCandidateUsers(String procDefId, String procInsId, String taskDefKey) {
ActTaskDef taskDef = findFirstByProcDefIdAndTaskKey(procDefId, taskDefKey);
if (taskDef.getTaskIndex() == ActConstant.TASK_INDEX_FIRST_USER_TASK) {
String startUserId = actProcInsService.getStartUserId(procInsId);
Set<String> res = new HashSet<>(1);
logger.info("findCandidateUsers-0-task:{}, startUserId:{}", taskDef.getTaskName(), startUserId);
res.add(startUserId);
return res;
}
List<String> resList = new ArrayList<>();
List<String> candidateUserList = taskDef.getCandidateUserList();
logger.info("findCandidateUsers-1-task:{}, userList:{}", taskDef.getTaskName(), candidateUserList);
if (!candidateUserList.isEmpty()) {
resList.addAll(candidateUserList);
}
List<String> candidateRoleList = taskDef.getCandidateRoleList();
logger.info("findCandidateUsers-2-task:{}, roleList:{}", taskDef.getTaskName(), candidateRoleList);
List<String> list = accountService.getUserIsByRole(candidateRoleList);
logger.info("findCandidateUsers-3-task:{}, userIdListByRole:{}", taskDef.getTaskName(), list);
if (!list.isEmpty()) {
resList.addAll(list);
}
Set<String> res = new HashSet<>(resList);
logger.info("findCandidateUsers-4-task:{}, resIds:{}", taskDef.getTaskName(), res);
return res;
}
@Autowired
private ActUtil actUtil;
/**
*
*
*
* @param json
*/
@ -165,7 +68,7 @@ public class ActTaskDefService {
//执行配置的审批通过脚本
int endScript = actTaskDef.getEndScript();
if (endScript != 0) {
invokeEventScript(endScript, procInsId);
actUtil.invokeEventScript(endScript, procInsId);
} else {
logger.info("未配置审批通过脚本 task:{}", actTaskDef.getTaskName());
}
@ -173,12 +76,12 @@ public class ActTaskDefService {
} else if (ActConstant.TYPE_ROLLBACK == type) {
//驳回
String rollbackTaskKey = actTaskDef.getRollbackTaskKey();
jumpToTargetTask(taskId, rollbackTaskKey);
actUtil.jumpToTargetTask(taskId, rollbackTaskKey);
//执行配置的驳回脚本
int rollbackScript = actTaskDef.getRollbackScript();
if (rollbackScript != 0) {
invokeEventScript(rollbackScript, procInsId);
actUtil.invokeEventScript(rollbackScript, procInsId);
} else {
logger.info("未配置驳回脚本 task:{}", actTaskDef.getTaskName());
}
@ -186,110 +89,27 @@ public class ActTaskDefService {
}
/**
*
*
*
* @param scriptId
* @param procInsId
* @param procIncId
* @return
*/
private void invokeEventScript(int scriptId, String procInsId) {
ActScript actScript = actScriptRepository.findOne(scriptId);
if (actScript == null) {
logger.info("脚本配置错误");
return;
}
Map<String, Object> map = new HashMap<>();
map.put(ActConstant.PROC_INS_ID, procInsId);
List<Record> variables = actProcInsService.getVariables(procInsId);
for (Record variable : variables) {
map.put(variable.getStr("name"), variable.get("text"));
}
//调用方法传递的参数
Object[] args = new Object[1];
args[0] = map;
logger.info("invokeEventScript class:{}, methond:{}, param:{}", actScript.getClassName(), actScript.getClassMethod(), map);
try {
Class<?> ownerClass = Class.forName(actScript.getClassName());
Object bean = applicationContext.getBean(ownerClass);
Class<?>[] paramsType = new Class[1];
paramsType[0] = Class.forName("java.util.Map");
//找到脚本方法对应的方法 注意有且只有一个以Map为参数的方法
Method method = ownerClass.getDeclaredMethod(actScript.getClassMethod(), paramsType);
method.invoke(bean, args);
} catch (Exception e) {
logger.error("", e);
}
}
/**
*
*
* @param currentTaskId id
* @param targetTaskDefKey key
*/
public void jumpToTargetTask(String currentTaskId, String targetTaskDefKey) {
Task currentTask = taskService.createTaskQuery().taskId(currentTaskId).singleResult();
// 获取流程定义
org.activiti.bpmn.model.Process process = repositoryService.getBpmnModel(currentTask.getProcessDefinitionId()).getMainProcess();
//获取目标节点定义
FlowNode targetNode = (FlowNode) process.getFlowElement(targetTaskDefKey);
ManagementService managementService = processEngine.getManagementService();
//删除当前运行任务
String executionEntityId = managementService.executeCommand(new DeleteTaskCommand(currentTask.getId()));
//流程执行到来源节点
managementService.executeCommand(new JumpCommand(targetNode, executionEntityId));
Task singleResult = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
singleResult.setParentTaskId(currentTask.getTaskDefinitionKey());
taskService.saveTask(singleResult);
}
public List<ActHisTask> hisTaskList(String procIncId) {
String select = "select ht.ID_ as hisInstanceId, ht.PROC_DEF_ID_ as procDefinitionId, ht.PROC_INST_ID_ as procInstanceId, ht.EXECUTION_ID_ as executionId," +
" ht.ACT_ID_ as actId, ht.TASK_ID_ as taskId, ht.CALL_PROC_INST_ID_ as callProcInstanceId, ht.ACT_NAME_ as actName, " +
"ht.ACT_TYPE_ as actType, ht.ASSIGNEE_ as assignee, ht.START_TIME_ as startTime, ht.END_TIME_ as endTime, " +
"ht.DURATION_ as duration, ht.DELETE_REASON_ as deleteReason, ht.TENANT_ID_ as tenantId, hc.MESSAGE_ AS comments";
QueryHelper queryHelper = new QueryHelper(select, " ACT_HI_ACTINST ht " +
" LEFT JOIN ACT_HI_COMMENT hc on ht.TASK_ID_ = hc.TASK_ID_ and hc.type_='comment' ");
queryHelper.addCondition("ht.TASK_ID_ is not null");
String select = "select ht.PROC_DEF_ID_ as procDefId, ht.PROC_INST_ID_ as procInsId, ht.EXECUTION_ID_ as executionId," +
" ht.ID_ as taskId, ht.NAME_ as taskName, " +
" ht.ASSIGNEE_ as assign, ht.START_TIME_ as startTime, ht.END_TIME_ as endTime, " +
"ht.DURATION_ as duration, ht.DELETE_REASON_ as deleteReason, hc.MESSAGE_ AS comments";
QueryHelper queryHelper = new QueryHelper(select, " ACT_HI_TASKINST ht " +
" LEFT JOIN ACT_HI_COMMENT hc on ht.ID_ = hc.TASK_ID_ and hc.type_='comment' ");
queryHelper.addCondition("ht.PROC_INST_ID_ =?", procIncId);
queryHelper.addOrderProperty("ht.start_time_", true);
List<ActHisTask> taskList = pagination.find(queryHelper.getSql(), ActHisTask.class);
for (ActHisTask actHisTask : taskList) {
if (StringUtils.isBlank(actHisTask.getAssign())) {
Task task = taskService.createTaskQuery().taskId(actHisTask.getTaskId()).singleResult();
if (task != null) {
if (StringUtils.isNotBlank(task.getAssignee())) {
actHisTask.setAssign(task.getAssignee());
} else {
List<IdentityLink> identityLinkList = taskService.getIdentityLinksForTask(task.getId());
if (identityLinkList != null && !identityLinkList.isEmpty()) {
String name = "";
for (IdentityLink identityLink : identityLinkList) {
if ("assignee".equals(identityLink.getType()) || "candidate".equals(identityLink.getType())) {
String assigneeUserId = identityLink.getUserId();
if (StringUtils.isNotBlank(name)) {
name = name + ",";
}
name += accountService.getNameById(Integer.parseInt(assigneeUserId));
}
}
actHisTask.setAssign(name);
}
}
}
}
setAssign(actHisTask);
//办理用时
String duration = actHisTask.getDuration();
/*Date startTime = actHisTask.getStartTime();
Date endTime = actHisTask.getEndTime();*/
if (StringUtils.isNotBlank(duration)) {
Long ztime = Long.parseLong(duration);
Long day = ztime / (1000 * 60 * 60 * 24);
@ -300,8 +120,154 @@ public class ActTaskDefService {
} else {
actHisTask.setDuration("正在处理。。。");
}
if (StringUtils.isNotBlank(actHisTask.getDeleteReason())) {
actHisTask.setComments("【驳回】" + actHisTask.getComments());
}
}
return taskList;
}
/**
*
*
* @param procDefId
* @return
*/
public List<ActTaskDef> findByProcDefId(String procDefId) {
List<ActTaskDef> list = actTaskDefRepository.findByProcDefId(procDefId);
for (ActTaskDef actTaskDef : list) {
candidatesHandle(actTaskDef);
}
return list;
}
/**
* key
*
* @param procDefId
* @param taskKey
* @return
*/
public ActTaskDef findFirstByProcDefIdAndTaskKey(String procDefId, String taskKey) {
ActTaskDef def = actTaskDefRepository.findFirstByProcDefIdAndTaskKey(procDefId, taskKey);
candidatesHandle(def);
return def;
}
/**
*
*
* @param taskDef
*/
public void saveConfig(ActTaskDef taskDef) {
ActTaskDef one = actTaskDefRepository.findOne(taskDef.getId());
one.setCandidateUsers(taskDef.getCandidateUsers());
one.setCandidateRoles(taskDef.getCandidateRoles());
one.setRollbackTaskKey(taskDef.getRollbackTaskKey());
one.setEndScript(taskDef.getEndScript());
one.setRollbackScript(taskDef.getRollbackScript());
one.setLastUpdatedTime(new Date());
actTaskDefRepository.save(one);
logger.info("saveTaskConfig uerId:{}, config:{}", InterfaceUtil.getAdminId(), JSONObject.toJSONString(one));
}
/**
*
*
* @param procDefId
* @param procInsId
* @param taskDefKey
* @return
*/
public Set<String> findCandidateUsers(String procDefId, String procInsId, String taskDefKey) {
ActTaskDef taskDef = findFirstByProcDefIdAndTaskKey(procDefId, taskDefKey);
if (taskDef.getTaskIndex() == ActConstant.TASK_INDEX_FIRST_USER_TASK) {
//任务驳回到发起节点 审批人设置为发起人
String startUserId = actUtil.getStartUserId(procInsId);
Set<String> res = new HashSet<>(1);
logger.info("findCandidateUsers-0-task:{}, startUserId:{}", taskDef.getTaskName(), startUserId);
res.add(startUserId);
return res;
}
List<String> resList = new ArrayList<>();
//通过人员id查询
List<String> candidateUserList = taskDef.getCandidateUserList();
logger.info("findCandidateUsers-1-task:{}, userList:{}", taskDef.getTaskName(), candidateUserList);
if (!candidateUserList.isEmpty()) {
resList.addAll(candidateUserList);
}
//通过角色id查询
List<String> candidateRoleList = taskDef.getCandidateRoleList();
logger.info("findCandidateUsers-2-task:{}, roleList:{}", taskDef.getTaskName(), candidateRoleList);
List<String> list = accountService.getUserIsByRole(candidateRoleList);
logger.info("findCandidateUsers-3-task:{}, userIdListByRole:{}", taskDef.getTaskName(), list);
if (!list.isEmpty()) {
resList.addAll(list);
}
//去重
Set<String> res = new HashSet<>(resList);
logger.info("findCandidateUsers-4-task:{}, resIds:{}", taskDef.getTaskName(), res);
return res;
}
/**
* sringlist
*
* @param actTaskDef
*/
private void candidatesHandle(ActTaskDef actTaskDef) {
String candidateUsers = actTaskDef.getCandidateUsers();
List<String> userIdList = new ArrayList<>();
if (StringUtils.isNotBlank(candidateUsers)) {
userIdList = Arrays.asList(candidateUsers.split("#"));
}
actTaskDef.setCandidateUserList(userIdList);
String candidateRoles = actTaskDef.getCandidateRoles();
List<String> roleIdList = new ArrayList<>();
if (StringUtils.isNotBlank(candidateRoles)) {
roleIdList = Arrays.asList(candidateRoles.split("#"));
}
actTaskDef.setCandidateRoleList(roleIdList);
}
/**
*
*
* @param actHisTask
*/
private void setAssign(ActHisTask actHisTask) {
if (StringUtils.isNotBlank(actHisTask.getAssign())) {
String userName = accountService.getNameById(Integer.parseInt(actHisTask.getAssign()));
actHisTask.setAssign(userName);
return;
}
Task task = taskService.createTaskQuery().taskId(actHisTask.getTaskId()).singleResult();
if (task == null) {
return;
}
if (StringUtils.isNotBlank(task.getAssignee())) {
actHisTask.setAssign(task.getAssignee());
return;
}
actHisTask.setAssign(actUtil.getAssigneeByIdentityLink(task.getId()));
}
}

View File

@ -0,0 +1,250 @@
package cn.palmte.work.utils;
import cn.palmte.work.config.activiti.ActConstant;
import cn.palmte.work.config.activiti.DeleteTaskCommand;
import cn.palmte.work.config.activiti.JumpCommand;
import cn.palmte.work.model.ActScript;
import cn.palmte.work.model.ActScriptRepository;
import cn.palmte.work.service.AccountService;
import org.activiti.bpmn.model.BpmnModel;
import org.activiti.bpmn.model.FlowNode;
import org.activiti.engine.ManagementService;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.TaskService;
import org.activiti.engine.task.IdentityLink;
import org.activiti.engine.task.Task;
import org.activiti.image.ProcessDiagramGenerator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
import top.jfunc.common.db.bean.Record;
import top.jfunc.common.db.utils.Pagination;
import top.jfunc.common.utils.IoUtil;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Component
public class ActUtil {
private static final Logger logger = LoggerFactory.getLogger(ActUtil.class);
@Autowired
private ProcessEngine processEngine;
@Autowired
private RepositoryService repositoryService;
@Autowired
Pagination pagination;
@Autowired
private ActScriptRepository actScriptRepository;
@Resource
private ApplicationContext applicationContext;
@Autowired
private TaskService taskService;
@Autowired
private AccountService accountService;
/**
*
*
* @param variableName
* @param procInsId
* @return
*/
public Record getVariable(String variableName, String procInsId) {
String sql = "select TEXT_ as text from ACT_HI_VARINST where NAME_=? and PROC_INST_ID_=?";
return pagination.findFirst(sql, variableName, procInsId);
}
public String getStartUserId(String procInsId) {
Record record = getVariable(ActConstant.START_PROCESS_USERID, procInsId);
if (record != null) {
return record.getStr("text");
}
return "0";
}
/**
*
*
* @param procInsId
* @return
*/
public List<Record> getVariables(String procInsId) {
String sql = "select NAME_ as name, TEXT_ as text from ACT_HI_VARINST where PROC_INST_ID_=?";
return pagination.find(sql, procInsId);
}
/**
*
*
* @param scriptId
* @param procInsId
*/
public void invokeEventScript(int scriptId, String procInsId) {
ActScript actScript = actScriptRepository.findOne(scriptId);
if (actScript == null) {
logger.info("脚本配置错误");
return;
}
Map<String, Object> map = new HashMap<>();
map.put(ActConstant.PROC_INS_ID, procInsId);
List<Record> variables = getVariables(procInsId);
for (Record variable : variables) {
map.put(variable.getStr("name"), variable.get("text"));
}
//调用方法传递的参数
Object[] args = new Object[1];
args[0] = map;
logger.info("invokeEventScript class:{}, methond:{}, param:{}", actScript.getClassName(), actScript.getClassMethod(), map);
try {
Class<?> ownerClass = Class.forName(actScript.getClassName());
Object bean = applicationContext.getBean(ownerClass);
Class<?>[] paramsType = new Class[1];
paramsType[0] = Class.forName("java.util.Map");
//找到脚本方法对应的方法 注意有且只有一个以Map为参数的方法
Method method = ownerClass.getDeclaredMethod(actScript.getClassMethod(), paramsType);
method.invoke(bean, args);
} catch (Exception e) {
logger.error("", e);
}
}
/**
*
*
* @param currentTaskId id
* @param targetTaskDefKey key
*/
public void jumpToTargetTask(String currentTaskId, String targetTaskDefKey) {
Task currentTask = taskService.createTaskQuery().taskId(currentTaskId).singleResult();
// 获取流程定义
org.activiti.bpmn.model.Process process = repositoryService.getBpmnModel(currentTask.getProcessDefinitionId()).getMainProcess();
//获取目标节点定义
FlowNode targetNode = (FlowNode) process.getFlowElement(targetTaskDefKey);
ManagementService managementService = processEngine.getManagementService();
//删除当前运行任务
String executionEntityId = managementService.executeCommand(new DeleteTaskCommand(currentTask.getId()));
//流程执行到来源节点
managementService.executeCommand(new JumpCommand(targetNode, executionEntityId));
Task singleResult = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
singleResult.setParentTaskId(currentTask.getTaskDefinitionKey());
taskService.saveTask(singleResult);
}
/**
*
*
* @param response
* @param bpmnModel
* @param executedActivityIdList
* @param flowIds
* @throws IOException
*/
public void responsePng(HttpServletResponse response, BpmnModel bpmnModel, List<String> executedActivityIdList, List<String> flowIds) throws IOException {
try (InputStream inputStream = generateDiagramInputStream(bpmnModel, executedActivityIdList, flowIds)) {
IoUtil.copy(inputStream, response.getOutputStream());
}
}
/**
* xml
*
* @param response
* @param deploymentId
* @throws IOException
*/
public void responseXml(HttpServletResponse response, String deploymentId) throws IOException {
try (InputStream inputStream = getXmlStreamByDeploymentId(deploymentId)) {
IoUtil.copy(inputStream, response.getOutputStream());
}
}
/**
*
*
* @param taskId
* @return
*/
public String getAssigneeByIdentityLink(String taskId) {
List<IdentityLink> identityLinkList = taskService.getIdentityLinksForTask(taskId);
if (identityLinkList == null || identityLinkList.isEmpty()) {
return "";
}
StringBuilder namesBuilder = new StringBuilder();
for (IdentityLink identityLink : identityLinkList) {
if ("assignee".equals(identityLink.getType()) || "candidate".equals(identityLink.getType())) {
String assigneeUserId = identityLink.getUserId();
namesBuilder.append(accountService.getNameById(Integer.parseInt(assigneeUserId)));
namesBuilder.append(",");
}
}
String names = namesBuilder.toString();
if (names.endsWith(",")) {
names = names.substring(0, names.length() - 1);
}
return names;
}
/**
* xml
*
* @param deploymentId
* @return
* @throws IOException
*/
private InputStream getXmlStreamByDeploymentId(String deploymentId) throws IOException {
List<String> names = repositoryService.getDeploymentResourceNames(deploymentId);
for (String name : names) {
if (name.contains("xml")) {
return repositoryService.getResourceAsStream(deploymentId, name);
}
}
return null;
}
/**
*
*
* @param bpmnModel
* @param executedActivityIdList
* @param flowIds
* @return
*/
private InputStream generateDiagramInputStream(BpmnModel bpmnModel, List<String> executedActivityIdList, List<String> flowIds) {
try {
ProcessDiagramGenerator processDiagramGenerator = processEngine.getProcessEngineConfiguration().getProcessDiagramGenerator();
return processDiagramGenerator.generateDiagram(bpmnModel, "png", executedActivityIdList,
flowIds, "宋体", "微软雅黑", "黑体", null, 2.0); //使用默认配置获得流程图表生成器,并生成追踪图片字符流
} catch (Exception e) {
logger.error("an exception happens in try catch statement", e);
return null;
}
}
}

View File

@ -18,11 +18,11 @@
<tr class="am-text-nowrap">
<th class="table-title">序号</th>
<th class="table-title">任务节点</th>
<th class="table-title">理人</th>
<th class="table-date">审批开始时间</th>
<th class="table-date">审批结束时间</th>
<th class="table-title">理人</th>
<th class="table-date">开始时间</th>
<th class="table-date">结束时间</th>
<th class="table-date">用时</th>
<th class="table-set am-text-center">审批意见</th>
<th class="table-set am-text-center">意见</th>
</tr>
</thead>
<tbody>
@ -30,7 +30,7 @@
<#list taskList as list>
<tr>
<td>${list_index+1!}</td>
<td>${list.actName!}</td>
<td>${list.taskName!}</td>
<td>${list.assign!}</td>
<td>${list.startTime?datetime}</td>
<td><#if list.endTime??>

View File

@ -6,7 +6,7 @@
<div class="am-cf am-padding" style="padding:1rem 1.6rem 1.6rem 1rem;margin:0px;">
<!-- padding:1px 2px 3px 4px;上、右、下,和左 -->
<div class="am-fl am-cf"><strong class="am-text-primary am-text-lg">工作流程</strong> /
<small>流程定义管理</small>
<small>流程定义</small>
</div>
</div>
<form class="am-form" id="list-form" action="${base}/actProcDef/list" method="post">

View File

@ -63,21 +63,21 @@
驳回
</button>
<button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="window.open('${base}/actProcIns/procInsPng/${list.procInsId!}')">
<span class="am-icon-pencil-square-o"></span>
流程图
</button>
<button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/actTaskDef/hisTaskList/${list.procInsId}'">
<span class="am-icon-pencil-square-o"></span>
审批过程
</button>
</#if>
<button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="window.open('${base}/actProcIns/procInsPng/${list.procInsId!}')">
<span class="am-icon-pencil-square-o"></span>
流程图
</button>
<button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/actTaskDef/hisTaskList/${list.procInsId}'">
<span class="am-icon-pencil-square-o"></span>
审批过程
</button>
</td>
</tr>

View File

@ -6,7 +6,7 @@
<div class="am-cf am-padding" style="padding:1rem 1.6rem 1.6rem 1rem;margin:0px;">
<!-- padding:1px 2px 3px 4px;上、右、下,和左 -->
<div class="am-fl am-cf"><strong class="am-text-primary am-text-lg">工作流程</strong> /
<small>模型管理</small>
<small>脚本管理</small>
</div>
</div>
<form class="am-form" id="list-form" action="${base}/actScript/list" method="post">