DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix -- 修改流程定义模块，主页面显示最新版本的流程部署，添加“版本管理”页面。优化查询方法。

Browse Source
This commit is contained in:
hewenqiang
2022-01-20 12:03:06 +08:00
parent 6fd28f02eb
commit dc9ddaeba9
8 changed files with 444 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/dto/FlowProcDefDto.java
View File

@@ -1,56 +0,0 @@
package com.ruoyi.workflow.domain.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
/**
* <p>流程定义<p>
*
* @author XuanXuan
* @date 2021-04-03
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("流程定义")
public class FlowProcDefDto implements Serializable {
@ApiModelProperty("流程id")
private String id;
@ApiModelProperty("流程名称")
private String name;
@ApiModelProperty("流程key")
private String key;
@ApiModelProperty("流程分类")
private String category;
@ApiModelProperty("配置表单名称")
private String formName;
@ApiModelProperty("配置表单id")
private Long formId;
@ApiModelProperty("版本")
private int version;
@ApiModelProperty("部署ID")
private String deploymentId;
@ApiModelProperty("流程定义状态: 1:激活 , 2:中止")
private int suspensionState;
@ApiModelProperty("部署时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date deploymentTime;
}

91
ruoyi-system/src/main/java/com/ruoyi/workflow/domain/vo/FlowDefinitionVo.java Normal file
View File

@@ -0,0 +1,91 @@
package com.ruoyi.workflow.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 流程定义视图对象 workflow_definition
*
* @author KonBAI
* @date 2022-01-17
*/
@Data
@ApiModel("流程定义视图对象")
@ExcelIgnoreUnannotated
public class FlowDefinitionVo {
private static final long serialVersionUID = 1L;
/**
* 流程定义ID
*/
@ExcelProperty(value = "流程定义ID")
@ApiModelProperty("流程定义ID")
private String definitionId;
/**
* 流程名称
*/
@ExcelProperty(value = "流程名称")
@ApiModelProperty("流程名称")
private String processName;
/**
* 流程Key
*/
@ExcelProperty(value = "流程Key")
@ApiModelProperty("流程Key")
private String processKey;
/**
* 分类编码
*/
@ExcelProperty(value = "分类编码")
@ApiModelProperty("分类编码")
private String categoryCode;
@ApiModelProperty("版本")
private Integer version;
/**
* 表单ID
*/
@ExcelProperty(value = "表单ID")
@ApiModelProperty("表单ID")
private Long formId;
/**
* 表单名称
*/
@ExcelProperty(value = "表单名称")
@ApiModelProperty("表单名称")
private String formName;
/**
* 部署ID
*/
@ExcelProperty(value = "部署ID")
@ApiModelProperty("部署ID")
private String deploymentId;
/**
* 流程定义状态: 1:激活 , 2:中止
*/
@ExcelProperty(value = "流程定义状态: 1:激活 , 2:中止")
@ApiModelProperty("流程定义状态: 1:激活 , 2:中止")
private Boolean suspended;
/**
* 部署时间
*/
@ExcelProperty(value = "部署时间")
@ApiModelProperty("部署时间")
private Date deploymentTime;
}

34
ruoyi-system/src/main/java/com/ruoyi/workflow/service/IFlowDefinitionService.java
View File

