!4 同步develop分支
* fix -- 修改获取流程节点信息接口（供前端渲染流程跟踪图着色使用） * fix -- 修复流程跟踪着色问题 * fix -- 采用ProcessViewer组件显示流程跟踪信息 * fix -- 整合表单设计代码 * fix -- 简易实现用户任务选择用户下拉框内容 * fix -- 修改项目介绍及sql文件 * del -- 移除未使用的文件 * fix -- 修复组件无法显示和修改的问题 * add -- 整合 Rtony/RuoYi-flowable 工作流 * add -- 添加process-designer流程设计插件 * !3 同步ruoyi-vue-plus更新 * !2 登录认证用户信息添加nickName字段（流程任务需要使用到）
This commit is contained in:
KonBAI
@@ -0,0 +1,30 @@
|
||||
package com.ruoyi.flowable.domain.vo;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 任务追踪视图类
|
||||
*
|
||||
* @author konbai
|
||||
* @createTime 2022/1/8 19:42
|
||||
*/
|
||||
@Data
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class FlowViewerVo {
|
||||
|
||||
/**
|
||||
* 获取流程实例的历史节点（去重）
|
||||
*/
|
||||
private List<String> finishedTaskList;
|
||||
|
||||
/**
|
||||
* 获取流程实例当前正在待办的节点（去重）
|
||||
*/
|
||||
private List<String> unfinishedTaskList;
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ruoyi.flowable.service.impl;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.ruoyi.common.core.domain.R;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
@@ -21,6 +22,8 @@ import org.flowable.image.impl.DefaultProcessDiagramGenerator;
|
||||
import org.flowable.task.api.Task;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.io.IOException;
|
||||
@@ -153,6 +156,7 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public R startProcessInstanceById(String procDefId, Map<String, Object> variables) {
|
||||
try {
|
||||
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId)
|
||||
@@ -163,14 +167,19 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
|
||||
// variables.put("skip", true);
|
||||
// variables.put(ProcessConstants.FLOWABLE_SKIP_EXPRESSION_ENABLED, true);
|
||||
// 设置流程发起人Id到流程中
|
||||
identityService.setAuthenticatedUserId(SecurityUtils.getUserId().toString());
|
||||
variables.put(ProcessConstants.PROCESS_INITIATOR, "");
|
||||
String UserIdStr = SecurityUtils.getUserId().toString();
|
||||
identityService.setAuthenticatedUserId(UserIdStr);
|
||||
variables.put(ProcessConstants.PROCESS_INITIATOR, UserIdStr);
|
||||
ProcessInstance processInstance = runtimeService.startProcessInstanceById(procDefId, variables);
|
||||
// 给第一步申请人节点设置任务执行人和意见 todo:第一个节点不设置为申请人节点有点问题？
|
||||
Task task = taskService.createTaskQuery().processInstanceId(processInstance.getProcessInstanceId()).singleResult();
|
||||
if (Objects.nonNull(task)) {
|
||||
if (!StrUtil.equalsAny(task.getAssignee(), UserIdStr)) {
|
||||
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
||||
return R.error("数据验证失败，该工作流第一个用户任务的指派人并非当前用户，不能执行该操作！");
|
||||
}
|
||||
taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.NORMAL.getType(), SecurityUtils.getNickName() + "发起流程申请");
|
||||
// taskService.setAssignee(task.getId(), sysUser.getUserId().toString());
|
||||
// taskService.setAssignee(task.getId(), UserIdStr);
|
||||
taskService.complete(task.getId(), variables);
|
||||
}
|
||||
return R.success("流程启动成功");
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ruoyi.flowable.service.impl;
|
||||
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.google.common.collect.Lists;
|
||||
@@ -15,6 +16,7 @@ import com.ruoyi.flowable.domain.dto.FlowNextDto;
|
||||
import com.ruoyi.flowable.domain.dto.FlowTaskDto;
|
||||
import com.ruoyi.flowable.domain.dto.FlowViewerDto;
|
||||
import com.ruoyi.flowable.domain.vo.FlowTaskVo;
|
||||
import com.ruoyi.flowable.domain.vo.FlowViewerVo;
|
||||
import com.ruoyi.flowable.factory.FlowServiceFactory;
|
||||
import com.ruoyi.flowable.flow.CustomProcessDiagramGenerator;
|
||||
import com.ruoyi.flowable.flow.FindNextNodeUtil;
|
||||
@@ -34,6 +36,7 @@ import org.flowable.common.engine.api.FlowableObjectNotFoundException;
|
||||
import org.flowable.common.engine.impl.identity.Authentication;
|
||||
import org.flowable.engine.ProcessEngineConfiguration;
|
||||
import org.flowable.engine.history.HistoricActivityInstance;
|
||||
import org.flowable.engine.history.HistoricActivityInstanceQuery;
|
||||
import org.flowable.engine.history.HistoricProcessInstance;
|
||||
import org.flowable.engine.history.HistoricProcessInstanceQuery;
|
||||
import org.flowable.engine.repository.ProcessDefinition;
|
||||
@@ -51,11 +54,13 @@ import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.xml.transform.sax.SAXTransformerFactory;
|
||||
import java.io.InputStream;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.function.Function;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @author XuanXuan
|
||||
@@ -95,7 +100,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
||||
taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getType(), taskVo.getComment());
|
||||
Long userId = SecurityUtils.getUserId();
|
||||
taskService.setAssignee(taskVo.getTaskId(), userId.toString());
|
||||
taskService.complete(taskVo.getTaskId(), taskVo.getValues());
|
||||
if (ObjectUtil.isNotEmpty(taskVo.getValues())) {
|
||||
taskService.complete(taskVo.getTaskId(), taskVo.getValues());
|
||||
} else {
|
||||
taskService.complete(taskVo.getTaskId());
|
||||
}
|
||||
}
|
||||
return R.success();
|
||||
}
|
||||
@@ -814,22 +823,19 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
|
||||
*/
|
||||
@Override
|
||||
public R getFlowViewer(String procInsId) {
|
||||
List<FlowViewerDto> flowViewerList = new ArrayList<>();
|
||||
FlowViewerDto flowViewerDto;
|
||||
// 获得活动的节点
|
||||
List<HistoricActivityInstance> hisActIns = historyService.createHistoricActivityInstanceQuery()
|
||||
.processInstanceId(procInsId)
|
||||
.orderByHistoricActivityInstanceStartTime()
|
||||
.asc().list();
|
||||
for (HistoricActivityInstance activityInstance : hisActIns) {
|
||||
if (!"sequenceFlow".equals(activityInstance.getActivityType())) {
|
||||
flowViewerDto = new FlowViewerDto();
|
||||
flowViewerDto.setKey(activityInstance.getActivityId());
|
||||
flowViewerDto.setCompleted(!Objects.isNull(activityInstance.getEndTime()));
|
||||
flowViewerList.add(flowViewerDto);
|
||||
}
|
||||
}
|
||||
return R.success(flowViewerList);
|
||||
// 构建查询条件
|
||||
HistoricActivityInstanceQuery query = historyService.createHistoricActivityInstanceQuery()
|
||||
.processInstanceId(procInsId);
|
||||
// 获取流程实例已完成的节点
|
||||
List<String> finishedTaskList = query.finished().list()
|
||||
.stream().distinct().map(HistoricActivityInstance::getActivityId)
|
||||
.collect(Collectors.toList());
|
||||
// 获取流程实例正在待办的节点
|
||||
List<String> unfinishedTaskList = query.unfinished().list()
|
||||
.stream().distinct().map(HistoricActivityInstance::getActivityId)
|
||||
.collect(Collectors.toList());
|
||||
// 构建视图类
|
||||
return R.success(new FlowViewerVo(finishedTaskList, unfinishedTaskList));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user