@@ -1,8 +1,8 @@
package com.ruoyi.workflow.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.workflow.domain.dto.FlowProcDefDto;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.workflow.domain.vo.FlowDefinitionVo;
import java.io.IOException;
import java.io.InputStream;
@@ -20,11 +20,17 @@ public interface IFlowDefinitionService {
/**
* 流程定义列表
*
* @param pageNum 当前页码
* @param pageSize 每页条数
* @param pageQuery 分页参数
* @return 流程定义分页列表数据
*/
Page<FlowProcDefDto> list(Integer pageNum, Integer pageSize);
TableDataInfo<FlowDefinitionVo> list(PageQuery pageQuery);
/**
*
* @param processKey
* @return
*/
TableDataInfo<FlowDefinitionVo> publishList(String processKey, PageQuery pageQuery);
/**
* 导入流程文件
@@ -37,10 +43,10 @@ public interface IFlowDefinitionService {
/**
* 读取xml
* @param deployId
* @param definitionId 流程定义ID
* @return
*/
R readXml(String deployId) throws IOException;
String readXml(String definitionId) throws IOException;
/**
* 根据流程定义ID启动流程实例
@@ -50,16 +56,16 @@ public interface IFlowDefinitionService {
* @return
*/
R startProcessInstanceById(String procDefId, Map<String, Object> variables);
void startProcessInstanceById(String procDefId, Map<String, Object> variables);
/**
* 激活或挂起流程定义
*
* @param state 状态
* @param deployId 流程部署ID
* @param suspended 状态
* @param definitionId 流程定义ID
*/
void updateState(Integer state, String deployId);
void updateState(Boolean suspended, String definitionId);
/**
@@ -72,8 +78,8 @@ public interface IFlowDefinitionService {
/**
* 读取图片文件
* @param deployId
* @param definitionId 流程定义ID
* @return
*/
InputStream readImage(String deployId);
InputStream readImage(String definitionId);
}

186
ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/FlowDefinitionServiceImpl.java
View File

@@ -2,54 +2,56 @@ package com.ruoyi.workflow.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.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.LoginUtils;
import com.ruoyi.flowable.common.constant.ProcessConstants;
import com.ruoyi.flowable.common.enums.FlowComment;
import com.ruoyi.workflow.domain.dto.FlowProcDefDto;
import com.ruoyi.flowable.factory.FlowServiceFactory;
import com.ruoyi.system.domain.SysForm;
import com.ruoyi.workflow.domain.vo.FlowDefinitionVo;
import com.ruoyi.workflow.service.IFlowDefinitionService;
import com.ruoyi.workflow.service.ISysDeployFormService;
import com.ruoyi.system.domain.SysForm;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.flowable.bpmn.model.BpmnModel;
import org.flowable.engine.repository.Deployment;
import org.flowable.engine.repository.DeploymentBuilder;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.engine.repository.ProcessDefinitionQuery;
import org.flowable.engine.runtime.ProcessInstance;
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;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.stream.Collectors;
/**
* 流程定义
*
* @author XuanXuan
* @date 2021-04-03
* @author KonBAI
* @date 2022-01-17
*/
@RequiredArgsConstructor
@Service
@Slf4j
public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFlowDefinitionService {
@Resource
private ISysDeployFormService sysDeployFormService;
private final ISysDeployFormService sysDeployFormService;
private static final String BPMN_FILE_SUFFIX = ".bpmn";
@Override
public boolean exist(String processDefinitionKey) {
ProcessDefinitionQuery processDefinitionQuery
= repositoryService.createProcessDefinitionQuery().processDefinitionKey(processDefinitionKey);
ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
.processDefinitionKey(processDefinitionKey);
long count = processDefinitionQuery.count();
return count > 0;
}
@@ -58,37 +60,78 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
/**
* 流程定义列表
*
* @param pageNum 当前页码
* @param pageSize 每页条数
* @param pageQuery 分页参数
* @return 流程定义分页列表数据
*/
@Override
public Page<FlowProcDefDto> list(Integer pageNum, Integer pageSize) {
Page<FlowProcDefDto> page = new Page<>();
public TableDataInfo<FlowDefinitionVo> list(PageQuery pageQuery) {
Page<FlowDefinitionVo> page = new Page<>();
// 流程定义列表数据查询
ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
// .latestVersion()
.orderByProcessDefinitionKey().asc();
page.setTotal(processDefinitionQuery.count());
List<ProcessDefinition> processDefinitionList = processDefinitionQuery.listPage(pageNum - 1, pageSize);
.latestVersion()
.orderByProcessDefinitionKey().asc();
long pageTotal = processDefinitionQuery.count();
if (pageTotal <= 0) {
return TableDataInfo.build();
}
List<ProcessDefinition> definitionList = processDefinitionQuery.listPage(pageQuery.getPageNum() - 1, pageQuery.getPageSize());
List<FlowProcDefDto> dataList = new ArrayList<>();
for (ProcessDefinition processDefinition : processDefinitionList) {
List<FlowDefinitionVo> definitionVoList = new ArrayList<>();
for (ProcessDefinition processDefinition : definitionList) {
String deploymentId = processDefinition.getDeploymentId();
Deployment deployment = repositoryService.createDeploymentQuery().deploymentId(deploymentId).singleResult();
FlowProcDefDto reProcDef = new FlowProcDefDto();
BeanUtils.copyProperties(processDefinition, reProcDef);
FlowDefinitionVo vo = new FlowDefinitionVo();
vo.setDefinitionId(processDefinition.getId());
vo.setProcessKey(processDefinition.getKey());
vo.setProcessName(processDefinition.getName());
vo.setVersion(processDefinition.getVersion());
vo.setCategoryCode(processDefinition.getCategory());
vo.setDeploymentId(processDefinition.getDeploymentId());
vo.setSuspended(processDefinition.isSuspended());
SysForm sysForm = sysDeployFormService.selectSysDeployFormByDeployId(deploymentId);
if (Objects.nonNull(sysForm)) {
reProcDef.setFormName(sysForm.getFormName());
reProcDef.setFormId(sysForm.getFormId());
vo.setFormId(sysForm.getFormId());
vo.setFormName(sysForm.getFormName());
}
// 流程定义时间
reProcDef.setDeploymentTime(deployment.getDeploymentTime());
dataList.add(reProcDef);
vo.setCategoryCode(deployment.getCategory());
vo.setDeploymentTime(deployment.getDeploymentTime());
definitionVoList.add(vo);
}
page.setRecords(dataList);
return page;
page.setRecords(definitionVoList);
page.setTotal(pageTotal);
return TableDataInfo.build(page);
}
@Override
public TableDataInfo<FlowDefinitionVo> publishList(String processKey, PageQuery pageQuery) {
Page<FlowDefinitionVo> page = new Page<>();
// 创建查询条件
ProcessDefinitionQuery processDefinitionQuery = repositoryService.createProcessDefinitionQuery()
.processDefinitionKey(processKey)
.orderByProcessDefinitionVersion().asc();
long pageTotal = processDefinitionQuery.count();
if (pageTotal <= 0) {
return TableDataInfo.build();
}
// 根据查询条件，查询所有版本
List<ProcessDefinition> processDefinitionList = processDefinitionQuery
.listPage(pageQuery.getPageNum() - 1, pageQuery.getPageSize());
List<FlowDefinitionVo> flowDefinitionVoList = processDefinitionList.stream().map(item -> {
FlowDefinitionVo vo = new FlowDefinitionVo();
vo.setDefinitionId(item.getId());
vo.setProcessKey(item.getKey());
vo.setProcessName(item.getName());
vo.setVersion(item.getVersion());
vo.setCategoryCode(item.getCategory());
vo.setDeploymentId(item.getDeploymentId());
vo.setSuspended(item.isSuspended());
// BeanUtil.copyProperties(item, vo);
return vo;
}).collect(Collectors.toList());
page.setRecords(flowDefinitionVoList);
page.setTotal(pageTotal);
return TableDataInfo.build(page);
}
@@ -100,51 +143,54 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
* @param in
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void importFile(String name, String category, InputStream in) {
Deployment deploy = repositoryService.createDeployment().addInputStream(name + BPMN_FILE_SUFFIX, in).name(name).category(category).deploy();
ProcessDefinition definition = repositoryService.createProcessDefinitionQuery().deploymentId(deploy.getId()).singleResult();
repositoryService.setProcessDefinitionCategory(definition.getId(), category);
String processName = name + BPMN_FILE_SUFFIX;
// 创建流程部署
DeploymentBuilder deploymentBuilder = repositoryService.createDeployment()
.name(processName)
.key(name)
.category(category)
.addInputStream(processName, in);
// 部署
deploymentBuilder.deploy();
}
/**
* 读取xml
*
* @param deployId
* @param definitionId 流程定义ID
* @return
*/
@Override
public R readXml(String deployId) throws IOException {
ProcessDefinition definition = repositoryService.createProcessDefinitionQuery().deploymentId(deployId).singleResult();
InputStream inputStream = repositoryService.getResourceAsStream(definition.getDeploymentId(), definition.getResourceName());
String result = IOUtils.toString(inputStream, StandardCharsets.UTF_8.name());
return R.success("", result);
public String readXml(String definitionId) throws IOException {
InputStream inputStream = repositoryService.getProcessModel(definitionId);
return IOUtils.toString(inputStream, StandardCharsets.UTF_8.name());
}
/**
* 读取xml
*
* @param deployId
* @param definitionId 流程定义ID
* @return
*/
@Override
public InputStream readImage(String deployId) {
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().deploymentId(deployId).singleResult();
public InputStream readImage(String definitionId) {
//获得图片流
DefaultProcessDiagramGenerator diagramGenerator = new DefaultProcessDiagramGenerator();
BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinition.getId());
BpmnModel bpmnModel = repositoryService.getBpmnModel(definitionId);
//输出为图片
return diagramGenerator.generateDiagram(
bpmnModel,
"png",
Collections.emptyList(),
Collections.emptyList(),
"宋体",
"宋体",
"宋体",
null,
1.0,
false);
bpmnModel,
"png",
Collections.emptyList(),
Collections.emptyList(),
"宋体",
"宋体",
"宋体",
null,
1.0,
false);
}
@@ -157,12 +203,12 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R startProcessInstanceById(String procDefId, Map<String, Object> variables) {
public void startProcessInstanceById(String procDefId, Map<String, Object> variables) {
try {
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(procDefId)
.latestVersion().singleResult();
.latestVersion().singleResult();
if (Objects.nonNull(processDefinition) && processDefinition.isSuspended()) {
return R.error("流程已被挂起,请先激活流程");
throw new ServiceException("流程已被挂起，请先激活流程");
}
// variables.put("skip", true);
// variables.put(ProcessConstants.FLOWABLE_SKIP_EXPRESSION_ENABLED, true);
@@ -175,17 +221,15 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
Task task = taskService.createTaskQuery().processInstanceId(processInstance.getProcessInstanceId()).singleResult();
if (Objects.nonNull(task)) {
if (!StrUtil.equalsAny(task.getAssignee(), UserIdStr)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return R.error("数据验证失败，该工作流第一个用户任务的指派人并非当前用户，不能执行该操作！");
throw new ServiceException("数据验证失败，该工作流第一个用户任务的指派人并非当前用户，不能执行该操作！");
}
taskService.addComment(task.getId(), processInstance.getProcessInstanceId(), FlowComment.NORMAL.getType(), LoginUtils.getNickName() + "发起流程申请");
// taskService.setAssignee(task.getId(), UserIdStr);
taskService.complete(task.getId(), variables);
}
return R.success("流程启动成功");
} catch (Exception e) {
e.printStackTrace();
return R.error("流程启动错误");
throw new ServiceException("流程启动错误");
}
}
@@ -193,19 +237,17 @@ public class FlowDefinitionServiceImpl extends FlowServiceFactory implements IFl
/**
* 激活或挂起流程定义
*
* @param state 状态
* @param deployId 流程部署ID
* @param suspended 是否暂停状态
* @param definitionId 流程定义ID
*/
@Override
public void updateState(Integer state, String deployId) {
ProcessDefinition procDef = repositoryService.createProcessDefinitionQuery().deploymentId(deployId).singleResult();
// 激活
if (state == 1) {
repositoryService.activateProcessDefinitionById(procDef.getId(), true, null);
}
// 挂起
if (state == 2) {
repositoryService.suspendProcessDefinitionById(procDef.getId(), true, null);
public void updateState(Boolean suspended, String definitionId) {
if (!suspended) {
// 激活
repositoryService.activateProcessDefinitionById(definitionId, true, null);
} else {
// 挂起
repositoryService.suspendProcessDefinitionById(definitionId, true, null);
}
}