startWorkFlow(StartProcessDTO startProcess);
+
+ /**
+ * 办理任务
+ *
+ * @param completeTask 参数
+ * @return 结果
+ */
+ boolean completeTask(CompleteTaskDTO completeTask);
}
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
index 19557e131..e2c92366f 100644
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
@@ -15,6 +15,7 @@ import org.dromara.common.core.enums.UserType;
import java.util.Set;
+
/**
* 登录鉴权助手
*
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
index 37299804a..6b9e60617 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
@@ -63,7 +63,7 @@ public class GenTableServiceImpl implements IGenTableService {
private final GenTableColumnMapper genTableColumnMapper;
private final IdentifierGenerator identifierGenerator;
- private static final String[] TABLE_IGNORE = new String[]{"sj_", "act_", "flw_", "gen_"};
+ private static final String[] TABLE_IGNORE = new String[]{"sj_", "flow_", "gen_"};
/**
* 查询业务字段列表
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java
index 0f2c90667..b69624cf0 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java
@@ -3,6 +3,7 @@ package org.dromara.system.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.annotation.DataColumn;
import org.dromara.common.mybatis.annotation.DataPermission;
@@ -31,6 +32,17 @@ public interface SysDeptMapper extends BaseMapperPlus {
})
List selectDeptList(@Param(Constants.WRAPPER) Wrapper queryWrapper);
+ /**
+ * 分页查询部门管理数据
+ *
+ * @param queryWrapper 查询条件
+ * @return 部门信息集合
+ */
+ @DataPermission({
+ @DataColumn(key = "deptName", value = "dept_id"),
+ })
+ Page selectPageDeptList(@Param("page") Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper);
+
/**
* 统计指定部门ID的部门数量
*
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
index 72f1a5e31..5888985a7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
@@ -245,4 +245,5 @@ public class SysPostServiceImpl implements ISysPostService, PostService {
SysPost post = MapstructUtils.convert(bo, SysPost.class);
return baseMapper.updateById(post);
}
+
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
index 4c007358e..0a2e485f6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
@@ -548,4 +548,5 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService {
}
});
}
+
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java
new file mode 100644
index 000000000..23dd0520c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java
@@ -0,0 +1,168 @@
+package org.dromara.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.dto.TaskAssigneeDTO;
+import org.dromara.common.core.domain.model.TaskAssigneeBody;
+import org.dromara.common.core.service.TaskAssigneeService;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.system.domain.SysDept;
+import org.dromara.system.domain.SysPost;
+import org.dromara.system.domain.SysRole;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.vo.SysDeptVo;
+import org.dromara.system.domain.vo.SysPostVo;
+import org.dromara.system.domain.vo.SysRoleVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.mapper.SysDeptMapper;
+import org.dromara.system.mapper.SysPostMapper;
+import org.dromara.system.mapper.SysRoleMapper;
+import org.dromara.system.mapper.SysUserMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 工作流设计器获取任务执行人
+ *
+ * @author Lion Li
+ */
+@RequiredArgsConstructor
+@Service
+public class SysTaskAssigneeServiceImpl implements TaskAssigneeService {
+
+ private final SysPostMapper postMapper;
+ private final SysDeptMapper deptMapper;
+ private final SysUserMapper userMapper;
+ private final SysRoleMapper roleMapper;
+
+ /**
+ * 查询角色并返回任务指派的列表，支持分页
+ *
+ * @param taskQuery 查询条件
+ * @return 办理人
+ */
+ @Override
+ public TaskAssigneeDTO selectRolesByTaskAssigneeList(TaskAssigneeBody taskQuery) {
+ PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum());
+ QueryWrapper wrapper = Wrappers.query();
+ wrapper.eq("r.del_flag", SystemConstants.NORMAL)
+ .like(StringUtils.isNotBlank(taskQuery.getHandlerCode()), "r.role_name", taskQuery.getHandlerCode())
+ .like(StringUtils.isNotBlank(taskQuery.getHandlerName()), "r.role_key", taskQuery.getHandlerName())
+ .between(StringUtils.isNotBlank(taskQuery.getBeginTime()) && StringUtils.isNotBlank(taskQuery.getEndTime()),
+ "r.create_time", taskQuery.getBeginTime(), taskQuery.getEndTime())
+ .orderByAsc("r.role_sort").orderByAsc("r.create_time");
+ Page page = roleMapper.selectPageRoleList(pageQuery.build(), wrapper);
+ // 使用封装的字段映射方法进行转换
+ List handlers = TaskAssigneeDTO.convertToHandlerList(page.getRecords(),
+ SysRoleVo::getRoleId, SysRoleVo::getRoleKey, SysRoleVo::getRoleName, null, SysRoleVo::getCreateTime);
+ return new TaskAssigneeDTO(page.getTotal(), handlers);
+ }
+
+ /**
+ * 查询岗位并返回任务指派的列表，支持分页
+ *
+ * @param taskQuery 查询条件
+ * @return 办理人
+ */
+ @Override
+ public TaskAssigneeDTO selectPostsByTaskAssigneeList(TaskAssigneeBody taskQuery) {
+ PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum());
+ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery()
+ .like(StringUtils.isNotBlank(taskQuery.getHandlerCode()), SysPost::getPostCategory, taskQuery.getHandlerCode())
+ .like(StringUtils.isNotBlank(taskQuery.getHandlerName()), SysPost::getPostName, taskQuery.getHandlerName())
+ .between(StringUtils.isNotBlank(taskQuery.getBeginTime()) && StringUtils.isNotBlank(taskQuery.getEndTime()),
+ SysPost::getCreateTime, taskQuery.getBeginTime(), taskQuery.getEndTime());
+ if (StringUtils.isNotBlank(taskQuery.getGroupId())) {
+ Long belongDeptId = Long.valueOf(taskQuery.getGroupId());
+ wrapper.and(x -> {
+ List deptList = deptMapper.selectListByParentId(belongDeptId);
+ List deptIds = StreamUtils.toList(deptList, SysDept::getDeptId);
+ deptIds.add(belongDeptId);
+ x.in(SysPost::getDeptId, deptIds);
+ });
+ }
+ Page page = postMapper.selectPagePostList(pageQuery.build(), wrapper);
+ // 使用封装的字段映射方法进行转换
+ List handlers = TaskAssigneeDTO.convertToHandlerList(page.getRecords(),
+ SysPostVo::getPostId, SysPostVo::getPostCategory, SysPostVo::getPostName, SysPostVo::getDeptId, SysPostVo::getCreateTime);
+ return new TaskAssigneeDTO(page.getTotal(), handlers);
+ }
+
+ /**
+ * 查询部门并返回任务指派的列表，支持分页
+ *
+ * @param taskQuery 查询条件
+ * @return 办理人
+ */
+ @Override
+ public TaskAssigneeDTO selectDeptsByTaskAssigneeList(TaskAssigneeBody taskQuery) {
+ PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum());
+ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery()
+ .eq(SysDept::getDelFlag, SystemConstants.NORMAL)
+ .like(StringUtils.isNotBlank(taskQuery.getHandlerCode()), SysDept::getDeptCategory, taskQuery.getHandlerCode())
+ .like(StringUtils.isNotBlank(taskQuery.getHandlerName()), SysDept::getDeptName, taskQuery.getHandlerName())
+ .between(StringUtils.isNotBlank(taskQuery.getBeginTime()) && StringUtils.isNotBlank(taskQuery.getEndTime()),
+ SysDept::getCreateTime, taskQuery.getBeginTime(), taskQuery.getEndTime())
+ .orderByAsc(SysDept::getAncestors)
+ .orderByAsc(SysDept::getParentId)
+ .orderByAsc(SysDept::getOrderNum)
+ .orderByAsc(SysDept::getDeptId);
+ if (StringUtils.isNotBlank(taskQuery.getGroupId())) {
+ //部门树搜索
+ wrapper.and(x -> {
+ Long parentId = Long.valueOf(taskQuery.getGroupId());
+ List deptList = deptMapper.selectListByParentId(parentId);
+ List deptIds = StreamUtils.toList(deptList, SysDept::getDeptId);
+ deptIds.add(parentId);
+ x.in(SysDept::getDeptId, deptIds);
+ });
+ }
+ Page page = deptMapper.selectPageDeptList(pageQuery.build(), wrapper);
+ // 使用封装的字段映射方法进行转换
+ List handlers = TaskAssigneeDTO.convertToHandlerList(page.getRecords(),
+ SysDeptVo::getDeptId, SysDeptVo::getDeptCategory, SysDeptVo::getDeptName, SysDeptVo::getParentId, SysDeptVo::getCreateTime);
+ return new TaskAssigneeDTO(page.getTotal(), handlers);
+ }
+
+
+ /**
+ * 查询用户并返回任务指派的列表，支持分页
+ *
+ * @param taskQuery 查询条件
+ * @return 办理人
+ */
+ @Override
+ public TaskAssigneeDTO selectUsersByTaskAssigneeList(TaskAssigneeBody taskQuery) {
+ PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum());
+ QueryWrapper wrapper = Wrappers.query();
+ wrapper.eq("u.del_flag", SystemConstants.NORMAL)
+ .like(StringUtils.isNotBlank(taskQuery.getHandlerCode()), "u.user_name", taskQuery.getHandlerCode())
+ .like(StringUtils.isNotBlank(taskQuery.getHandlerName()), "u.nick_name", taskQuery.getHandlerName())
+ .between(taskQuery.getBeginTime() != null && taskQuery.getEndTime() != null,
+ "u.create_time", taskQuery.getBeginTime(), taskQuery.getEndTime())
+ .orderByAsc("u.user_id");
+ if (StringUtils.isNotBlank(taskQuery.getGroupId())) {
+ //部门树搜索
+ wrapper.and(x -> {
+ Long parentId = Long.valueOf(taskQuery.getGroupId());
+ List deptList = deptMapper.selectListByParentId(parentId);
+ List deptIds = StreamUtils.toList(deptList, SysDept::getDeptId);
+ deptIds.add(parentId);
+ x.in("u.dept_id", deptIds);
+ });
+ }
+ Page page = userMapper.selectPageUserList(pageQuery.build(), wrapper);
+ // 使用封装的字段映射方法进行转换
+ List handlers = TaskAssigneeDTO.convertToHandlerList(page.getRecords(),
+ SysUserVo::getUserId, SysUserVo::getUserName, SysUserVo::getNickName, SysUserVo::getDeptId, SysUserVo::getCreateTime);
+ return new TaskAssigneeDTO(page.getTotal(), handlers);
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
index 7bfe989b9..856dabba5 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java
@@ -15,6 +15,7 @@ import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.service.WorkflowService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StreamUtils;
@@ -56,6 +57,7 @@ public class SysTenantServiceImpl implements ISysTenantService {
private final SysDictTypeMapper dictTypeMapper;
private final SysDictDataMapper dictDataMapper;
private final SysConfigMapper configMapper;
+ private final WorkflowService workflowService;
/**
* 查询租户
@@ -121,7 +123,9 @@ public class SysTenantServiceImpl implements ISysTenantService {
// 获取所有租户编号
List tenantIds = baseMapper.selectObjs(
- new LambdaQueryWrapper().select(SysTenant::getTenantId), x -> {return Convert.toStr(x);});
+ new LambdaQueryWrapper().select(SysTenant::getTenantId), x -> {
+ return Convert.toStr(x);
+ });
String tenantId = generateTenantId(tenantIds);
add.setTenantId(tenantId);
boolean flag = baseMapper.insert(add) > 0;
@@ -191,6 +195,8 @@ public class SysTenantServiceImpl implements ISysTenantService {
config.setTenantId(tenantId);
}
configMapper.insertBatch(sysConfigList);
+ //新增租户流程定义
+ workflowService.syncDef(tenantId);
return true;
}
@@ -399,7 +405,9 @@ public class SysTenantServiceImpl implements ISysTenantService {
// 获取所有租户编号
List tenantIds = baseMapper.selectObjs(
new LambdaQueryWrapper().select(SysTenant::getTenantId)
- .eq(SysTenant::getStatus, SystemConstants.NORMAL), x -> {return Convert.toStr(x);});
+ .eq(SysTenant::getStatus, SystemConstants.NORMAL), x -> {
+ return Convert.toStr(x);
+ });
List saveTypeList = new ArrayList<>();
List saveDataList = new ArrayList<>();
Set set = new HashSet<>();
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 6ad866f29..9057a0e22 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -18,6 +18,17 @@
from sys_dept ${ew.getCustomSqlSegment}
+
+
diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/ruoyi-modules/ruoyi-workflow/pom.xml
index e55839ef7..d195fafa3 100644
--- a/ruoyi-modules/ruoyi-workflow/pom.xml
+++ b/ruoyi-modules/ruoyi-workflow/pom.xml
@@ -18,57 +18,14 @@
-
- org.flowable
- flowable-spring-boot-autoconfigure
-
-
- org.flowable
- flowable-spring-security
-
-
-
-
-
- org.flowable
- flowable-spring-configurator
-
-
-
- org.flowable
- flowable-spring-boot-starter-actuator
-
-
-
-
- org.flowable
- flowable-image-generator
-
-
-
-
- org.flowable
- flowable-json-converter
- 6.8.0
-
-
-
-
- org.apache.xmlgraphics
- batik-all
- 1.17
-
-
- xalan
- xalan
-
-
+ org.dromara
+ ruoyi-common-sse
org.dromara
- ruoyi-common-websocket
+ ruoyi-common-doc
@@ -113,6 +70,14 @@
org.dromara
ruoyi-common-security
+
+ org.dromara.warm
+ warm-flow-mybatis-plus-sb3-starter
+
+
+ org.dromara.warm
+ warm-flow-plugin-ui-sb-web
+
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java
index c3fcafa87..1b10eb8ea 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java
@@ -8,83 +8,6 @@ package org.dromara.workflow.common.constant;
*/
public interface FlowConstant {
- String MESSAGE_CURRENT_TASK_IS_NULL = "当前任务不存在或你不是任务办理人！";
-
- String MESSAGE_SUSPENDED = "当前任务已挂起不可审批！";
-
- /**
- * 连线
- */
- String SEQUENCE_FLOW = "sequenceFlow";
-
- /**
- * 并行网关
- */
- String PARALLEL_GATEWAY = "parallelGateway";
-
- /**
- * 排它网关
- */
- String EXCLUSIVE_GATEWAY = "exclusiveGateway";
-
- /**
- * 包含网关
- */
- String INCLUSIVE_GATEWAY = "inclusiveGateway";
-
- /**
- * 结束节点
- */
- String END_EVENT = "endEvent";
-
-
- /**
- * 流程委派标识
- */
- String PENDING = "PENDING";
-
- /**
- * 候选人标识
- */
- String CANDIDATE = "candidate";
-
- /**
- * 会签任务总数
- */
- String NUMBER_OF_INSTANCES = "nrOfInstances";
-
- /**
- * 正在执行的会签总数
- */
- String NUMBER_OF_ACTIVE_INSTANCES = "nrOfActiveInstances";
-
- /**
- * 已完成的会签任务总数
- */
- String NUMBER_OF_COMPLETED_INSTANCES = "nrOfCompletedInstances";
-
- /**
- * 循环的索引值，可以使用elementIndexVariable属性修改loopCounter的变量名
- */
- String LOOP_COUNTER = "loopCounter";
-
- String ZIP = "ZIP";
-
- /**
- * 业务与流程实例关联对象
- */
- String BUSINESS_INSTANCE_DTO = "businessInstanceDTO";
-
- /**
- * 流程定义配置
- */
- String WF_DEFINITION_CONFIG_VO = "wfDefinitionConfigVo";
-
- /**
- * 节点配置
- */
- String WF_NODE_CONFIG_VO = "wfNodeConfigVo";
-
/**
* 流程发起人
*/
@@ -98,40 +21,46 @@ public interface FlowConstant {
/**
* 业务id
*/
- String BUSINESS_KEY = "businessKey";
+ String BUSINESS_ID = "businessId";
/**
- * 流程定义id
+ * 任务id
*/
- String PROCESS_DEFINITION_ID = "processDefinitionId";
+ String TASK_ID = "taskId";
/**
- * 开启跳过表达式变量
+ * 委托
*/
- String FLOWABLE_SKIP_EXPRESSION_ENABLED = "_FLOWABLE_SKIP_EXPRESSION_ENABLED";
+ String DELEGATE_TASK = "delegateTask";
/**
- * 模型标识key命名规范正则表达式
+ * 转办
*/
- String MODEL_KEY_PATTERN = "^[a-zA-Z][a-zA-Z0-9_]{0,254}$";
+ String TRANSFER_TASK = "transferTask";
/**
- * 用户任务
+ * 加签
*/
- String USER_TASK = "userTask";
+ String ADD_SIGNATURE = "addSignature";
/**
- * 会签
+ * 减签
*/
- String MULTI_INSTANCE = "multiInstance";
+ String REDUCTION_SIGNATURE = "reductionSignature";
/**
- * 是
+ * 流程分类Id转名称
*/
- String TRUE = "0";
+ String CATEGORY_ID_TO_NAME = "category_id_to_name";
/**
- * 否
+ * 流程分类名称
*/
- String FALSE = "1";
+ String FLOW_CATEGORY_NAME = "flow_category_name#30d";
+
+ /**
+ * 默认租户OA申请分类id
+ */
+ Long FLOW_CATEGORY_ID = 100L;
+
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/FormTypeEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/FormTypeEnum.java
deleted file mode 100644
index 083ab7b85..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/FormTypeEnum.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.dromara.workflow.common.enums;
-
-import cn.hutool.core.util.StrUtil;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.Arrays;
-
-/**
- * 任务状态枚举
- *
- * @author may
- */
-@Getter
-@AllArgsConstructor
-public enum FormTypeEnum {
- /**
- * 自定义表单
- */
- STATIC("static", "自定义表单"),
- /**
- * 动态表单
- */
- DYNAMIC("dynamic", "动态表单");
-
- /**
- * 类型
- */
- private final String type;
-
- /**
- * 描述
- */
- private final String desc;
-
- /**
- * 表单类型
- *
- * @param formType 表单类型
- */
- public static String findByType(String formType) {
- if (StringUtils.isBlank(formType)) {
- return StrUtil.EMPTY;
- }
-
- return Arrays.stream(FormTypeEnum.values())
- .filter(statusEnum -> statusEnum.getType().equals(formType))
- .findFirst()
- .map(FormTypeEnum::getDesc)
- .orElse(StrUtil.EMPTY);
- }
-}
-
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java
index a28295822..0fe5cfe90 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java
@@ -3,8 +3,10 @@ package org.dromara.workflow.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
+import java.util.Arrays;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 消息类型枚举
@@ -14,14 +16,17 @@ import java.util.concurrent.ConcurrentHashMap;
@Getter
@AllArgsConstructor
public enum MessageTypeEnum {
+
/**
* 站内信
*/
SYSTEM_MESSAGE("1", "站内信"),
+
/**
* 邮箱
*/
EMAIL_MESSAGE("2", "邮箱"),
+
/**
* 短信
*/
@@ -31,21 +36,18 @@ public enum MessageTypeEnum {
private final String desc;
- private final static Map MESSAGE_TYPE_ENUM_MAP = new ConcurrentHashMap<>(MessageTypeEnum.values().length);
-
- static {
- for (MessageTypeEnum messageType : MessageTypeEnum.values()) {
- MESSAGE_TYPE_ENUM_MAP.put(messageType.code, messageType);
- }
- }
+ private static final Map MESSAGE_TYPE_ENUM_MAP = Arrays.stream(values())
+ .collect(Collectors.toConcurrentMap(MessageTypeEnum::getCode, Function.identity()));
/**
* 根据消息类型 code 获取 MessageTypeEnum
+ *
* @param code 消息类型code
* @return MessageTypeEnum
*/
public static MessageTypeEnum getByCode(String code) {
- return MESSAGE_TYPE_ENUM_MAP.get(code);
+ return MESSAGE_TYPE_ENUM_MAP.getOrDefault(code, null);
}
+
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java
new file mode 100644
index 000000000..60be92fe9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java
@@ -0,0 +1,109 @@
+package org.dromara.workflow.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.dromara.common.core.exception.ServiceException;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 任务分配人枚举
+ *
+ * @author AprilWind
+ */
+@Getter
+@AllArgsConstructor
+public enum TaskAssigneeEnum {
+
+ /**
+ * 用户
+ */
+ USER("用户", ""),
+
+ /**
+ * 角色
+ */
+ ROLE("角色", "role:"),
+
+ /**
+ * 部门
+ */
+ DEPT("部门", "dept:"),
+
+ /**
+ * 岗位
+ */
+ POST("岗位", "post:");
+
+ private final String desc;
+ private final String code;
+
+ /**
+ * 根据描述获取对应的枚举类型
+ *
+ * 通过传入描述，查找并返回匹配的枚举项。如果未找到匹配项，会抛出 {@link ServiceException}。
+ *
+ *
+ * @param desc 描述，用于匹配对应的枚举项
+ * @return TaskAssigneeEnum 返回对应的枚举类型
+ * @throws ServiceException 如果未找到匹配的枚举项
+ */
+ public static TaskAssigneeEnum fromDesc(String desc) {
+ for (TaskAssigneeEnum type : values()) {
+ if (type.getDesc().equals(desc)) {
+ return type;
+ }
+ }
+ throw new ServiceException("未知的办理人类型: " + desc);
+ }
+
+ /**
+ * 根据代码获取对应的枚举类型
+ *
+ * 通过传入代码，查找并返回匹配的枚举项。如果未找到匹配项，会抛出 {@link ServiceException}。
+ *
+ *
+ * @param code 代码，用于匹配对应的枚举项
+ * @return TaskAssigneeEnum 返回对应的枚举类型
+ * @throws IllegalArgumentException 如果未找到匹配的枚举项
+ */
+ public static TaskAssigneeEnum fromCode(String code) {
+ for (TaskAssigneeEnum type : values()) {
+ if (type.getCode().equals(code)) {
+ return type;
+ }
+ }
+ throw new ServiceException("未知的办理人类型代码: " + code);
+ }
+
+ /**
+ * 获取所有办理人类型的描述列表
+ *
+ * 获取当前枚举类所有项的描述字段列表，通常用于展示选择项。
+ *
+ *
+ * @return List 返回所有办理人类型的描述列表
+ */
+ public static List getAssigneeTypeList() {
+ return Arrays.stream(values())
+ .map(TaskAssigneeEnum::getDesc)
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * 获取所有办理人类型的代码列表
+ *
+ * 获取当前枚举类所有项的代码字段列表，通常用于程序内部逻辑的判断。
+ *
+ *
+ * @return List 返回所有办理人类型的代码列表
+ */
+ public static List getAssigneeCodeList() {
+ return Arrays.stream(values())
+ .map(TaskAssigneeEnum::getCode)
+ .collect(Collectors.toList());
+ }
+}
+
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java
new file mode 100644
index 000000000..eed1b91fb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java
@@ -0,0 +1,49 @@
+package org.dromara.workflow.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 人员类型
+ *
+ * @author AprilWind
+ */
+@Getter
+@AllArgsConstructor
+public enum TaskAssigneeType {
+
+ /**
+ * 待办任务的审批人权限
+ * 该权限表示用户是待办任务的审批人，负责审核任务的执行情况。
+ */
+ APPROVER("1", "待办任务的审批人权限"),
+
+ /**
+ * 待办任务的转办人权限
+ * 该权限表示用户是待办任务的转办人，负责将任务分配给其他人员。
+ */
+ TRANSFER("2", "待办任务的转办人权限"),
+
+ /**
+ * 待办任务的委托人权限
+ * 该权限表示用户是待办任务的委托人，能够委托其他人代为处理任务。
+ */
+ DELEGATE("3", "待办任务的委托人权限"),
+
+ /**
+ * 待办任务的抄送人权限
+ * 该权限表示用户是待办任务的抄送人，仅接收任务信息的通知，不参与任务的审批或处理。
+ */
+ COPY("4", "待办任务的抄送人权限");
+
+ /**
+ * 类型
+ */
+ private final String code;
+
+ /**
+ * 描述
+ */
+ private final String description;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java
index 7b2f55c20..d18ebb01d 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java
@@ -3,9 +3,10 @@ package org.dromara.workflow.common.enums;
import cn.hutool.core.util.StrUtil;
import lombok.AllArgsConstructor;
import lombok.Getter;
-import org.apache.commons.lang3.StringUtils;
import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* 任务状态枚举
@@ -15,50 +16,62 @@ import java.util.Arrays;
@Getter
@AllArgsConstructor
public enum TaskStatusEnum {
+
/**
* 撤销
*/
CANCEL("cancel", "撤销"),
+
/**
* 通过
*/
PASS("pass", "通过"),
+
/**
* 待审核
*/
WAITING("waiting", "待审核"),
+
/**
* 作废
*/
INVALID("invalid", "作废"),
+
/**
* 退回
*/
BACK("back", "退回"),
+
/**
* 终止
*/
TERMINATION("termination", "终止"),
+
/**
* 转办
*/
TRANSFER("transfer", "转办"),
+
/**
* 委托
*/
- PENDING("pending", "委托"),
+ DEPUTE("depute", "委托"),
+
/**
* 抄送
*/
COPY("copy", "抄送"),
+
/**
* 加签
*/
SIGN("sign", "加签"),
+
/**
* 减签
*/
SIGN_OFF("sign_off", "减签"),
+
/**
* 超时
*/
@@ -74,21 +87,18 @@ public enum TaskStatusEnum {
*/
private final String desc;
+ private static final Map STATUS_DESC_MAP = Arrays.stream(values())
+ .collect(Collectors.toConcurrentMap(TaskStatusEnum::getStatus, TaskStatusEnum::getDesc));
+
/**
* 任务业务状态
*
* @param status 状态
*/
public static String findByStatus(String status) {
- if (StringUtils.isBlank(status)) {
- return StrUtil.EMPTY;
- }
-
- return Arrays.stream(TaskStatusEnum.values())
- .filter(statusEnum -> statusEnum.getStatus().equals(status))
- .findFirst()
- .map(TaskStatusEnum::getDesc)
- .orElse(StrUtil.EMPTY);
+ // 从缓存中直接获取描述
+ return STATUS_DESC_MAP.getOrDefault(status, StrUtil.EMPTY);
}
+
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java
new file mode 100644
index 000000000..a38c83e27
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java
@@ -0,0 +1,15 @@
+package org.dromara.workflow.config;
+
+
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * warmFlow配置
+ *
+ * @author may
+ */
+@Configuration
+public class WarmFlowConfig {
+
+}
+
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java
deleted file mode 100644
index 842d3d667..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.dromara.workflow.controller;
-
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.workflow.domain.bo.ModelBo;
-import org.dromara.workflow.domain.vo.ModelVo;
-import org.dromara.workflow.service.IActModelService;
-import org.flowable.engine.RepositoryService;
-import org.flowable.engine.repository.Model;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 模型管理 控制层
- *
- * @author may
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/workflow/model")
-public class ActModelController extends BaseController {
-
- @Autowired(required = false)
- private RepositoryService repositoryService;
- private final IActModelService actModelService;
-
-
- /**
- * 分页查询模型
- *
- * @param modelBo 模型参数
- */
- @GetMapping("/list")
- public TableDataInfo page(ModelBo modelBo, PageQuery pageQuery) {
- return actModelService.page(modelBo, pageQuery);
- }
-
- /**
- * 新增模型
- *
- * @param modelBo 模型请求对象
- */
- @Log(title = "模型管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/save")
- public R saveNewModel(@Validated(AddGroup.class) @RequestBody ModelBo modelBo) {
- return toAjax(actModelService.saveNewModel(modelBo));
- }
-
- /**
- * 查询模型
- *
- * @param id 模型id
- */
- @GetMapping("/getInfo/{id}")
- public R getInfo(@NotBlank(message = "模型id不能为空") @PathVariable String id) {
- return R.ok(actModelService.getInfo(id));
- }
-
- /**
- * 修改模型信息
- *
- * @param modelBo 模型数据
- */
- @Log(title = "模型管理", businessType = BusinessType.UPDATE)
- @RepeatSubmit()
- @PutMapping(value = "/update")
- public R update(@RequestBody ModelBo modelBo) {
- return toAjax(actModelService.update(modelBo));
- }
-
- /**
- * 编辑XMl模型
- *
- * @param modelBo 模型数据
- */
- @Log(title = "模型管理", businessType = BusinessType.UPDATE)
- @RepeatSubmit()
- @PutMapping(value = "/editModelXml")
- public R editModel(@Validated(EditGroup.class) @RequestBody ModelBo modelBo) {
- return toAjax(actModelService.editModelXml(modelBo));
- }
-
- /**
- * 删除流程模型
- *
- * @param ids 模型id
- */
- @Log(title = "模型管理", businessType = BusinessType.DELETE)
- @RepeatSubmit()
- @DeleteMapping("/{ids}")
- @Transactional(rollbackFor = Exception.class)
- public R delete(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
- Arrays.stream(ids).parallel().forEachOrdered(repositoryService::deleteModel);
- return R.ok();
- }
-
- /**
- * 模型部署
- *
- * @param id 模型id
- */
- @Log(title = "模型管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/modelDeploy/{id}")
- public R deploy(@NotBlank(message = "模型id不能为空") @PathVariable("id") String id) {
- return toAjax(actModelService.modelDeploy(id));
- }
-
- /**
- * 导出模型zip压缩包
- *
- * @param modelIds 模型id
- * @param response 相应
- */
- @GetMapping("/export/zip/{modelIds}")
- public void exportZip(@NotEmpty(message = "模型id不能为空") @PathVariable List modelIds,
- HttpServletResponse response) {
- actModelService.exportZip(modelIds, response);
- }
-
- /**
- * 复制模型
- *
- * @param modelBo 模型数据
- */
- @PostMapping("/copyModel")
- public R copyModel(@RequestBody ModelBo modelBo) {
- return toAjax(actModelService.copyModel(modelBo));
- }
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
deleted file mode 100644
index 5198bd164..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.dromara.workflow.controller;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.workflow.domain.bo.ProcessDefinitionBo;
-import org.dromara.workflow.domain.vo.ProcessDefinitionVo;
-import org.dromara.workflow.service.IActProcessDefinitionService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 流程定义管理 控制层
- *
- * @author may
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/workflow/processDefinition")
-public class ActProcessDefinitionController extends BaseController {
-
- private final IActProcessDefinitionService actProcessDefinitionService;
-
- /**
- * 分页查询
- *
- * @param bo 参数
- */
- @GetMapping("/list")
- public TableDataInfo page(ProcessDefinitionBo bo, PageQuery pageQuery) {
- return actProcessDefinitionService.page(bo, pageQuery);
- }
-
- /**
- * 查询历史流程定义列表
- *
- * @param key 流程定义key
- */
- @GetMapping("/getListByKey/{key}")
- public R> getListByKey(@NotEmpty(message = "流程定义key不能为空") @PathVariable String key) {
- return R.ok("操作成功", actProcessDefinitionService.getListByKey(key));
- }
-
- /**
- * 查看流程定义图片
- *
- * @param processDefinitionId 流程定义id
- */
- @GetMapping("/definitionImage/{processDefinitionId}")
- public R definitionImage(@PathVariable String processDefinitionId) {
- return R.ok("操作成功", actProcessDefinitionService.definitionImage(processDefinitionId));
- }
-
- /**
- * 查看流程定义xml文件
- *
- * @param processDefinitionId 流程定义id
- */
- @GetMapping("/definitionXml/{processDefinitionId}")
- public R> definitionXml(@NotBlank(message = "流程定义id不能为空") @PathVariable String processDefinitionId) {
- Map map = new HashMap<>();
- String xmlStr = actProcessDefinitionService.definitionXml(processDefinitionId);
- map.put("xml", Arrays.asList(xmlStr.split("\n")));
- map.put("xmlStr", xmlStr);
- return R.ok(map);
- }
-
- /**
- * 删除流程定义
- *
- * @param deploymentIds 部署id
- * @param processDefinitionIds 流程定义id
- */
- @Log(title = "流程定义管理", businessType = BusinessType.DELETE)
- @DeleteMapping("/{deploymentIds}/{processDefinitionIds}")
- public R deleteDeployment(@NotNull(message = "流程部署id不能为空") @PathVariable List deploymentIds,
- @NotNull(message = "流程定义id不能为空") @PathVariable List processDefinitionIds) {
- return toAjax(actProcessDefinitionService.deleteDeployment(deploymentIds, processDefinitionIds));
- }
-
- /**
- * 激活或者挂起流程定义
- *
- * @param processDefinitionId 流程定义id
- */
- @Log(title = "流程定义管理", businessType = BusinessType.UPDATE)
- @RepeatSubmit()
- @PutMapping("/updateDefinitionState/{processDefinitionId}")
- public R updateDefinitionState(@NotBlank(message = "流程定义id不能为空") @PathVariable String processDefinitionId) {
- return toAjax(actProcessDefinitionService.updateDefinitionState(processDefinitionId));
- }
-
- /**
- * 迁移流程定义
- *
- * @param currentProcessDefinitionId 当前流程定义id
- * @param fromProcessDefinitionId 需要迁移到的流程定义id
- */
- @Log(title = "流程定义管理", businessType = BusinessType.UPDATE)
- @RepeatSubmit()
- @PutMapping("/migrationDefinition/{currentProcessDefinitionId}/{fromProcessDefinitionId}")
- public R migrationDefinition(@NotBlank(message = "当前流程定义id") @PathVariable String currentProcessDefinitionId,
- @NotBlank(message = "需要迁移到的流程定义id") @PathVariable String fromProcessDefinitionId) {
- return toAjax(actProcessDefinitionService.migrationDefinition(currentProcessDefinitionId, fromProcessDefinitionId));
- }
-
- /**
- * 流程定义转换为模型
- *
- * @param processDefinitionId 流程定义id
- */
- @Log(title = "流程定义管理", businessType = BusinessType.UPDATE)
- @RepeatSubmit()
- @PutMapping("/convertToModel/{processDefinitionId}")
- public R convertToModel(@NotEmpty(message = "流程定义id不能为空") @PathVariable String processDefinitionId) {
- return toAjax(actProcessDefinitionService.convertToModel(processDefinitionId));
- }
-
- /**
- * 通过zip或xml部署流程定义
- *
- * @param file 文件
- * @param categoryCode 分类
- */
- @Log(title = "流程定义管理", businessType = BusinessType.INSERT)
- @PostMapping("/deployByFile")
- public void deployByFile(@RequestParam("file") MultipartFile file, @RequestParam("categoryCode") String categoryCode) {
- actProcessDefinitionService.deployByFile(file, categoryCode);
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java
deleted file mode 100644
index 931b9f568..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.dromara.workflow.controller;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.web.core.BaseController;
-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.ProcessInstanceVo;
-import org.dromara.workflow.service.IActProcessInstanceService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 流程实例管理 控制层
- *
- * @author may
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/workflow/processInstance")
-public class ActProcessInstanceController extends BaseController {
-
- private final IActProcessInstanceService actProcessInstanceService;
-
- /**
- * 分页查询正在运行的流程实例
- *
- * @param bo 参数
- */
- @GetMapping("/getPageByRunning")
- public TableDataInfo getPageByRunning(ProcessInstanceBo bo, PageQuery pageQuery) {
- return actProcessInstanceService.getPageByRunning(bo, pageQuery);
- }
-
- /**
- * 分页查询已结束的流程实例
- *
- * @param bo 参数
- */
- @GetMapping("/getPageByFinish")
- public TableDataInfo getPageByFinish(ProcessInstanceBo bo, PageQuery pageQuery) {
- return actProcessInstanceService.getPageByFinish(bo, pageQuery);
- }
-
- /**
- * 通过业务id获取历史流程图
- *
- * @param businessKey 业务id
- */
- @GetMapping("/getHistoryImage/{businessKey}")
- public R getHistoryImage(@NotBlank(message = "业务id不能为空") @PathVariable String businessKey) {
- return R.ok("操作成功", actProcessInstanceService.getHistoryImage(businessKey));
- }
-
- /**
- * 通过业务id获取历史流程图运行中，历史等节点
- *
- * @param businessKey 业务id
- */
- @GetMapping("/getHistoryList/{businessKey}")
- public R> getHistoryList(@NotBlank(message = "业务id不能为空") @PathVariable String businessKey) {
- return R.ok("操作成功", actProcessInstanceService.getHistoryList(businessKey));
- }
-
- /**
- * 获取审批记录
- *
- * @param businessKey 业务id
- */
- @GetMapping("/getHistoryRecord/{businessKey}")
- public R> getHistoryRecord(@NotBlank(message = "业务id不能为空") @PathVariable String businessKey) {
- return R.ok(actProcessInstanceService.getHistoryRecord(businessKey));
- }
-
- /**
- * 作废流程实例，不会删除历史记录(删除运行中的实例)
- *
- * @param processInvalidBo 参数
- */
- @Log(title = "流程实例管理", businessType = BusinessType.DELETE)
- @RepeatSubmit()
- @PostMapping("/deleteRunInstance")
- public R deleteRunInstance(@Validated(AddGroup.class) @RequestBody ProcessInvalidBo processInvalidBo) {
- return toAjax(actProcessInstanceService.deleteRunInstance(processInvalidBo));
- }
-
- /**
- * 运行中的实例 删除程实例，删除历史记录，删除业务与流程关联信息
- *
- * @param businessKeys 业务id
- */
- @Log(title = "流程实例管理", businessType = BusinessType.DELETE)
- @RepeatSubmit()
- @DeleteMapping("/deleteRunAndHisInstance/{businessKeys}")
- public R deleteRunAndHisInstance(@NotNull(message = "业务id不能为空") @PathVariable String[] businessKeys) {
- return toAjax(actProcessInstanceService.deleteRunAndHisInstance(Arrays.asList(businessKeys)));
- }
-
- /**
- * 已完成的实例 删除程实例，删除历史记录，删除业务与流程关联信息
- *
- * @param businessKeys 业务id
- */
- @Log(title = "流程实例管理", businessType = BusinessType.DELETE)
- @RepeatSubmit()
- @DeleteMapping("/deleteFinishAndHisInstance/{businessKeys}")
- public R deleteFinishAndHisInstance(@NotNull(message = "业务id不能为空") @PathVariable String[] businessKeys) {
- return toAjax(actProcessInstanceService.deleteFinishAndHisInstance(Arrays.asList(businessKeys)));
- }
-
- /**
- * 撤销流程申请
- *
- * @param businessKey 业务id
- */
- @Log(title = "流程实例管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/cancelProcessApply/{businessKey}")
- public R cancelProcessApply(@NotBlank(message = "业务id不能为空") @PathVariable String businessKey) {
- return toAjax(actProcessInstanceService.cancelProcessApply(businessKey));
- }
-
- /**
- * 分页查询当前登录人单据
- *
- * @param bo 参数
- */
- @GetMapping("/getPageByCurrent")
- public TableDataInfo getPageByCurrent(ProcessInstanceBo bo, PageQuery pageQuery) {
- return actProcessInstanceService.getPageByCurrent(bo, pageQuery);
- }
-
- /**
- * 任务催办(给当前任务办理人发送站内信，邮件，短信等)
- *
- * @param taskUrgingBo 任务催办
- */
- @Log(title = "流程实例管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/taskUrging")
- public R taskUrging(@RequestBody TaskUrgingBo taskUrgingBo) {
- return toAjax(actProcessInstanceService.taskUrging(taskUrgingBo));
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
deleted file mode 100644
index 25724b6d9..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
+++ /dev/null
@@ -1,295 +0,0 @@
-package org.dromara.workflow.controller;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
-import jakarta.validation.constraints.NotBlank;
-import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.workflow.domain.WfTaskBackNode;
-import org.dromara.workflow.domain.bo.*;
-import org.dromara.workflow.domain.vo.TaskVo;
-import org.dromara.workflow.domain.vo.VariableVo;
-import org.dromara.workflow.service.IActTaskService;
-import org.dromara.workflow.service.IWfTaskBackNodeService;
-import org.dromara.workflow.utils.QueryUtils;
-import org.flowable.engine.TaskService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 任务管理 控制层
- *
- * @author may
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/workflow/task")
-public class ActTaskController extends BaseController {
-
- @Autowired(required = false)
- private TaskService taskService;
- private final IActTaskService actTaskService;
- private final IWfTaskBackNodeService wfTaskBackNodeService;
-
-
- /**
- * 启动任务
- *
- * @param startProcessBo 启动流程参数
- */
- @Log(title = "任务管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/startWorkFlow")
- public R> startWorkFlow(@Validated(AddGroup.class) @RequestBody StartProcessBo startProcessBo) {
- Map map = actTaskService.startWorkFlow(startProcessBo);
- return R.ok("提交成功", map);
- }
-
- /**
- * 办理任务
- *
- * @param completeTaskBo 办理任务参数
- */
- @Log(title = "任务管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/completeTask")
- public R completeTask(@Validated(AddGroup.class) @RequestBody CompleteTaskBo completeTaskBo) {
- return toAjax(actTaskService.completeTask(completeTaskBo));
- }
-
- /**
- * 查询当前用户的待办任务
- *
- * @param taskBo 参数
- */
- @GetMapping("/getPageByTaskWait")
- public TableDataInfo getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery) {
- return actTaskService.getPageByTaskWait(taskBo, pageQuery);
- }
-
- /**
- * 查询当前租户所有待办任务
- *
- * @param taskBo 参数
- */
- @GetMapping("/getPageByAllTaskWait")
- public TableDataInfo getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery) {
- return actTaskService.getPageByAllTaskWait(taskBo, pageQuery);
- }
-
- /**
- * 查询当前用户的已办任务
- *
- * @param taskBo 参数
- */
- @GetMapping("/getPageByTaskFinish")
- public TableDataInfo getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
- return actTaskService.getPageByTaskFinish(taskBo, pageQuery);
- }
-
- /**
- * 查询当前用户的抄送
- *
- * @param taskBo 参数
- */
- @GetMapping("/getPageByTaskCopy")
- public TableDataInfo getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery) {
- return actTaskService.getPageByTaskCopy(taskBo, pageQuery);
- }
-
- /**
- * 查询当前租户所有已办任务
- *
- * @param taskBo 参数
- */
- @GetMapping("/getPageByAllTaskFinish")
- public TableDataInfo getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
- return actTaskService.getPageByAllTaskFinish(taskBo, pageQuery);
- }
-
- /**
- * 签收（拾取）任务
- *
- * @param taskId 任务id
- */
- @Log(title = "任务管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/claim/{taskId}")
- public R claimTask(@NotBlank(message = "任务id不能为空") @PathVariable String taskId) {
- try {
- taskService.claim(taskId, Convert.toStr(LoginHelper.getUserId()));
- return R.ok();
- } catch (Exception e) {
- e.printStackTrace();
- return R.fail("签收任务失败：" + e.getMessage());
- }
- }
-
- /**
- * 归还（拾取的）任务
- *
- * @param taskId 任务id
- */
- @Log(title = "任务管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/returnTask/{taskId}")
- public R returnTask(@NotBlank(message = "任务id不能为空") @PathVariable String taskId) {
- try {
- taskService.setAssignee(taskId, null);
- return R.ok();
- } catch (Exception e) {
- e.printStackTrace();
- return R.fail("归还任务失败：" + e.getMessage());
- }
- }
-
- /**
- * 委派任务
- *
- * @param delegateBo 参数
- */
- @Log(title = "任务管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/delegateTask")
- public R delegateTask(@Validated({AddGroup.class}) @RequestBody DelegateBo delegateBo) {
- return toAjax(actTaskService.delegateTask(delegateBo));
- }
-
- /**
- * 终止任务
- *
- * @param terminationBo 参数
- */
- @Log(title = "任务管理", businessType = BusinessType.DELETE)
- @RepeatSubmit()
- @PostMapping("/terminationTask")
- public R terminationTask(@RequestBody TerminationBo terminationBo) {
- return toAjax(actTaskService.terminationTask(terminationBo));
- }
-
- /**
- * 转办任务
- *
- * @param transmitBo 参数
- */
- @Log(title = "任务管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/transferTask")
- public R transferTask(@Validated({AddGroup.class}) @RequestBody TransmitBo transmitBo) {
- return toAjax(actTaskService.transferTask(transmitBo));
- }
-
- /**
- * 会签任务加签
- *
- * @param addMultiBo 参数
- */
- @Log(title = "任务管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/addMultiInstanceExecution")
- public R addMultiInstanceExecution(@Validated({AddGroup.class}) @RequestBody AddMultiBo addMultiBo) {
- return toAjax(actTaskService.addMultiInstanceExecution(addMultiBo));
- }
-
- /**
- * 会签任务减签
- *
- * @param deleteMultiBo 参数
- */
- @Log(title = "任务管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/deleteMultiInstanceExecution")
- public R deleteMultiInstanceExecution(@Validated({AddGroup.class}) @RequestBody DeleteMultiBo deleteMultiBo) {
- return toAjax(actTaskService.deleteMultiInstanceExecution(deleteMultiBo));
- }
-
- /**
- * 驳回审批
- *
- * @param backProcessBo 参数
- */
- @Log(title = "任务管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/backProcess")
- public R backProcess(@Validated({AddGroup.class}) @RequestBody BackProcessBo backProcessBo) {
- return R.ok("操作成功", actTaskService.backProcess(backProcessBo));
- }
-
- /**
- * 获取当前任务
- *
- * @param taskId 任务id
- */
- @GetMapping("/getTaskById/{taskId}")
- public R getTaskById(@PathVariable String taskId) {
- return R.ok(QueryUtils.getTask(taskId));
- }
-
-
- /**
- * 修改任务办理人
- *
- * @param taskIds 任务id
- * @param userId 办理人id
- */
- @Log(title = "任务管理", businessType = BusinessType.UPDATE)
- @RepeatSubmit()
- @PutMapping("/updateAssignee/{taskIds}/{userId}")
- public R updateAssignee(@PathVariable String[] taskIds, @PathVariable String userId) {
- return toAjax(actTaskService.updateAssignee(taskIds, userId));
- }
-
- /**
- * 查询流程变量
- *
- * @param taskId 任务id
- */
- @GetMapping("/getInstanceVariable/{taskId}")
- public R> getProcessInstVariable(@PathVariable String taskId) {
- return R.ok(actTaskService.getInstanceVariable(taskId));
- }
-
- /**
- * 获取可驳回得任务节点
- *
- * @param processInstanceId 流程实例id
- */
- @GetMapping("/getTaskNodeList/{processInstanceId}")
- public R> getNodeList(@PathVariable String processInstanceId) {
- return R.ok(CollUtil.reverse(wfTaskBackNodeService.getListByInstanceId(processInstanceId)));
- }
-
- /**
- * 查询工作流任务用户选择加签人员
- *
- * @param taskId 任务id
- */
- @GetMapping("/getTaskUserIdsByAddMultiInstance/{taskId}")
- public R getTaskUserIdsByAddMultiInstance(@PathVariable String taskId) {
- return R.ok("操作成功", actTaskService.getTaskUserIdsByAddMultiInstance(taskId));
- }
-
- /**
- * 查询工作流选择减签人员
- *
- * @param taskId 任务id
- */
- @GetMapping("/getListByDeleteMultiInstance/{taskId}")
- public R> getListByDeleteMultiInstance(@PathVariable String taskId) {
- return R.ok(actTaskService.getListByDeleteMultiInstance(taskId));
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java
new file mode 100644
index 000000000..99fa064df
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java
@@ -0,0 +1,130 @@
+package org.dromara.workflow.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.lang.tree.Tree;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.workflow.domain.bo.FlowCategoryBo;
+import org.dromara.workflow.domain.vo.FlowCategoryVo;
+import org.dromara.workflow.service.IFlwCategoryService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 流程分类
+ *
+ * @author may
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/workflow/category")
+public class FlwCategoryController extends BaseController {
+
+ private final IFlwCategoryService flwCategoryService;
+
+ /**
+ * 查询流程分类列表
+ */
+ @SaCheckPermission("workflow:category:list")
+ @GetMapping("/list")
+ public R> list(FlowCategoryBo bo) {
+ List list = flwCategoryService.queryList(bo);
+ return R.ok(list);
+ }
+
+ /**
+ * 导出流程分类列表
+ */
+ @SaCheckPermission("workflow:category:export")
+ @Log(title = "流程分类", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(FlowCategoryBo bo, HttpServletResponse response) {
+ List list = flwCategoryService.queryList(bo);
+ ExcelUtil.exportExcel(list, "流程分类", FlowCategoryVo.class, response);
+ }
+
+ /**
+ * 获取流程分类详细信息
+ *
+ * @param categoryId 主键
+ */
+ @SaCheckPermission("workflow:category:query")
+ @GetMapping("/{categoryId}")
+ public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long categoryId) {
+ flwCategoryService.checkCategoryDataScope(categoryId);
+ return R.ok(flwCategoryService.queryById(categoryId));
+ }
+
+ /**
+ * 新增流程分类
+ */
+ @SaCheckPermission("workflow:category:add")
+ @Log(title = "流程分类", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping()
+ public R add(@Validated(AddGroup.class) @RequestBody FlowCategoryBo category) {
+ if (!flwCategoryService.checkCategoryNameUnique(category)) {
+ return R.fail("新增流程分类'" + category.getCategoryName() + "'失败，流程分类名称已存在");
+ }
+ return toAjax(flwCategoryService.insertByBo(category));
+ }
+
+ /**
+ * 修改流程分类
+ */
+ @SaCheckPermission("workflow:category:edit")
+ @Log(title = "流程分类", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping()
+ public R edit(@Validated(EditGroup.class) @RequestBody FlowCategoryBo category) {
+ Long categoryId = category.getCategoryId();
+ flwCategoryService.checkCategoryDataScope(categoryId);
+ if (!flwCategoryService.checkCategoryNameUnique(category)) {
+ return R.fail("修改流程分类'" + category.getCategoryName() + "'失败，流程分类名称已存在");
+ } else if (category.getParentId().equals(categoryId)) {
+ return R.fail("修改流程分类'" + category.getCategoryName() + "'失败，上级流程分类不能是自己");
+ }
+ return toAjax(flwCategoryService.updateByBo(category));
+ }
+
+ /**
+ * 删除流程分类
+ *
+ * @param categoryId 主键
+ */
+ @SaCheckPermission("workflow:category:remove")
+ @Log(title = "流程分类", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{categoryId}")
+ public R remove(@PathVariable Long categoryId) {
+ if (flwCategoryService.hasChildByCategoryId(categoryId)) {
+ return R.warn("存在下级流程分类,不允许删除");
+ }
+ if (flwCategoryService.checkCategoryExistDefinition(categoryId)) {
+ return R.warn("流程分类存在流程定义,不允许删除");
+ }
+ return toAjax(flwCategoryService.deleteWithValidById(categoryId));
+ }
+
+ /**
+ * 获取流程分类树列表
+ *
+ * @param categoryBo 流程分类
+ */
+ @GetMapping("/categoryTree")
+ public R>> categoryTree(FlowCategoryBo categoryBo) {
+ return R.ok(flwCategoryService.selectCategoryTreeList(categoryBo));
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java
new file mode 100644
index 000000000..b125f0f28
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java
@@ -0,0 +1,194 @@
+package org.dromara.workflow.controller;
+
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.warm.flow.core.entity.Definition;
+import org.dromara.warm.flow.core.service.DefService;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
+import org.dromara.workflow.domain.vo.FlowDefinitionVo;
+import org.dromara.workflow.service.IFlwDefinitionService;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 流程定义管理 控制层
+ *
+ * @author may
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/workflow/definition")
+public class FlwDefinitionController extends BaseController {
+
+ private final IFlwDefinitionService flwDefinitionService;
+ private final DefService defService;
+
+ /**
+ * 查询流程定义列表
+ *
+ * @param flowDefinition 参数
+ * @param pageQuery 分页
+ */
+ @GetMapping("/list")
+ public TableDataInfo list(FlowDefinition flowDefinition, PageQuery pageQuery) {
+ return flwDefinitionService.queryList(flowDefinition, pageQuery);
+ }
+
+ /**
+ * 查询未发布的流程定义列表
+ *
+ * @param flowDefinition 参数
+ * @param pageQuery 分页
+ */
+ @GetMapping("/unPublishList")
+ public TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) {
+ return flwDefinitionService.unPublishList(flowDefinition, pageQuery);
+ }
+
+ /**
+ * 获取流程定义详细信息
+ *
+ * @param id 流程定义id
+ */
+ @GetMapping(value = "/{id}")
+ public R getInfo(@PathVariable Long id) {
+ return R.ok(defService.getById(id));
+ }
+
+ /**
+ * 新增流程定义
+ *
+ * @param flowDefinition 参数
+ */
+ @Log(title = "流程定义", businessType = BusinessType.INSERT)
+ @PostMapping
+ @RepeatSubmit()
+ @Transactional(rollbackFor = Exception.class)
+ public R add(@RequestBody FlowDefinition flowDefinition) {
+ return R.ok(defService.checkAndSave(flowDefinition));
+ }
+
+ /**
+ * 修改流程定义
+ *
+ * @param flowDefinition 参数
+ */
+ @Log(title = "流程定义", businessType = BusinessType.UPDATE)
+ @PutMapping
+ @RepeatSubmit()
+ @Transactional(rollbackFor = Exception.class)
+ public R edit(@RequestBody FlowDefinition flowDefinition) {
+ return R.ok(defService.updateById(flowDefinition));
+ }
+
+ /**
+ * 发布流程定义
+ *
+ * @param id 流程定义id
+ */
+ @Log(title = "流程定义", businessType = BusinessType.INSERT)
+ @PutMapping("/publish/{id}")
+ @RepeatSubmit()
+ @Transactional(rollbackFor = Exception.class)
+ public R publish(@PathVariable Long id) {
+ return R.ok(flwDefinitionService.publish(id));
+ }
+
+ /**
+ * 取消发布流程定义
+ *
+ * @param id 流程定义id
+ */
+ @Log(title = "流程定义", businessType = BusinessType.INSERT)
+ @PutMapping("/unPublish/{id}")
+ @RepeatSubmit()
+ @Transactional(rollbackFor = Exception.class)
+ public R unPublish(@PathVariable Long id) {
+ return R.ok(defService.unPublish(id));
+ }
+
+ /**
+ * 删除流程定义
+ */
+ @Log(title = "流程定义", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ @Transactional(rollbackFor = Exception.class)
+ public R remove(@PathVariable List ids) {
+ return toAjax(flwDefinitionService.removeDef(ids));
+ }
+
+ /**
+ * 复制流程定义
+ *
+ * @param id 流程定义id
+ */
+ @Log(title = "流程定义", businessType = BusinessType.INSERT)
+ @PostMapping("/copy/{id}")
+ @RepeatSubmit()
+ @Transactional(rollbackFor = Exception.class)
+ public R copy(@PathVariable Long id) {
+ return R.ok(defService.copyDef(id));
+ }
+
+ /**
+ * 导入流程定义
+ *
+ * @param file 文件
+ * @param category 分类
+ */
+ @Log(title = "流程定义", businessType = BusinessType.IMPORT)
+ @PostMapping("/importDef")
+ @Transactional(rollbackFor = Exception.class)
+ public R importDef(MultipartFile file, String category) {
+ return R.ok(flwDefinitionService.importXml(file, category));
+ }
+
+ /**
+ * 导出流程定义
+ *
+ * @param id 流程定义id
+ * @param response 响应
+ * @throws IOException 异常
+ */
+ @Log(title = "流程定义", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportDef/{id}")
+ public void exportDef(@PathVariable Long id, HttpServletResponse response) throws IOException {
+ flwDefinitionService.exportDef(id, response);
+ }
+
+ /**
+ * 获取流程定义xml字符串
+ *
+ * @param id 流程定义id
+ */
+ @GetMapping("/xmlString/{id}")
+ public R xmlString(@PathVariable Long id) {
+ return R.ok("操作成功", defService.xmlString(id));
+ }
+
+ /**
+ * 激活/挂起流程定义
+ *
+ * @param id 流程定义id
+ * @param active 激活/挂起
+ */
+ @RepeatSubmit()
+ @PutMapping("/active/{id}")
+ public R active(@PathVariable Long id, @RequestParam boolean active) {
+ return R.ok(active ? defService.active(id) : defService.unActive(id));
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
new file mode 100644
index 000000000..cb65f2158
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
@@ -0,0 +1,155 @@
+package org.dromara.workflow.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.warm.flow.core.service.InsService;
+import org.dromara.workflow.domain.bo.FlowCancelBo;
+import org.dromara.workflow.domain.bo.FlowInstanceBo;
+import org.dromara.workflow.domain.bo.FlowInvalidBo;
+import org.dromara.workflow.domain.vo.FlowInstanceVo;
+import org.dromara.workflow.service.IFlwInstanceService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 流程实例管理 控制层
+ *
+ * @author may
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/workflow/instance")
+public class FlwInstanceController extends BaseController {
+
+ private final IFlwInstanceService flwInstanceService;
+ private final InsService insService;
+
+ /**
+ * 查询正在运行的流程实例列表
+ *
+ * @param flowInstanceBo 流程实例
+ * @param pageQuery 分页
+ */
+ @GetMapping("/pageByRunning")
+ public TableDataInfo selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
+ return flwInstanceService.selectRunningInstanceList(flowInstanceBo, pageQuery);
+ }
+
+ /**
+ * 查询已结束的流程实例列表
+ *
+ * @param flowInstanceBo 流程实例
+ * @param pageQuery 分页
+ */
+ @GetMapping("/pageByFinish")
+ public TableDataInfo selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
+ return flwInstanceService.selectFinishInstanceList(flowInstanceBo, pageQuery);
+ }
+
+ /**
+ * 根据业务id查询流程实例详细信息
+ *
+ * @param businessId 业务id
+ */
+ @GetMapping("/getInfo/{businessId}")
+ public R getInfo(@PathVariable Long businessId) {
+ return R.ok(flwInstanceService.queryByBusinessId(businessId));
+ }
+
+ /**
+ * 按照业务id删除流程实例
+ *
+ * @param businessIds 业务id
+ */
+ @DeleteMapping("/deleteByBusinessIds/{businessIds}")
+ public R deleteByBusinessIds(@PathVariable List businessIds) {
+ return toAjax(flwInstanceService.deleteByBusinessIds(businessIds));
+ }
+
+ /**
+ * 按照实例id删除流程实例
+ *
+ * @param instanceIds 实例id
+ */
+ @DeleteMapping("/deleteByInstanceIds/{instanceIds}")
+ public R deleteByInstanceIds(@PathVariable List instanceIds) {
+ return toAjax(flwInstanceService.deleteByInstanceIds(instanceIds));
+ }
+
+ /**
+ * 撤销流程
+ *
+ * @param bo 参数
+ */
+ @RepeatSubmit()
+ @PutMapping("/cancelProcessApply")
+ public R cancelProcessApply(@RequestBody FlowCancelBo bo) {
+ return toAjax(flwInstanceService.cancelProcessApply(bo));
+ }
+
+ /**
+ * 激活/挂起流程实例
+ *
+ * @param id 流程实例id
+ * @param active 激活/挂起
+ */
+ @RepeatSubmit()
+ @PutMapping("/active/{id}")
+ public R active(@PathVariable Long id, @RequestParam boolean active) {
+ return R.ok(active ? insService.active(id) : insService.unActive(id));
+ }
+
+ /**
+ * 获取当前登陆人发起的流程实例
+ *
+ * @param flowInstanceBo 参数
+ * @param pageQuery 分页
+ */
+ @GetMapping("/pageByCurrent")
+ public TableDataInfo selectCurrentInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
+ return flwInstanceService.selectCurrentInstanceList(flowInstanceBo, pageQuery);
+ }
+
+ /**
+ * 获取流程图，流程记录
+ *
+ * @param businessId 业务id
+ */
+ @GetMapping("/flowImage/{businessId}")
+ public R> flowImage(@PathVariable String businessId) {
+ return R.ok(flwInstanceService.flowImage(businessId));
+ }
+
+ /**
+ * 获取流程变量
+ *
+ * @param instanceId 流程实例id
+ */
+ @GetMapping("/instanceVariable/{instanceId}")
+ public R> instanceVariable(@PathVariable String instanceId) {
+ return R.ok(flwInstanceService.instanceVariable(instanceId));
+ }
+
+ /**
+ * 作废流程
+ *
+ * @param bo 参数
+ */
+ @Log(title = "流程实例管理", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping("/invalid")
+ public R invalid(@Validated @RequestBody FlowInvalidBo bo) {
+ return R.ok(flwInstanceService.processInvalid(bo));
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java
new file mode 100644
index 000000000..7736b7bf8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java
@@ -0,0 +1,199 @@
+package org.dromara.workflow.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.warm.flow.core.entity.Node;
+import org.dromara.workflow.domain.bo.*;
+import org.dromara.workflow.domain.vo.FlowHisTaskVo;
+import org.dromara.workflow.domain.vo.FlowTaskVo;
+import org.dromara.workflow.service.IFlwTaskService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 任务管理 控制层
+ *
+ * @author may
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/workflow/task")
+public class FlwTaskController extends BaseController {
+
+ private final IFlwTaskService flwTaskService;
+
+ /**
+ * 启动任务
+ *
+ * @param startProcessBo 启动流程参数
+ */
+ @Log(title = "任务管理", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping("/startWorkFlow")
+ public R> startWorkFlow(@Validated(AddGroup.class) @RequestBody StartProcessBo startProcessBo) {
+ Map map = flwTaskService.startWorkFlow(startProcessBo);
+ return R.ok("提交成功", map);
+ }
+
+ /**
+ * 办理任务
+ *
+ * @param completeTaskBo 办理任务参数
+ */
+ @Log(title = "任务管理", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping("/completeTask")
+ public R completeTask(@Validated(AddGroup.class) @RequestBody CompleteTaskBo completeTaskBo) {
+ return toAjax(flwTaskService.completeTask(completeTaskBo));
+ }
+
+ /**
+ * 查询当前用户的待办任务
+ *
+ * @param flowTaskBo 参数
+ * @param pageQuery 分页
+ */
+ @GetMapping("/pageByTaskWait")
+ public TableDataInfo pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+ return flwTaskService.pageByTaskWait(flowTaskBo, pageQuery);
+ }
+
+ /**
+ * 查询当前用户的已办任务
+ *
+ * @param flowTaskBo 参数
+ * @param pageQuery 分页
+ */
+
+ @GetMapping("/pageByTaskFinish")
+ public TableDataInfo pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+ return flwTaskService.pageByTaskFinish(flowTaskBo, pageQuery);
+ }
+
+ /**
+ * 查询待办任务
+ *
+ * @param flowTaskBo 参数
+ * @param pageQuery 分页
+ */
+ @GetMapping("/pageByAllTaskWait")
+ public TableDataInfo pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+ return flwTaskService.pageByAllTaskWait(flowTaskBo, pageQuery);
+ }
+
+ /**
+ * 查询已办任务
+ *
+ * @param flowTaskBo 参数
+ * @param pageQuery 分页
+ */
+ @GetMapping("/pageByAllTaskFinish")
+ public TableDataInfo pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+ return flwTaskService.pageByAllTaskFinish(flowTaskBo, pageQuery);
+ }
+
+ /**
+ * 查询当前用户的抄送
+ *
+ * @param flowTaskBo 参数
+ * @param pageQuery 分页
+ */
+ @GetMapping("/pageByTaskCopy")
+ public TableDataInfo pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+ return flwTaskService.pageByTaskCopy(flowTaskBo, pageQuery);
+ }
+
+ /**
+ * 根据taskId查询代表任务
+ *
+ * @param taskId 任务id
+ */
+ @GetMapping("/getTask/{taskId}")
+ public R getTask(@PathVariable Long taskId) {
+ return R.ok(flwTaskService.selectById(taskId));
+ }
+
+ /**
+ * 终止任务
+ *
+ * @param bo 参数
+ */
+ @Log(title = "任务管理", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping("/terminationTask")
+ public R terminationTask(@RequestBody FlowTerminationBo bo) {
+ return R.ok(flwTaskService.terminationTask(bo));
+ }
+
+ /**
+ * 任务操作
+ *
+ * @param bo 参数
+ * @param taskOperation 操作类型，委派 delegateTask、转办 transferTask、加签 addSignature、减签 reductionSignature
+ */
+ @Log(title = "任务管理", businessType = BusinessType.UPDATE)
+ @RepeatSubmit
+ @PostMapping("/taskOperation/{taskOperation}")
+ public R taskOperation(@Validated @RequestBody TaskOperationBo bo, @PathVariable String taskOperation) {
+ return toAjax(flwTaskService.taskOperation(bo, taskOperation));
+ }
+
+ /**
+ * 修改任务办理人
+ *
+ * @param taskIdList 任务id
+ * @param userId 办理人id
+ */
+ @Log(title = "任务管理", businessType = BusinessType.UPDATE)
+ @RepeatSubmit()
+ @PutMapping("/updateAssignee/{userId}")
+ public R updateAssignee(@RequestBody List taskIdList, @PathVariable String userId) {
+ return toAjax(flwTaskService.updateAssignee(taskIdList, userId));
+ }
+
+ /**
+ * 驳回审批
+ *
+ * @param bo 参数
+ */
+ @Log(title = "任务管理", businessType = BusinessType.INSERT)
+ @RepeatSubmit()
+ @PostMapping("/backProcess")
+ public R backProcess(@Validated({AddGroup.class}) @RequestBody BackProcessBo bo) {
+ return toAjax(flwTaskService.backProcess(bo));
+ }
+
+ /**
+ * 获取可驳回的前置节点
+ *
+ * @param definitionId 流程定义id
+ * @param nowNodeCode 当前节点
+ */
+ @GetMapping("/getBackTaskNode/{definitionId}/{nowNodeCode}")
+ public R> getBackTaskNode(@PathVariable Long definitionId, @PathVariable String nowNodeCode) {
+ return R.ok(flwTaskService.getBackTaskNode(definitionId, nowNodeCode));
+ }
+
+ /**
+ * 获取当前任务的所有办理人
+ *
+ * @param taskId 任务id
+ */
+ @GetMapping("/currentTaskAllUser/{taskId}")
+ public R> currentTaskAllUser(@PathVariable Long taskId) {
+ return R.ok(flwTaskService.currentTaskAllUser(taskId));
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java
deleted file mode 100644
index 8dced8929..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.dromara.workflow.controller;
-
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.workflow.domain.bo.WfCategoryBo;
-import org.dromara.workflow.domain.vo.WfCategoryVo;
-import org.dromara.workflow.service.IWfCategoryService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 流程分类
- *
- * @author may
- * @date 2023-06-28
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/workflow/category")
-public class WfCategoryController extends BaseController {
-
- private final IWfCategoryService wfCategoryService;
-
- /**
- * 查询流程分类列表
- */
- @SaCheckPermission("workflow:category:list")
- @GetMapping("/list")
- public R> list(WfCategoryBo bo) {
- List list = wfCategoryService.queryList(bo);
- return R.ok(list);
-
- }
-
- /**
- * 导出流程分类列表
- */
- @SaCheckPermission("workflow:category:export")
- @Log(title = "流程分类", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(WfCategoryBo bo, HttpServletResponse response) {
- List list = wfCategoryService.queryList(bo);
- ExcelUtil.exportExcel(list, "流程分类", WfCategoryVo.class, response);
- }
-
- /**
- * 获取流程分类详细信息
- *
- * @param id 主键
- */
- @SaCheckPermission("workflow:category:query")
- @GetMapping("/{id}")
- public R getInfo(@NotNull(message = "主键不能为空")
- @PathVariable Long id) {
- return R.ok(wfCategoryService.queryById(id));
- }
-
- /**
- * 新增流程分类
- */
- @SaCheckPermission("workflow:category:add")
- @Log(title = "流程分类", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping()
- public R add(@Validated(AddGroup.class) @RequestBody WfCategoryBo bo) {
- return toAjax(wfCategoryService.insertByBo(bo));
- }
-
- /**
- * 修改流程分类
- */
- @SaCheckPermission("workflow:category:edit")
- @Log(title = "流程分类", businessType = BusinessType.UPDATE)
- @RepeatSubmit()
- @PutMapping()
- public R edit(@Validated(EditGroup.class) @RequestBody WfCategoryBo bo) {
- return toAjax(wfCategoryService.updateByBo(bo));
- }
-
- /**
- * 删除流程分类
- *
- * @param ids 主键串
- */
- @SaCheckPermission("workflow:category:remove")
- @Log(title = "流程分类", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public R remove(@NotEmpty(message = "主键不能为空")
- @PathVariable Long[] ids) {
- return toAjax(wfCategoryService.deleteWithValidByIds(List.of(ids), true));
- }
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java
deleted file mode 100644
index 176aba2e4..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.dromara.workflow.controller;
-
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.validation.constraints.*;
-import org.dromara.workflow.domain.bo.WfDefinitionConfigBo;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.log.enums.BusinessType;
-import org.dromara.workflow.domain.vo.WfDefinitionConfigVo;
-import org.dromara.workflow.service.IWfDefinitionConfigService;
-
-/**
- * 流程定义配置
- *
- * @author may
- * @date 2024-03-18
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/workflow/definitionConfig")
-public class WfDefinitionConfigController extends BaseController {
-
- private final IWfDefinitionConfigService wfDefinitionConfigService;
-
-
- /**
- * 获取流程定义配置详细信息
- *
- * @param definitionId 主键
- */
- @GetMapping("/getByDefId/{definitionId}")
- public R getByDefId(@NotBlank(message = "流程定义ID不能为空")
- @PathVariable String definitionId) {
- return R.ok(wfDefinitionConfigService.getByDefId(definitionId));
- }
-
- /**
- * 新增流程定义配置
- */
- @Log(title = "流程定义配置", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping("/saveOrUpdate")
- public R saveOrUpdate(@Validated(AddGroup.class) @RequestBody WfDefinitionConfigBo bo) {
- return toAjax(wfDefinitionConfigService.saveOrUpdate(bo));
- }
-
- /**
- * 删除流程定义配置
- *
- * @param ids 主键串
- */
- @Log(title = "流程定义配置", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public R remove(@NotEmpty(message = "主键不能为空")
- @PathVariable Long[] ids) {
- return toAjax(wfDefinitionConfigService.deleteByIds(List.of(ids)));
- }
-
- /**
- * 查询流程定义配置排除当前查询的流程定义
- *
- * @param tableName 表名
- * @param definitionId 流程定义id
- */
- @GetMapping("/getByTableNameNotDefId/{tableName}/{definitionId}")
- public R> getByTableNameNotDefId(@NotBlank(message = "表名不能为空") @PathVariable String tableName,
- @NotBlank(message = "流程定义ID不能为空") @PathVariable String definitionId) {
- return R.ok(wfDefinitionConfigService.getByTableNameNotDefId(tableName, definitionId));
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java
deleted file mode 100644
index 198e233b4..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.dromara.workflow.controller;
-
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.workflow.domain.vo.WfFormManageVo;
-import org.dromara.workflow.domain.bo.WfFormManageBo;
-import org.dromara.workflow.service.IWfFormManageService;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
-
-/**
- * 表单管理
- *
- * @author may
- * @date 2024-03-29
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/workflow/formManage")
-public class WfFormManageController extends BaseController {
-
- private final IWfFormManageService wfFormManageService;
-
- /**
- * 查询表单管理列表
- */
- @SaCheckPermission("workflow:formManage:list")
- @GetMapping("/list")
- public TableDataInfo list(WfFormManageBo bo, PageQuery pageQuery) {
- return wfFormManageService.queryPageList(bo, pageQuery);
- }
-
- /**
- * 查询表单管理列表
- */
- @SaCheckPermission("workflow:formManage:list")
- @GetMapping("/list/selectList")
- public R> selectList() {
- return R.ok(wfFormManageService.selectList());
- }
-
- /**
- * 导出表单管理列表
- */
- @SaCheckPermission("workflow:formManage:export")
- @Log(title = "表单管理", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(WfFormManageBo bo, HttpServletResponse response) {
- List list = wfFormManageService.queryList(bo);
- ExcelUtil.exportExcel(list, "表单管理", WfFormManageVo.class, response);
- }
-
- /**
- * 获取表单管理详细信息
- *
- * @param id 主键
- */
- @SaCheckPermission("workflow:formManage:query")
- @GetMapping("/{id}")
- public R getInfo(@NotNull(message = "主键不能为空")
- @PathVariable Long id) {
- return R.ok(wfFormManageService.queryById(id));
- }
-
- /**
- * 新增表单管理
- */
- @SaCheckPermission("workflow:formManage:add")
- @Log(title = "表单管理", businessType = BusinessType.INSERT)
- @RepeatSubmit()
- @PostMapping()
- public R add(@Validated(AddGroup.class) @RequestBody WfFormManageBo bo) {
- return toAjax(wfFormManageService.insertByBo(bo));
- }
-
- /**
- * 修改表单管理
- */
- @SaCheckPermission("workflow:formManage:edit")
- @Log(title = "表单管理", businessType = BusinessType.UPDATE)
- @RepeatSubmit()
- @PutMapping()
- public R edit(@Validated(EditGroup.class) @RequestBody WfFormManageBo bo) {
- return toAjax(wfFormManageService.updateByBo(bo));
- }
-
- /**
- * 删除表单管理
- *
- * @param ids 主键串
- */
- @SaCheckPermission("workflow:formManage:remove")
- @Log(title = "表单管理", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public R remove(@NotEmpty(message = "主键不能为空")
- @PathVariable Long[] ids) {
- return toAjax(wfFormManageService.deleteByIds(List.of(ids)));
- }
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiProcinst.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiProcinst.java
deleted file mode 100644
index e87fb9253..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiProcinst.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.dromara.workflow.domain;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 流程实例对象 act_hi_procinst
- *
- * @author may
- * @date 2023-07-22
- */
-@Data
-@TableName("act_hi_procinst")
-public class ActHiProcinst implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- *
- */
- @TableId(value = "ID_")
- private String id;
-
- /**
- *
- */
- @TableField(value = "REV_")
- private Long rev;
-
- /**
- *
- */
- @TableField(value = "PROC_INST_ID_")
- private String procInstId;
-
- /**
- *
- */
- @TableField(value = "BUSINESS_KEY_")
- private String businessKey;
-
- /**
- *
- */
- @TableField(value = "PROC_DEF_ID_")
- private String procDefId;
-
- /**
- *
- */
- @TableField(value = "START_TIME_")
- private Date startTime;
-
- /**
- *
- */
- @TableField(value = "END_TIME_")
- private Date endTime;
-
- /**
- *
- */
- @TableField(value = "DURATION_")
- private Long duration;
-
- /**
- *
- */
- @TableField(value = "START_USER_ID_")
- private String startUserId;
-
- /**
- *
- */
- @TableField(value = "START_ACT_ID_")
- private String startActId;
-
- /**
- *
- */
- @TableField(value = "END_ACT_ID_")
- private String endActId;
-
- /**
- *
- */
- @TableField(value = "SUPER_PROCESS_INSTANCE_ID_")
- private String superProcessInstanceId;
-
- /**
- *
- */
- @TableField(value = "DELETE_REASON_")
- private String deleteReason;
-
- /**
- *
- */
- @TableField(value = "TENANT_ID_")
- private String tenantId;
-
- /**
- *
- */
- @TableField(value = "NAME_")
- private String name;
-
- /**
- *
- */
- @TableField(value = "CALLBACK_ID_")
- private String callbackId;
-
- /**
- *
- */
- @TableField(value = "CALLBACK_TYPE_")
- private String callbackType;
-
- /**
- *
- */
- @TableField(value = "REFERENCE_ID_")
- private String referenceId;
-
- /**
- *
- */
- @TableField(value = "REFERENCE_TYPE_")
- private String referenceType;
-
- /**
- *
- */
- @TableField(value = "PROPAGATED_STAGE_INST_ID_")
- private String propagatedStageInstId;
-
- /**
- *
- */
- @TableField(value = "BUSINESS_STATUS_")
- private String businessStatus;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiTaskinst.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiTaskinst.java
deleted file mode 100644
index abc17b54c..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiTaskinst.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package org.dromara.workflow.domain;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import java.io.Serial;
-
-/**
- * 流程历史任务对象 act_hi_taskinst
- *
- * @author may
- * @date 2024-03-02
- */
-@Data
-@TableName("act_hi_taskinst")
-public class ActHiTaskinst implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- *
- */
- @TableId(value = "ID_")
- private String id;
-
- /**
- * 版本
- */
- @TableField(value = "REV_")
- private Long rev;
-
- /**
- * 流程定义id
- */
- @TableField(value = "PROC_DEF_ID_")
- private String procDefId;
-
- /**
- *
- */
- @TableField(value = "TASK_DEF_ID_")
- private String taskDefId;
-
- /**
- * 任务节点id
- */
- @TableField(value = "TASK_DEF_KEY_")
- private String taskDefKey;
-
- /**
- * 流程实例id
- */
- @TableField(value = "PROC_INST_ID_")
- private String procInstId;
-
- /**
- * 流程执行id
- */
- @TableField(value = "EXECUTION_ID")
- private String executionId;
-
- /**
- *
- */
- @TableField(value = "SCOPE_ID_")
- private String scopeId;
-
- /**
- *
- */
- @TableField(value = "SUB_SCOPE_ID_")
- private String subScopeId;
-
- /**
- * 先用当前字段标识抄送类型
- */
- @TableField(value = "SCOPE_TYPE_")
- private String scopeType;
-
- /**
- *
- */
- @TableField(value = "SCOPE_DEFINITION_ID_")
- private String scopeDefinitionId;
-
- /**
- *
- */
- @TableField(value = "PROPAGATED_STAGE_INST_ID_")
- private String propagatedStageInstId;
-
- /**
- * 任务名称
- */
- @TableField(value = "NAME_")
- private String name;
-
- /**
- * 父级id
- */
- @TableField(value = "PARENT_TASK_ID_")
- private String parentTaskId;
-
- /**
- * 描述
- */
- @TableField(value = "DESCRIPTION_")
- private String description;
-
- /**
- * 办理人
- */
- @TableField(value = "OWNER_")
- private String owner;
-
- /**
- * 办理人
- */
- @TableField(value = "ASSIGNEE_")
- private String assignee;
-
- /**
- * 开始事件
- */
- @TableField(value = "START_TIME_")
- private Date startTime;
-
- /**
- * 认领时间
- */
- @TableField(value = "CLAIM_TIME_")
- private Date claimTime;
-
- /**
- * 结束时间
- */
- @TableField(value = "END_TIME_")
- private Date endTime;
-
- /**
- * 持续时间
- */
- @TableField(value = "DURATION_")
- private Long duration;
-
- /**
- * 删除原因
- */
- @TableField(value = "DELETE_REASON_")
- private String deleteReason;
-
- /**
- * 优先级
- */
- @TableField(value = "PRIORITY_")
- private Long priority;
-
- /**
- * 到期时间
- */
- @TableField(value = "DUE_DATE_")
- private Date dueDate;
-
- /**
- *
- */
- @TableField(value = "FORM_KEY_")
- private String formKey;
-
- /**
- * 分类
- */
- @TableField(value = "CATEGORY_")
- private String category;
-
- /**
- * 最后修改时间
- */
- @TableField(value = "LAST_UPDATED_TIME_")
- private Date lastUpdatedTime;
-
- /**
- * 租户id
- */
- @TableField(value = "TENANT_ID_")
- private String tenantId;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfCategory.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
similarity index 56%
rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfCategory.java
rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
index 94a7cf500..2ec297c5a 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfCategory.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
@@ -1,6 +1,7 @@
package org.dromara.workflow.domain;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -16,37 +17,42 @@ import java.io.Serial;
*/
@Data
@EqualsAndHashCode(callSuper = true)
-@TableName("wf_category")
-public class WfCategory extends TenantEntity {
+@TableName("flow_category")
+public class FlowCategory extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
- * 主键
+ * 流程分类ID
*/
- @TableId(value = "id")
- private Long id;
+ @TableId(value = "category_id")
+ private Long categoryId;
/**
- * 分类名称
- */
- private String categoryName;
-
- /**
- * 分类编码
- */
- private String categoryCode;
-
- /**
- * 父级id
+ * 父流程分类id
*/
private Long parentId;
/**
- * 排序
+ * 祖级列表
*/
- private Long sortNum;
+ private String ancestors;
+ /**
+ * 流程分类名称
+ */
+ private String categoryName;
+
+ /**
+ * 显示顺序
+ */
+ private Long orderNum;
+
+ /**
+ * 删除标志（0代表存在 2代表删除）
+ */
+ @TableLogic
+ private String delFlag;
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java
deleted file mode 100644
index 11dcaa081..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.dromara.workflow.domain;
-
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serial;
-
-/**
- * 流程定义配置对象 wf_definition_config
- *
- * @author may
- * @date 2024-03-18
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("wf_definition_config")
-public class WfDefinitionConfig extends BaseEntity {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id")
- private Long id;
-
- /**
- * 表名
- */
- private String tableName;
-
- /**
- * 流程定义ID
- */
- private String definitionId;
-
- /**
- * 流程KEY
- */
- private String processKey;
-
- /**
- * 流程版本
- */
- private Integer version;
-
- /**
- * 备注
- */
- private String remark;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfFormManage.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfFormManage.java
deleted file mode 100644
index 47f0d7a58..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfFormManage.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.dromara.workflow.domain;
-
-import org.dromara.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serial;
-
-/**
- * 表单管理对象 wf_form_manage
- *
- * @author may
- * @date 2024-03-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("wf_form_manage")
-public class WfFormManage extends TenantEntity {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id")
- private Long id;
-
- /**
- * 表单名称
- */
- private String formName;
-
- /**
- * 表单类型
- */
- private String formType;
-
- /**
- * 路由地址/表单ID
- */
- private String router;
-
- /**
- * 备注
- */
- private String remark;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfNodeConfig.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfNodeConfig.java
deleted file mode 100644
index 999425f53..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfNodeConfig.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.dromara.workflow.domain;
-
-import org.dromara.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serial;
-
-/**
- * 节点配置对象 wf_node_config
- *
- * @author may
- * @date 2024-03-30
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("wf_node_config")
-public class WfNodeConfig extends TenantEntity {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id")
- private Long id;
-
- /**
- * 表单id
- */
- private Long formId;
-
- /**
- * 表单类型
- */
- private String formType;
-
- /**
- * 节点名称
- */
- private String nodeName;
-
- /**
- * 节点id
- */
- private String nodeId;
-
- /**
- * 流程定义id
- */
- private String definitionId;
-
- /**
- * 是否为申请人节点 （0是 1否）
- */
- private String applyUserTask;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfTaskBackNode.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfTaskBackNode.java
deleted file mode 100644
index 6f5972794..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfTaskBackNode.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.dromara.workflow.domain;
-
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.tenant.core.TenantEntity;
-
-import java.io.Serial;
-
-/**
- * 节点驳回记录 wf_task_back_node
- *
- * @author may
- * @date 2024-03-13
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("wf_task_back_node")
-public class WfTaskBackNode extends TenantEntity {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @TableId(value = "id")
- private Long id;
-
- /**
- * 实例id
- */
- private String instanceId;
-
- /**
- * 节点id
- */
- private String nodeId;
-
- /**
- * 节点名称
- */
- private String nodeName;
-
- /**
- * 排序
- */
- private Integer orderNo;
-
- /**
- * 节点类型
- */
- private String taskType;
-
- /**
- * 办理人
- */
- private String assignee;
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/AddMultiBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/AddMultiBo.java
deleted file mode 100644
index 320ec64ca..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/AddMultiBo.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-import lombok.Data;
-import org.dromara.common.core.validate.AddGroup;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 加签参数请求
- *
- * @author may
- */
-@Data
-public class AddMultiBo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 任务ID
- */
- @NotBlank(message = "任务ID不能为空", groups = AddGroup.class)
- private String taskId;
-
- /**
- * 加签人员id
- */
- @NotEmpty(message = "加签人员不能为空", groups = AddGroup.class)
- private List assignees;
-
- /**
- * 加签人员名称
- */
- @NotEmpty(message = "加签人员不能为空", groups = AddGroup.class)
- private List assigneeNames;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java
index d0f436925..80b9691d9 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java
@@ -1,12 +1,16 @@
package org.dromara.workflow.domain.bo;
import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
import java.io.Serial;
import java.io.Serializable;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
/**
@@ -23,8 +27,8 @@ public class BackProcessBo implements Serializable {
/**
* 任务ID
*/
- @NotBlank(message = "任务ID不能为空", groups = AddGroup.class)
- private String taskId;
+ @NotNull(message = "任务ID不能为空", groups = AddGroup.class)
+ private Long taskId;
/**
* 消息类型
@@ -35,10 +39,28 @@ public class BackProcessBo implements Serializable {
* 驳回的节点id(目前未使用，直接驳回到申请人)
*/
@NotBlank(message = "驳回的节点不能为空", groups = AddGroup.class)
- private String targetActivityId;
+ private String nodeCode;
/**
* 办理意见
*/
private String message;
+
+ /**
+ * 通知
+ */
+ private String notice;
+
+ /**
+ * 流程变量
+ */
+ private Map variables;
+
+ public Map getVariables() {
+ if (variables == null) {
+ return new HashMap<>(16);
+ }
+ variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
+ return variables;
+ }
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java
index 062390551..9fdf48478 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java
@@ -1,9 +1,8 @@
package org.dromara.workflow.domain.bo;
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
-import org.dromara.workflow.domain.vo.WfCopy;
import java.io.Serial;
import java.io.Serializable;
@@ -26,8 +25,8 @@ public class CompleteTaskBo implements Serializable {
/**
* 任务id
*/
- @NotBlank(message = "任务id不能为空", groups = {AddGroup.class})
- private String taskId;
+ @NotNull(message = "任务id不能为空", groups = {AddGroup.class})
+ private Long taskId;
/**
* 附件id
@@ -37,7 +36,7 @@ public class CompleteTaskBo implements Serializable {
/**
* 抄送人员
*/
- private List wfCopyList;
+ private List flowCopyList;
/**
* 消息类型
@@ -49,11 +48,22 @@ public class CompleteTaskBo implements Serializable {
*/
private String message;
+ /**
+ * 消息通知
+ */
+ private String notice;
+
/**
* 流程变量
*/
private Map variables;
+ /**
+ * 扩展变量(此处为逗号分隔的ossId)
+ * @return
+ */
+ private String ext;
+
public Map getVariables() {
if (variables == null) {
return new HashMap<>(16);
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DelegateBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DelegateBo.java
deleted file mode 100644
index a6846a6d6..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DelegateBo.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-import org.dromara.common.core.validate.AddGroup;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 委派任务请求对象
- *
- * @author may
- */
-@Data
-public class DelegateBo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 委派人id
- */
- @NotBlank(message = "委派人id不能为空", groups = {AddGroup.class})
- private String userId;
-
- /**
- * 委派人名称
- */
- @NotBlank(message = "委派人名称不能为空", groups = {AddGroup.class})
- private String nickName;
-
- /**
- * 任务id
- */
- @NotBlank(message = "任务id不能为空", groups = {AddGroup.class})
- private String taskId;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DeleteMultiBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DeleteMultiBo.java
deleted file mode 100644
index e533167d9..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DeleteMultiBo.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-import lombok.Data;
-import org.dromara.common.core.validate.AddGroup;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 减签参数请求
- *
- * @author may
- */
-@Data
-public class DeleteMultiBo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 任务ID
- */
- @NotBlank(message = "任务ID不能为空", groups = AddGroup.class)
- private String taskId;
-
- /**
- * 减签人员
- */
- @NotEmpty(message = "减签人员不能为空", groups = AddGroup.class)
- private List taskIds;
-
- /**
- * 执行id
- */
- @NotEmpty(message = "执行id不能为空", groups = AddGroup.class)
- private List executionIds;
-
- /**
- * 人员id
- */
- @NotEmpty(message = "减签人员id不能为空", groups = AddGroup.class)
- private List assigneeIds;
-
- /**
- * 人员名称
- */
- @NotEmpty(message = "减签人员不能为空", groups = AddGroup.class)
- private List assigneeNames;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInvalidBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java
similarity index 56%
rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInvalidBo.java
rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java
index 41e51c2a6..31742ea79 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInvalidBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java
@@ -8,24 +8,24 @@ import java.io.Serial;
import java.io.Serializable;
/**
- * 流程实例作废请求对象
+ * 撤销任务请求对象
*
* @author may
*/
@Data
-public class ProcessInvalidBo implements Serializable {
+public class FlowCancelBo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
- * 业务id
+ * 任务ID
*/
- @NotBlank(message = "业务id不能为空", groups = {AddGroup.class})
- private String businessKey;
+ @NotBlank(message = "业务ID不能为空", groups = AddGroup.class)
+ private String businessId;
/**
- * 作废原因
+ * 办理意见
*/
- private String deleteReason;
+ private String message;
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java
new file mode 100644
index 000000000..fd626eb0d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java
@@ -0,0 +1,47 @@
+package org.dromara.workflow.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.workflow.domain.FlowCategory;
+
+/**
+ * 流程分类业务对象 wf_category
+ *
+ * @author may
+ * @date 2023-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FlowCategory.class, reverseConvertGenerate = false)
+public class FlowCategoryBo extends BaseEntity {
+
+ /**
+ * 流程分类ID
+ */
+ @NotNull(message = "流程分类ID不能为空", groups = { EditGroup.class })
+ private Long categoryId;
+
+ /**
+ * 父流程分类id
+ */
+ @NotNull(message = "父流程分类id不能为空", groups = {AddGroup.class, EditGroup.class})
+ private Long parentId;
+
+ /**
+ * 流程分类名称
+ */
+ @NotBlank(message = "流程分类名称不能为空", groups = {AddGroup.class, EditGroup.class})
+ private String categoryName;
+
+ /**
+ * 显示顺序
+ */
+ private Long orderNum;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java
similarity index 77%
rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java
rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java
index 88a5a2184..a45e52109 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java
@@ -1,17 +1,18 @@
-package org.dromara.workflow.domain.vo;
+package org.dromara.workflow.domain.bo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
+
/**
* 抄送
*
* @author may
*/
@Data
-public class WfCopy implements Serializable {
+public class FlowCopyBo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java
new file mode 100644
index 000000000..fb1fe611b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java
@@ -0,0 +1,55 @@
+package org.dromara.workflow.domain.bo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 流程实例请求对象
+ *
+ * @author may
+ */
+@Data
+public class FlowInstanceBo implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 流程定义名称
+ */
+ private String flowName;
+
+ /**
+ * 流程定义编码
+ */
+ private String flowCode;
+
+ /**
+ * 任务发起人
+ */
+ private String startUserId;
+
+ /**
+ * 业务id
+ */
+ private String businessId;
+
+ /**
+ * 流程分类id
+ */
+ private String category;
+
+ /**
+ * 任务名称
+ */
+ private String nodeName;
+
+ /**
+ * 申请人Ids
+ */
+ private List createByIds;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java
new file mode 100644
index 000000000..297bd00d9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java
@@ -0,0 +1,31 @@
+package org.dromara.workflow.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.dromara.common.core.validate.AddGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 作废请求对象
+ *
+ * @author may
+ */
+@Data
+public class FlowInvalidBo implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 流程实例id
+ */
+ @NotNull(message = "流程实例id为空", groups = AddGroup.class)
+ private Long id;
+
+ /**
+ * 审批意见
+ */
+ private String comment;
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java
new file mode 100644
index 000000000..64dd08255
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java
@@ -0,0 +1,55 @@
+package org.dromara.workflow.domain.bo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 任务请求对象
+ *
+ * @author may
+ */
+@Data
+public class FlowTaskBo implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 任务名称
+ */
+ private String nodeName;
+
+ /**
+ * 流程定义名称
+ */
+ private String flowName;
+
+ /**
+ * 流程定义编码
+ */
+ private String flowCode;
+
+ /**
+ * 流程分类id
+ */
+ private String category;
+
+ /**
+ * 流程实例id
+ */
+ private Long instanceId;
+
+ /**
+ * 权限列表
+ */
+ private List permissionList;
+
+ /**
+ * 申请人Ids
+ */
+ private List createByIds;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java
similarity index 66%
rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java
rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java
index 8f2206e82..897fc21ee 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java
@@ -1,6 +1,6 @@
package org.dromara.workflow.domain.bo;
-import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.dromara.common.core.validate.AddGroup;
@@ -13,7 +13,7 @@ import java.io.Serializable;
* @author may
*/
@Data
-public class TerminationBo implements Serializable {
+public class FlowTerminationBo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@@ -21,8 +21,8 @@ public class TerminationBo implements Serializable {
/**
* 任务id
*/
- @NotBlank(message = "任务id为空", groups = AddGroup.class)
- private String taskId;
+ @NotNull(message = "任务id为空", groups = AddGroup.class)
+ private Long taskId;
/**
* 审批意见
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java
deleted file mode 100644
index efe9acddb..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
-import lombok.Data;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.workflow.common.constant.FlowConstant;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 模型请求对象
- *
- * @author may
- */
-@Data
-public class ModelBo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 模型id
- */
- @NotBlank(message = "模型ID不能为空", groups = {EditGroup.class})
- private String id;
-
- /**
- * 模型名称
- */
- @NotBlank(message = "模型名称不能为空", groups = {AddGroup.class})
- private String name;
-
- /**
- * 模型标识key
- */
- @NotBlank(message = "模型标识key不能为空", groups = {AddGroup.class})
- @Pattern(regexp = FlowConstant.MODEL_KEY_PATTERN, message = "模型标识key只能字符或者下划线开头", groups = {AddGroup.class})
- private String key;
-
- /**
- * 模型分类
- */
- @NotBlank(message = "模型分类不能为空", groups = {AddGroup.class})
- private String categoryCode;
-
- /**
- * 模型XML
- */
- @NotBlank(message = "模型XML不能为空", groups = {AddGroup.class})
- private String xml;
-
- /**
- * 模型SVG图片
- */
- @NotBlank(message = "模型SVG不能为空", groups = {EditGroup.class})
- private String svg;
-
- /**
- * 备注
- */
- private String description;
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java
deleted file mode 100644
index 2025932ba..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 流程定义请求对象
- *
- * @author may
- */
-@Data
-public class ProcessDefinitionBo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 流程定义名称key
- */
- private String key;
-
- /**
- * 流程定义名称
- */
- private String name;
-
- /**
- * 模型分类
- */
- private String categoryCode;
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java
deleted file mode 100644
index 2833b3ecb..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 流程实例请求对象
- *
- * @author may
- */
-@Data
-public class ProcessInstanceBo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 流程名称
- */
- private String name;
-
- /**
- * 流程key
- */
- private String key;
-
- /**
- * 任务发起人
- */
- private String startUserId;
-
- /**
- * 业务id
- */
- private String businessKey;
-
- /**
- * 模型分类
- */
- private String categoryCode;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java
index 7af7935e6..ea21a81e7 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java
@@ -26,13 +26,13 @@ public class StartProcessBo implements Serializable {
* 业务唯一值id
*/
@NotBlank(message = "业务ID不能为空", groups = {AddGroup.class})
- private String businessKey;
+ private String businessId;
/**
- * 表名
+ * 流程定义编码
*/
- @NotBlank(message = "表名不能为空", groups = {AddGroup.class})
- private String tableName;
+ @NotBlank(message = "流程定义编码不能为空", groups = {AddGroup.class})
+ private String flowCode;
/**
* 流程变量，前端会提交一个元素{'entity': {业务详情数据对象}}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java
deleted file mode 100644
index e4d99e47a..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-
-/**
- * 用户加签查询
- *
- * @author may
- */
-@Data
-public class SysUserMultiBo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 人员名称
- */
- private String userName;
-
- /**
- * 人员名称
- */
- private String nickName;
-
- /**
- * 部门id
- */
- private String deptId;
-
- /**
- * 任务id
- */
- private String taskId;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java
deleted file mode 100644
index 303747939..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 任务请求对象
- *
- * @author may
- */
-@Data
-public class TaskBo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 任务名称
- */
- private String name;
-
- /**
- * 流程定义名称
- */
- private String processDefinitionName;
-
- /**
- * 流程定义key
- */
- private String processDefinitionKey;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java
new file mode 100644
index 000000000..4348e310c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java
@@ -0,0 +1,48 @@
+package org.dromara.workflow.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 任务操作业务对象，用于描述任务委派、转办、加签等操作的必要参数
+ * 包含了用户ID、任务ID、任务相关的消息、以及加签/减签的用户ID
+ *
+ * @author AprilWind
+ */
+@Data
+public class TaskOperationBo implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 委派/转办人的用户ID（必填，准对委派/转办人操作）
+ */
+ @NotNull(message = "委派/转办人id不能为空", groups = {AddGroup.class})
+ private String userId;
+
+ /**
+ * 加签/减签人的用户ID列表（必填，针对加签/减签操作）
+ */
+ @NotNull(message = "加签/减签id不能为空", groups = {EditGroup.class})
+ private List userIds;
+
+ /**
+ * 任务ID（必填）
+ */
+ @NotNull(message = "任务id不能为空")
+ private Long taskId;
+
+ /**
+ * 意见或备注信息（可选）
+ */
+ private String message;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskUrgingBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskUrgingBo.java
deleted file mode 100644
index 20856efa9..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskUrgingBo.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 任务催办
- *
- * @author may
- */
-@Data
-public class TaskUrgingBo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 流程实例id
- */
- private String processInstanceId;
-
- /**
- * 消息类型
- */
- private List messageType;
-
- /**
- * 催办内容（为空默认系统内置信息）
- */
- private String message;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java
index 877e98160..a1a4b5968 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java
@@ -53,7 +53,6 @@ public class TestLeaveBo extends BaseEntity {
/**
* 请假天数
*/
- @NotNull(message = "请假天数不能为空", groups = {AddGroup.class, EditGroup.class})
private Integer leaveDays;
/**
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TransmitBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TransmitBo.java
deleted file mode 100644
index 3eb6609fd..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TransmitBo.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import jakarta.validation.constraints.NotBlank;
-import lombok.Data;
-import org.dromara.common.core.validate.AddGroup;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 终转办务请求对象
- *
- * @author may
- */
-@Data
-public class TransmitBo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 任务id
- */
- @NotBlank(message = "任务id为空", groups = AddGroup.class)
- private String taskId;
-
- /**
- * 转办人id
- */
- @NotBlank(message = "转办人不能为空", groups = AddGroup.class)
- private String userId;
-
- /**
- * 审批意见
- */
- private String comment;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfCategoryBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfCategoryBo.java
deleted file mode 100644
index 69608fda3..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfCategoryBo.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.workflow.domain.WfCategory;
-
-/**
- * 流程分类业务对象 wf_category
- *
- * @author may
- * @date 2023-06-27
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = WfCategory.class, reverseConvertGenerate = false)
-public class WfCategoryBo extends BaseEntity {
-
- /**
- * 主键
- */
- @NotNull(message = "主键不能为空", groups = {EditGroup.class})
- private Long id;
-
- /**
- * 分类名称
- */
- @NotBlank(message = "分类名称不能为空", groups = {AddGroup.class, EditGroup.class})
- private String categoryName;
-
- /**
- * 分类编码
- */
- @NotBlank(message = "分类编码不能为空", groups = {AddGroup.class, EditGroup.class})
- private String categoryCode;
-
- /**
- * 父级id
- */
- @NotNull(message = "父级id不能为空", groups = {AddGroup.class, EditGroup.class})
- private Long parentId;
-
- /**
- * 排序
- */
- private Long sortNum;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java
deleted file mode 100644
index fac17709a..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import org.dromara.workflow.domain.WfDefinitionConfig;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-
-/**
- * 流程定义配置业务对象 wf_form_definition
- *
- * @author may
- * @date 2024-03-18
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = WfDefinitionConfig.class, reverseConvertGenerate = false)
-public class WfDefinitionConfigBo extends BaseEntity {
-
- /**
- * 主键
- */
- @NotNull(message = "主键不能为空", groups = {EditGroup.class})
- private Long id;
-
- /**
- * 表名
- */
- @NotBlank(message = "表名不能为空", groups = {AddGroup.class})
- private String tableName;
-
- /**
- * 流程定义ID
- */
- @NotBlank(message = "流程定义ID不能为空", groups = {AddGroup.class})
- private String definitionId;
-
- /**
- * 流程KEY
- */
- @NotBlank(message = "流程KEY不能为空", groups = {AddGroup.class})
- private String processKey;
-
- /**
- * 流程版本
- */
- @NotNull(message = "流程版本不能为空", groups = {AddGroup.class})
- private Integer version;
-
- /**
- * 备注
- */
- private String remark;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormManageBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormManageBo.java
deleted file mode 100644
index 8afc286db..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormManageBo.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import org.dromara.workflow.domain.WfFormManage;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-
-/**
- * 表单管理业务对象 wf_form_manage
- *
- * @author may
- * @date 2024-03-29
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = WfFormManage.class, reverseConvertGenerate = false)
-public class WfFormManageBo extends BaseEntity {
-
- /**
- * 主键
- */
- @NotNull(message = "主键不能为空", groups = { EditGroup.class })
- private Long id;
-
- /**
- * 表单名称
- */
- @NotBlank(message = "表单名称不能为空", groups = { AddGroup.class, EditGroup.class })
- private String formName;
-
- /**
- * 表单类型
- */
- @NotBlank(message = "表单类型不能为空", groups = { AddGroup.class, EditGroup.class })
- private String formType;
- /**
- * 路由地址/表单ID
- */
- @NotBlank(message = "路由地址/表单ID不能为空", groups = { AddGroup.class, EditGroup.class })
- private String router;
-
-
- /**
- * 备注
- */
- private String remark;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfNodeConfigBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfNodeConfigBo.java
deleted file mode 100644
index de518d3dd..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfNodeConfigBo.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.dromara.workflow.domain.bo;
-
-import org.dromara.workflow.domain.WfNodeConfig;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-
-/**
- * 节点配置业务对象 wf_node_config
- *
- * @author may
- * @date 2024-03-30
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = WfNodeConfig.class, reverseConvertGenerate = false)
-public class WfNodeConfigBo extends BaseEntity {
-
- /**
- * 主键
- */
- @NotNull(message = "主键不能为空", groups = {EditGroup.class})
- private Long id;
-
- /**
- * 表单id
- */
- private Long formId;
-
- /**
- * 表单类型
- */
- private String formType;
-
- /**
- * 节点名称
- */
- @NotBlank(message = "节点名称不能为空", groups = {AddGroup.class, EditGroup.class})
- private String nodeName;
-
- /**
- * 节点id
- */
- @NotBlank(message = "节点id不能为空", groups = {AddGroup.class, EditGroup.class})
- private String nodeId;
-
- /**
- * 流程定义id
- */
- @NotBlank(message = "流程定义id不能为空", groups = {AddGroup.class, EditGroup.class})
- private String definitionId;
-
- /**
- * 是否为申请人节点 （0是 1否）
- */
- @NotBlank(message = "是否为申请人节点不能为空", groups = {AddGroup.class, EditGroup.class})
- private String applyUserTask;
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java
deleted file mode 100644
index e4c1142ac..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.dromara.workflow.domain.vo;
-
-import lombok.Data;
-import org.dromara.common.translation.annotation.Translation;
-import org.dromara.common.translation.constant.TransConstant;
-import org.flowable.engine.task.Attachment;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 流程审批记录视图
- *
- * @author may
- */
-@Data
-public class ActHistoryInfoVo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
- /**
- * 任务id
- */
- private String id;
- /**
- * 节点id
- */
- private String taskDefinitionKey;
- /**
- * 任务名称
- */
- private String name;
- /**
- * 流程实例id
- */
- private String processInstanceId;
- /**
- * 版本
- */
- private Integer version;
- /**
- * 开始时间
- */
- private Date startTime;
- /**
- * 结束时间
- */
- private Date endTime;
- /**
- * 运行时长
- */
- private String runDuration;
- /**
- * 状态
- */
- private String status;
- /**
- * 状态
- */
- private String statusName;
- /**
- * 办理人id
- */
- private String assignee;
-
- /**
- * 办理人名称
- */
- @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "assignee")
- private String nickName;
-
- /**
- * 办理人id
- */
- private String owner;
-
- /**
- * 审批信息id
- */
- private String commentId;
-
- /**
- * 审批信息
- */
- private String comment;
-
- /**
- * 审批附件
- */
- private List attachmentList;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java
new file mode 100644
index 000000000..2c72143cb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java
@@ -0,0 +1,69 @@
+package org.dromara.workflow.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.workflow.domain.FlowCategory;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 流程分类视图对象 wf_category
+ *
+ * @author may
+ * @date 2023-06-27
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = FlowCategory.class)
+public class FlowCategoryVo implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 流程分类ID
+ */
+ @ExcelProperty(value = "流程分类ID")
+ private Long categoryId;
+
+ /**
+ * 父级id
+ */
+ private Long parentId;
+
+ /**
+ * 父类别名称
+ */
+ private String parentName;
+
+ /**
+ * 祖级列表
+ */
+ private String ancestors;
+
+ /**
+ * 流程分类名称
+ */
+ @ExcelProperty(value = "流程分类名称")
+ private String categoryName;
+
+ /**
+ * 显示顺序
+ */
+ @ExcelProperty(value = "显示顺序")
+ private Long orderNum;
+
+ /**
+ * 创建时间
+ */
+ @ExcelProperty(value = "创建时间")
+ private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java
new file mode 100644
index 000000000..aef75739a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java
@@ -0,0 +1,104 @@
+package org.dromara.workflow.domain.vo;
+
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.workflow.common.constant.FlowConstant;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 流程定义视图
+ *
+ * @author may
+ */
+@Data
+public class FlowDefinitionVo implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ private Long id;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 删除标记
+ */
+ private String delFlag;
+
+ /**
+ * 流程定义编码
+ */
+ private String flowCode;
+
+ /**
+ * 流程定义名称
+ */
+ private String flowName;
+
+ /**
+ * 流程分类id
+ */
+ private String category;
+
+ /**
+ * 流程分类名称
+ */
+ @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "category")
+ private String categoryName;
+
+ /**
+ * 流程版本
+ */
+ private String version;
+
+ /**
+ * 是否发布（0未发布 1已发布 9失效）
+ */
+ private Integer isPublish;
+
+ /**
+ * 审批表单是否自定义（Y是 N否）
+ */
+ private String formCustom;
+
+ /**
+ * 审批表单路径
+ */
+ private String formPath;
+
+ /**
+ * 流程激活状态（0挂起 1激活）
+ */
+ private Integer activityStatus;
+
+ /**
+ * 监听器类型
+ */
+ private String listenerType;
+
+ /**
+ * 监听器路径
+ */
+ private String listenerPath;
+
+ /**
+ * 扩展字段，预留给业务系统使用
+ */
+ private String ext;
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java
new file mode 100644
index 000000000..8776a76b8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java
@@ -0,0 +1,244 @@
+package org.dromara.workflow.domain.vo;
+
+import lombok.Data;
+import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.warm.flow.core.enums.CooperateType;
+import org.dromara.workflow.common.constant.FlowConstant;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 历史任务视图
+ *
+ * @author may
+ */
+@Data
+public class FlowHisTaskVo implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ private Long id;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 删除标记
+ */
+ private String delFlag;
+
+ /**
+ * 对应flow_definition表的id
+ */
+ private Long definitionId;
+
+ /**
+ * 流程定义名称
+ */
+ private String flowName;
+
+ /**
+ * 流程实例表id
+ */
+ private Long instanceId;
+
+ /**
+ * 任务表id
+ */
+ private Long taskId;
+
+ /**
+ * 协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)
+ */
+ private Integer cooperateType;
+
+ /**
+ * 协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)
+ */
+ private String cooperateTypeName;
+
+ /**
+ * 业务id
+ */
+ private String businessId;
+
+ /**
+ * 开始节点编码
+ */
+ private String nodeCode;
+
+ /**
+ * 开始节点名称
+ */
+ private String nodeName;
+
+ /**
+ * 开始节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+ */
+ private Integer nodeType;
+
+ /**
+ * 目标节点编码
+ */
+ private String targetNodeCode;
+
+ /**
+ * 结束节点名称
+ */
+ private String targetNodeName;
+
+ /**
+ * 审批者
+ */
+ private String approver;
+
+ /**
+ * 审批者
+ */
+ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "approver")
+ private String approveName;
+
+ /**
+ * 协作人(只有转办、会签、票签、委派)
+ */
+ private String collaborator;
+
+ /**
+ * 权限标识 permissionFlag的list形式
+ */
+ private List permissionList;
+
+ /**
+ * 跳转类型（PASS通过 REJECT退回 NONE无动作）
+ */
+ private String skipType;
+
+ /**
+ * 流程状态
+ */
+ private String flowStatus;
+
+ /**
+ * 任务状态
+ */
+ private String flowTaskStatus;
+
+ /**
+ * 流程状态
+ */
+ private String flowStatusName;
+
+ /**
+ * 审批意见
+ */
+ private String message;
+
+ /**
+ * 业务详情 存业务类的json
+ */
+ private String ext;
+
+ /**
+ * 创建者
+ */
+ private String createBy;
+
+ /**
+ * 申请人
+ */
+ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
+ private String createByName;
+
+ /**
+ * 流程分类id
+ */
+ private String category;
+
+ /**
+ * 流程分类名称
+ */
+ @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "category")
+ private String categoryName;
+
+ /**
+ * 审批表单是否自定义（Y是 N否）
+ */
+ private String formCustom;
+
+ /**
+ * 审批表单路径
+ */
+ private String formPath;
+
+ /**
+ * 流程定义编码
+ */
+ private String flowCode;
+
+ /**
+ * 流程版本号
+ */
+ private String version;
+
+ /**
+ * 运行时长
+ */
+ private String runDuration;
+
+ /**
+ * 设置创建时间并计算任务运行时长
+ *
+ * @param createTime 创建时间
+ */
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ updateRunDuration();
+ }
+
+ /**
+ * 设置更新时间并计算任务运行时长
+ *
+ * @param updateTime 更新时间
+ */
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ updateRunDuration();
+ }
+
+ /**
+ * 更新运行时长
+ */
+ private void updateRunDuration() {
+ // 如果创建时间和更新时间均不为空，计算它们之间的时长
+ if (this.updateTime != null && this.createTime != null) {
+ this.runDuration = DateUtils.getTimeDifference(this.updateTime, this.createTime);
+ }
+ }
+
+ /**
+ * 设置协作方式，并通过协作方式获取名称
+ */
+ public void setCooperateType(Integer cooperateType) {
+ this.cooperateType = cooperateType;
+ this.cooperateTypeName = CooperateType.getValueByKey(cooperateType);
+ }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java
new file mode 100644
index 000000000..75543f419
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java
@@ -0,0 +1,137 @@
+package org.dromara.workflow.domain.vo;
+
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.workflow.common.constant.FlowConstant;
+
+import java.util.Date;
+
+/**
+ * 流程实例视图
+ *
+ * @author may
+ */
+@Data
+public class FlowInstanceVo {
+
+ private Long id;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 删除标记
+ */
+ private String delFlag;
+
+ /**
+ * 对应flow_definition表的id
+ */
+ private Long definitionId;
+
+ /**
+ * 流程定义名称
+ */
+ private String flowName;
+
+ /**
+ * 流程定义编码
+ */
+ private String flowCode;
+
+ /**
+ * 业务id
+ */
+ private String businessId;
+
+ /**
+ * 节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+ */
+ private Integer nodeType;
+
+ /**
+ * 流程节点编码 每个流程的nodeCode是唯一的,即definitionId+nodeCode唯一,在数据库层面做了控制
+ */
+ private String nodeCode;
+
+ /**
+ * 流程节点名称
+ */
+ private String nodeName;
+
+ /**
+ * 流程变量
+ */
+ private String variable;
+
+ /**
+ * 流程状态（0待提交 1审批中 2 审批通过 3自动通过 8已完成 9已退回 10失效）
+ */
+ private String flowStatus;
+
+ /**
+ * 流程状态
+ */
+ private String flowStatusName;
+
+ /**
+ * 流程激活状态（0挂起 1激活）
+ */
+ private Integer activityStatus;
+
+ /**
+ * 审批表单是否自定义（Y是 N否）
+ */
+ private String formCustom;
+
+ /**
+ * 审批表单路径
+ */
+ private String formPath;
+
+ /**
+ * 扩展字段，预留给业务系统使用
+ */
+ private String ext;
+
+ /**
+ * 流程定义版本
+ */
+ private String version;
+
+ /**
+ * 创建者
+ */
+ private String createBy;
+
+ /**
+ * 申请人
+ */
+ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
+ private String createByName;
+
+ /**
+ * 流程分类id
+ */
+ private String category;
+
+ /**
+ * 流程分类名称
+ */
+ @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "category")
+ private String categoryName;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java
new file mode 100644
index 000000000..3fb08d954
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java
@@ -0,0 +1,176 @@
+package org.dromara.workflow.domain.vo;
+
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.warm.flow.core.entity.User;
+import org.dromara.workflow.common.constant.FlowConstant;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 任务视图
+ *
+ * @author may
+ */
+@Data
+public class FlowTaskVo implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ private Long id;
+
+ /**
+ * 创建时间
+ */
+ private Date createTime;
+
+ /**
+ * 更新时间
+ */
+ private Date updateTime;
+
+ /**
+ * 租户ID
+ */
+ private String tenantId;
+
+ /**
+ * 删除标记
+ */
+ private String delFlag;
+
+ /**
+ * 对应flow_definition表的id
+ */
+ private Long definitionId;
+
+ /**
+ * 流程实例表id
+ */
+ private Long instanceId;
+
+ /**
+ * 流程定义名称
+ */
+ private String flowName;
+
+ /**
+ * 业务id
+ */
+ private String businessId;
+
+ /**
+ * 节点编码
+ */
+ private String nodeCode;
+
+ /**
+ * 节点名称
+ */
+ private String nodeName;
+
+ /**
+ * 节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+ */
+ private Integer nodeType;
+
+ /**
+ * 权限标识 permissionFlag的list形式
+ */
+ private List permissionList;
+
+ /**
+ * 流程用户列表
+ */
+ private List userList;
+
+ /**
+ * 审批表单是否自定义（Y是 N否）
+ */
+ private String formCustom;
+
+ /**
+ * 审批表单
+ */
+ private String formPath;
+
+ /**
+ * 流程定义编码
+ */
+ private String flowCode;
+
+ /**
+ * 流程版本号
+ */
+ private String version;
+
+ /**
+ * 流程状态
+ */
+ private String flowStatus;
+
+ /**
+ * 流程分类id
+ */
+ private String category;
+
+ /**
+ * 流程分类名称
+ */
+ @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "category")
+ private String categoryName;
+
+ /**
+ * 流程状态
+ */
+ @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "flowStatus", other = "wf_business_status")
+ private String flowStatusName;
+
+ /**
+ * 办理人类型
+ */
+ private String type;
+
+ /**
+ * 办理人ids
+ */
+ private String assigneeIds;
+
+ /**
+ * 办理人名称
+ */
+ private String assigneeNames;
+
+ /**
+ * 抄送人id
+ */
+ private String processedBy;
+
+ /**
+ * 抄送人名称
+ */
+ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "processedBy")
+ private String processedByName;
+
+ /**
+ * 流程签署比例值 大于0为票签，会签
+ */
+ private BigDecimal nodeRatio;
+
+ /**
+ * 申请人id
+ */
+ private String createBy;
+
+ /**
+ * 申请人名称
+ */
+ @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
+ private String createByName;
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/VariableVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowVariableVo.java
similarity index 86%
rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/VariableVo.java
rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowVariableVo.java
index 6a26c8287..b4de76e93 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/VariableVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowVariableVo.java
@@ -11,7 +11,7 @@ import java.io.Serializable;
* @author may
*/
@Data
-public class VariableVo implements Serializable {
+public class FlowVariableVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java
deleted file mode 100644
index 763613165..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.dromara.workflow.domain.vo;
-
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 节点图形信息
- *
- * @author may
- */
-@Data
-public class GraphicInfoVo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
- /**
- * x坐标
- */
- private double x;
-
- /**
- * y坐标
- */
- private double y;
-
- /**
- * 节点高度
- */
- private double height;
-
- /**
- * 节点宽度
- */
- private double width;
-
- /**
- * 节点id
- */
- private String nodeId;
-
- /**
- * 节点名称
- */
- private String nodeName;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java
deleted file mode 100644
index b2ce81108..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.dromara.workflow.domain.vo;
-
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 模型视图对象
- *
- * @author may
- */
-@Data
-public class ModelVo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 模型id
- */
- private String id;
-
- /**
- * 模型名称
- */
- private String name;
-
- /**
- * 模型标识key
- */
- private String key;
-
- /**
- * 模型分类
- */
- private String categoryCode;
-
- /**
- * 模型XML
- */
- private String xml;
-
- /**
- * 备注
- */
- private String description;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java
deleted file mode 100644
index b99839603..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.dromara.workflow.domain.vo;
-
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-/**
- * 多实例信息
- *
- * @author may
- */
-@Data
-public class MultiInstanceVo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 会签类型（串行，并行）
- */
- private Object type;
-
- /**
- * 会签人员KEY
- */
- private String assignee;
-
- /**
- * 会签人员集合KEY
- */
- private String assigneeList;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java
deleted file mode 100644
index c5876f689..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.dromara.workflow.domain.vo;
-
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 参与者
- *
- * @author may
- */
-@Data
-public class ParticipantVo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 组id（角色id）
- */
- private List groupIds;
-
- /**
- * 候选人id（用户id） 当组id不为空时，将组内人员查出放入candidate
- */
- private List candidate;
-
- /**
- * 候选人名称（用户名称） 当组id不为空时，将组内人员查出放入candidateName
- */
- private List candidateName;
-
- /**
- * 是否认领标识
- * 当为空时默认当前任务不需要认领
- * 当为true时当前任务说明为候选模式并且有人已经认领了任务可以归还，
- * 当为false时当前任务说明为候选模式该任务未认领，
- */
- private Boolean claim;
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java
deleted file mode 100644
index 034adbb26..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.dromara.workflow.domain.vo;
-
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 流程定义视图
- *
- * @author may
- */
-@Data
-public class ProcessDefinitionVo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 流程定义id
- */
- private String id;
-
- /**
- * 流程定义名称
- */
- private String name;
-
- /**
- * 流程定义标识key
- */
- private String key;
-
- /**
- * 流程定义版本
- */
- private int version;
-
- /**
- * 流程定义挂起或激活 1激活 2挂起
- */
- private int suspensionState;
-
- /**
- * 流程xml名称
- */
- private String resourceName;
-
- /**
- * 流程图片名称
- */
- private String diagramResourceName;
-
- /**
- * 流程部署id
- */
- private String deploymentId;
-
- /**
- * 流程部署时间
- */
- private Date deploymentTime;
-
- /**
- * 流程定义配置
- */
- private WfDefinitionConfigVo wfDefinitionConfigVo;
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java
deleted file mode 100644
index ab3e7a130..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.dromara.workflow.domain.vo;
-
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 流程实例视图
- *
- * @author may
- */
-@Data
-public class ProcessInstanceVo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 流程实例id
- */
- private String id;
-
- /**
- * 流程定义id
- */
- private String processDefinitionId;
-
- /**
- * 流程定义名称
- */
- private String processDefinitionName;
-
- /**
- * 流程定义key
- */
- private String processDefinitionKey;
-
- /**
- * 流程定义版本
- */
- private Integer processDefinitionVersion;
-
- /**
- * 部署id
- */
- private String deploymentId;
-
- /**
- * 业务id
- */
- private String businessKey;
-
- /**
- * 是否挂起
- */
- private Boolean isSuspended;
-
- /**
- * 租户id
- */
- private String tenantId;
-
- /**
- * 启动时间
- */
- private Date startTime;
-
- /**
- * 结束时间
- */
- private Date endTime;
-
- /**
- * 启动人id
- */
- private String startUserId;
-
- /**
- * 流程状态
- */
- private String businessStatus;
-
- /**
- * 流程状态
- */
- private String businessStatusName;
-
- /**
- * 待办任务集合
- */
- private List taskVoList;
-
- /**
- * 节点配置
- */
- private WfNodeConfigVo wfNodeConfigVo;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java
deleted file mode 100644
index 466e77690..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.dromara.workflow.domain.vo;
-
-import lombok.Data;
-import org.dromara.common.translation.annotation.Translation;
-import org.dromara.common.translation.constant.TransConstant;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 任务视图
- *
- * @author may
- */
-@Data
-public class TaskVo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 任务id
- */
- private String id;
-
- /**
- * 任务名称
- */
- private String name;
-
- /**
- * 描述
- */
- private String description;
-
- /**
- * 优先级
- */
- private Integer priority;
-
- /**
- * 负责此任务的人员的用户id
- */
- private String owner;
-
- /**
- * 办理人id
- */
- private Long assignee;
-
- /**
- * 办理人
- */
- @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "assignee")
- private String assigneeName;
-
-
- /**
- * 流程实例id
- */
- private String processInstanceId;
-
- /**
- * 执行id
- */
- private String executionId;
-
- /**
- * 无用
- */
- private String taskDefinitionId;
-
- /**
- * 流程定义id
- */
- private String processDefinitionId;
-
- /**
- * 创建时间
- */
- private Date createTime;
-
- /**
- * 已办任务-创建时间
- */
- private Date startTime;
-
- /**
- * 结束时间
- */
- private Date endTime;
-
- /**
- * 节点id
- */
- private String taskDefinitionKey;
-
- /**
- * 任务截止日期
- */
- private Date dueDate;
-
- /**
- * 流程类别
- */
- private String category;
-
- /**
- * 父级任务id
- */
- private String parentTaskId;
-
- /**
- * 租户id
- */
- private String tenantId;
-
- /**
- * 认领时间
- */
- private Date claimTime;
-
- /**
- * 流程状态
- */
- private String businessStatus;
-
- /**
- * 流程状态
- */
- private String businessStatusName;
-
- /**
- * 流程定义名称
- */
- private String processDefinitionName;
-
- /**
- * 流程定义key
- */
- private String processDefinitionKey;
-
- /**
- * 流程定义版本
- */
- private Integer processDefinitionVersion;
-
- /**
- * 参与者
- */
- private ParticipantVo participantVo;
-
- /**
- * 是否会签
- */
- private Boolean multiInstance;
-
- /**
- * 业务id
- */
- private String businessKey;
-
- /**
- * 流程定义配置
- */
- private WfDefinitionConfigVo wfDefinitionConfigVo;
-
- /**
- * 节点配置
- */
- private WfNodeConfigVo wfNodeConfigVo;
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCategoryVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCategoryVo.java
deleted file mode 100644
index 362f64625..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCategoryVo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.dromara.workflow.domain.vo;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import org.dromara.workflow.domain.WfCategory;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-
-/**
- * 流程分类视图对象 wf_category
- *
- * @author may
- * @date 2023-06-27
- */
-@Data
-@ExcelIgnoreUnannotated
-@AutoMapper(target = WfCategory.class)
-public class WfCategoryVo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @ExcelProperty(value = "主键")
- private Long id;
-
- /**
- * 分类名称
- */
- @ExcelProperty(value = "分类名称")
- private String categoryName;
-
- /**
- * 分类编码
- */
- @ExcelProperty(value = "分类编码")
- private String categoryCode;
-
- /**
- * 父级id
- */
- @ExcelProperty(value = "父级id")
- private Long parentId;
-
- /**
- * 排序
- */
- @ExcelProperty(value = "排序")
- private Long sortNum;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java
deleted file mode 100644
index 9c7b0d7db..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.dromara.workflow.domain.vo;
-
-import org.dromara.workflow.domain.WfDefinitionConfig;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-
-/**
- * 流程定义配置视图对象 wf_definition_config
- *
- * @author may
- * @date 2024-03-18
- */
-@Data
-@ExcelIgnoreUnannotated
-@AutoMapper(target = WfDefinitionConfig.class)
-public class WfDefinitionConfigVo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @ExcelProperty(value = "主键")
- private Long id;
-
- /**
- * 表名
- */
- @ExcelProperty(value = "表名")
- private String tableName;
-
- /**
- * 流程定义ID
- */
- @ExcelProperty(value = "流程定义ID")
- private String definitionId;
-
- /**
- * 流程KEY
- */
- @ExcelProperty(value = "流程KEY")
- private String processKey;
-
-
- /**
- * 流程版本
- */
- @ExcelProperty(value = "流程版本")
- private Integer version;
-
- /**
- * 备注
- */
- @ExcelProperty(value = "备注")
- private String remark;
-
- /**
- * 表单管理
- */
- private WfFormManageVo wfFormManageVo;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormManageVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormManageVo.java
deleted file mode 100644
index 302df2396..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormManageVo.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.dromara.workflow.domain.vo;
-
-import org.dromara.workflow.domain.WfFormManage;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-
-/**
- * 表单管理视图对象 wf_form_manage
- *
- * @author may
- * @date 2024-03-29
- */
-@Data
-@ExcelIgnoreUnannotated
-@AutoMapper(target = WfFormManage.class)
-public class WfFormManageVo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @ExcelProperty(value = "主键")
- private Long id;
-
- /**
- * 表单名称
- */
- @ExcelProperty(value = "表单名称")
- private String formName;
-
- /**
- * 表单类型
- */
- @ExcelProperty(value = "表单类型")
- private String formType;
-
- /**
- * 表单类型名称
- */
- private String formTypeName;
-
- /**
- * 路由地址/表单ID
- */
- @ExcelProperty(value = "路由地址/表单ID")
- private String router;
-
- /**
- * 备注
- */
- @ExcelProperty(value = "备注")
- private String remark;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfNodeConfigVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfNodeConfigVo.java
deleted file mode 100644
index 89e9d9b3f..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfNodeConfigVo.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.dromara.workflow.domain.vo;
-
-import org.dromara.workflow.domain.WfNodeConfig;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-
-/**
- * 节点配置视图对象 wf_node_config
- *
- * @author may
- * @date 2024-03-30
- */
-@Data
-@ExcelIgnoreUnannotated
-@AutoMapper(target = WfNodeConfig.class)
-public class WfNodeConfigVo implements Serializable {
-
- @Serial
- private static final long serialVersionUID = 1L;
-
- /**
- * 主键
- */
- @ExcelProperty(value = "主键")
- private Long id;
-
- /**
- * 表单id
- */
- @ExcelProperty(value = "表单id")
- private Long formId;
-
- /**
- * 表单类型
- */
- @ExcelProperty(value = "表单类型")
- private String formType;
-
- /**
- * 节点名称
- */
- @ExcelProperty(value = "节点名称")
- private String nodeName;
-
- /**
- * 节点id
- */
- @ExcelProperty(value = "节点id")
- private String nodeId;
-
- /**
- * 流程定义id
- */
- @ExcelProperty(value = "流程定义id")
- private String definitionId;
-
- /**
- * 是否为申请人节点 （0是 1否）
- */
- @ExcelProperty(value = "是否为申请人节点 （0是 1否）")
- private String applyUserTask;
-
- /**
- * 表单管理
- */
- private WfFormManageVo wfFormManageVo;
-
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramCanvas.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramCanvas.java
deleted file mode 100644
index 39fd9d363..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramCanvas.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.dromara.workflow.flowable;
-
-import org.flowable.bpmn.model.AssociationDirection;
-import org.flowable.image.impl.DefaultProcessDiagramCanvas;
-
-import java.awt.*;
-import java.awt.geom.Line2D;
-import java.awt.geom.RoundRectangle2D;
-
-public class CustomDefaultProcessDiagramCanvas extends DefaultProcessDiagramCanvas {
- //设置高亮线的颜色 这里我设置成绿色
- protected static Color HIGHLIGHT_SEQUENCEFLOW_COLOR = Color.GREEN;
-
- public CustomDefaultProcessDiagramCanvas(int width, int height, int minX, int minY, String imageType, String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader) {
- super(width, height, minX, minY, imageType, activityFontName, labelFontName, annotationFontName, customClassLoader);
- }
-
- /**
- * 画线颜色设置
- */
- public void drawConnection(int[] xPoints, int[] yPoints, boolean conditional, boolean isDefault, String connectionType,
- AssociationDirection associationDirection, boolean highLighted, double scaleFactor) {
-
- Paint originalPaint = g.getPaint();
- Stroke originalStroke = g.getStroke();
-
- g.setPaint(CONNECTION_COLOR);
- if (connectionType.equals("association")) {
- g.setStroke(ASSOCIATION_STROKE);
- } else if (highLighted) {
- //设置线的颜色
- g.setPaint(HIGHLIGHT_SEQUENCEFLOW_COLOR);
- g.setStroke(HIGHLIGHT_FLOW_STROKE);
- }
-
- for (int i = 1; i < xPoints.length; i++) {
- Integer sourceX = xPoints[i - 1];
- Integer sourceY = yPoints[i - 1];
- Integer targetX = xPoints[i];
- Integer targetY = yPoints[i];
- Line2D.Double line = new Line2D.Double(sourceX, sourceY, targetX, targetY);
- g.draw(line);
- }
-
- if (isDefault) {
- Line2D.Double line = new Line2D.Double(xPoints[0], yPoints[0], xPoints[1], yPoints[1]);
- drawDefaultSequenceFlowIndicator(line, scaleFactor);
- }
-
- if (conditional) {
- Line2D.Double line = new Line2D.Double(xPoints[0], yPoints[0], xPoints[1], yPoints[1]);
- drawConditionalSequenceFlowIndicator(line, scaleFactor);
- }
-
- if (associationDirection == AssociationDirection.ONE || associationDirection == AssociationDirection.BOTH) {
- Line2D.Double line = new Line2D.Double(xPoints[xPoints.length - 2], yPoints[xPoints.length - 2], xPoints[xPoints.length - 1], yPoints[xPoints.length - 1]);
- drawArrowHead(line, scaleFactor);
- }
- if (associationDirection == AssociationDirection.BOTH) {
- Line2D.Double line = new Line2D.Double(xPoints[1], yPoints[1], xPoints[0], yPoints[0]);
- drawArrowHead(line, scaleFactor);
- }
- g.setPaint(originalPaint);
- g.setStroke(originalStroke);
- }
-
- /**
- * 高亮节点设置
- */
- public void drawHighLight(int x, int y, int width, int height) {
- Paint originalPaint = g.getPaint();
- Stroke originalStroke = g.getStroke();
- //设置高亮节点的颜色
- g.setPaint(HIGHLIGHT_COLOR);
- g.setStroke(THICK_TASK_BORDER_STROKE);
-
- RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, 20, 20);
- g.draw(rect);
-
- g.setPaint(originalPaint);
- g.setStroke(originalStroke);
- }
-
- /**
- * @description: 高亮节点红色
- * @param: x
- * @param: y
- * @param: width
- * @param: height
- * @return: void
- * @author: gssong
- * @date: 2022/4/12
- */
- public void drawHighLightRed(int x, int y, int width, int height) {
- Paint originalPaint = g.getPaint();
- Stroke originalStroke = g.getStroke();
- //设置高亮节点的颜色
- g.setPaint(Color.green);
- g.setStroke(THICK_TASK_BORDER_STROKE);
-
- RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, 20, 20);
- g.draw(rect);
-
- g.setPaint(originalPaint);
- g.setStroke(originalStroke);
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java
deleted file mode 100644
index e4793a26f..000000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java
+++ /dev/null
@@ -1,1120 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.dromara.workflow.flowable;
-
-import org.flowable.bpmn.model.Event;
-import org.flowable.bpmn.model.Process;
-import org.flowable.bpmn.model.*;
-import org.flowable.image.ProcessDiagramGenerator;
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.InputStream;
-import java.util.List;
-import java.util.*;
-
-/**
- * Class to generate an image based the diagram interchange information in a BPMN 2.0 process.
- *
- * @author Joram Barrez
- * @author Tijs Rademakers
- * @author Zheng Ji
- */
-public class CustomDefaultProcessDiagramGenerator implements ProcessDiagramGenerator {
-
- protected Map, ActivityDrawInstruction> activityDrawInstructions = new HashMap<>();
- protected Map, ArtifactDrawInstruction> artifactDrawInstructions = new HashMap<>();
-
- public CustomDefaultProcessDiagramGenerator() {
- this(1.0);
- }
-
- // The instructions on how to draw a certain construct is
- // created statically and stored in a map for performance.
- public CustomDefaultProcessDiagramGenerator(final double scaleFactor) {
- // start event
- activityDrawInstructions.put(StartEvent.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- StartEvent startEvent = (StartEvent) flowNode;
- if (startEvent.getEventDefinitions() != null && !startEvent.getEventDefinitions().isEmpty()) {
- EventDefinition eventDefinition = startEvent.getEventDefinitions().get(0);
- if (eventDefinition instanceof TimerEventDefinition) {
- processDiagramCanvas.drawTimerStartEvent(graphicInfo, scaleFactor);
- } else if (eventDefinition instanceof ErrorEventDefinition) {
- processDiagramCanvas.drawErrorStartEvent(graphicInfo, scaleFactor);
- } else if (eventDefinition instanceof EscalationEventDefinition) {
- processDiagramCanvas.drawEscalationStartEvent(graphicInfo, scaleFactor);
- } else if (eventDefinition instanceof ConditionalEventDefinition) {
- processDiagramCanvas.drawConditionalStartEvent(graphicInfo, scaleFactor);
- } else if (eventDefinition instanceof SignalEventDefinition) {
- processDiagramCanvas.drawSignalStartEvent(graphicInfo, scaleFactor);
- } else if (eventDefinition instanceof MessageEventDefinition) {
- processDiagramCanvas.drawMessageStartEvent(graphicInfo, scaleFactor);
- } else {
- processDiagramCanvas.drawNoneStartEvent(graphicInfo);
- }
- } else {
- List eventTypeElements = startEvent.getExtensionElements().get("eventType");
- if (eventTypeElements != null && eventTypeElements.size() > 0) {
- processDiagramCanvas.drawEventRegistryStartEvent(graphicInfo, scaleFactor);
-
- } else {
- processDiagramCanvas.drawNoneStartEvent(graphicInfo);
- }
- }
- }
- });
-
- // signal catch
- activityDrawInstructions.put(IntermediateCatchEvent.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- IntermediateCatchEvent intermediateCatchEvent = (IntermediateCatchEvent) flowNode;
- if (intermediateCatchEvent.getEventDefinitions() != null && !intermediateCatchEvent.getEventDefinitions().isEmpty()) {
-
- if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof SignalEventDefinition) {
- processDiagramCanvas.drawCatchingSignalEvent(flowNode.getName(), graphicInfo, true, scaleFactor);
- } else if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof TimerEventDefinition) {
- processDiagramCanvas.drawCatchingTimerEvent(flowNode.getName(), graphicInfo, true, scaleFactor);
- } else if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof MessageEventDefinition) {
- processDiagramCanvas.drawCatchingMessageEvent(flowNode.getName(), graphicInfo, true, scaleFactor);
- } else if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof ConditionalEventDefinition) {
- processDiagramCanvas.drawCatchingConditionalEvent(flowNode.getName(), graphicInfo, true, scaleFactor);
- }
- }
- }
- });
-
- // signal throw
- activityDrawInstructions.put(ThrowEvent.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- ThrowEvent throwEvent = (ThrowEvent) flowNode;
- if (throwEvent.getEventDefinitions() != null && !throwEvent.getEventDefinitions().isEmpty()) {
- if (throwEvent.getEventDefinitions().get(0) instanceof SignalEventDefinition) {
- processDiagramCanvas.drawThrowingSignalEvent(graphicInfo, scaleFactor);
- } else if (throwEvent.getEventDefinitions().get(0) instanceof EscalationEventDefinition) {
- processDiagramCanvas.drawThrowingEscalationEvent(graphicInfo, scaleFactor);
- } else if (throwEvent.getEventDefinitions().get(0) instanceof CompensateEventDefinition) {
- processDiagramCanvas.drawThrowingCompensateEvent(graphicInfo, scaleFactor);
- } else {
- processDiagramCanvas.drawThrowingNoneEvent(graphicInfo, scaleFactor);
- }
- } else {
- processDiagramCanvas.drawThrowingNoneEvent(graphicInfo, scaleFactor);
- }
- }
- });
-
- // end event
- activityDrawInstructions.put(EndEvent.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- EndEvent endEvent = (EndEvent) flowNode;
- if (endEvent.getEventDefinitions() != null && !endEvent.getEventDefinitions().isEmpty()) {
- if (endEvent.getEventDefinitions().get(0) instanceof ErrorEventDefinition) {
- processDiagramCanvas.drawErrorEndEvent(flowNode.getName(), graphicInfo, scaleFactor);
- } else if (endEvent.getEventDefinitions().get(0) instanceof EscalationEventDefinition) {
- processDiagramCanvas.drawEscalationEndEvent(flowNode.getName(), graphicInfo, scaleFactor);
- } else {
- processDiagramCanvas.drawNoneEndEvent(graphicInfo, scaleFactor);
- }
- } else {
- processDiagramCanvas.drawNoneEndEvent(graphicInfo, scaleFactor);
- }
- }
- });
-
- // task
- activityDrawInstructions.put(Task.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawTask(flowNode.getName(), graphicInfo, scaleFactor);
- }
- });
-
- // user task
- activityDrawInstructions.put(UserTask.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawUserTask(flowNode.getName(), graphicInfo, scaleFactor);
- }
- });
-
- // script task
- activityDrawInstructions.put(ScriptTask.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawScriptTask(flowNode.getName(), graphicInfo, scaleFactor);
- }
- });
-
- // service task
- activityDrawInstructions.put(ServiceTask.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- ServiceTask serviceTask = (ServiceTask) flowNode;
- if ("camel".equalsIgnoreCase(serviceTask.getType())) {
- processDiagramCanvas.drawCamelTask(serviceTask.getName(), graphicInfo, scaleFactor);
- }else if (ServiceTask.HTTP_TASK.equalsIgnoreCase(serviceTask.getType())) {
- processDiagramCanvas.drawHttpTask(serviceTask.getName(), graphicInfo, scaleFactor);
- } else if (ServiceTask.DMN_TASK.equalsIgnoreCase(serviceTask.getType())) {
- processDiagramCanvas.drawDMNTask(serviceTask.getName(), graphicInfo, scaleFactor);
- } else if (ServiceTask.SHELL_TASK.equalsIgnoreCase(serviceTask.getType())) {
- processDiagramCanvas.drawShellTask(serviceTask.getName(), graphicInfo, scaleFactor);
- } else {
- processDiagramCanvas.drawServiceTask(serviceTask.getName(), graphicInfo, scaleFactor);
- }
- }
- });
-
- // http service task
- activityDrawInstructions.put(HttpServiceTask.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawHttpTask(flowNode.getName(), graphicInfo, scaleFactor);
- }
- });
-
- // receive task
- activityDrawInstructions.put(ReceiveTask.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawReceiveTask(flowNode.getName(), graphicInfo, scaleFactor);
- }
- });
-
- // send task
- activityDrawInstructions.put(SendTask.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawSendTask(flowNode.getName(), graphicInfo, scaleFactor);
- }
- });
-
- // manual task
- activityDrawInstructions.put(ManualTask.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawManualTask(flowNode.getName(), graphicInfo, scaleFactor);
- }
- });
-
- // send event service task
- activityDrawInstructions.put(SendEventServiceTask.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawSendEventServiceTask(flowNode.getName(), graphicInfo, scaleFactor);
- }
- });
-
- // external worker service task
- activityDrawInstructions.put(ExternalWorkerServiceTask.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- ServiceTask serviceTask = (ServiceTask) flowNode;
- processDiagramCanvas.drawServiceTask(serviceTask.getName(), graphicInfo, scaleFactor);
- }
- });
-
- // case service task
- activityDrawInstructions.put(CaseServiceTask.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawCaseServiceTask(flowNode.getName(), graphicInfo, scaleFactor);
- }
- });
-
- // businessRuleTask task
- activityDrawInstructions.put(BusinessRuleTask.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawBusinessRuleTask(flowNode.getName(), graphicInfo, scaleFactor);
- }
- });
-
- // exclusive gateway
- activityDrawInstructions.put(ExclusiveGateway.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawExclusiveGateway(graphicInfo, scaleFactor);
- }
- });
-
- // inclusive gateway
- activityDrawInstructions.put(InclusiveGateway.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawInclusiveGateway(graphicInfo, scaleFactor);
- }
- });
-
- // parallel gateway
- activityDrawInstructions.put(ParallelGateway.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawParallelGateway(graphicInfo, scaleFactor);
- }
- });
-
- // event based gateway
- activityDrawInstructions.put(EventGateway.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawEventBasedGateway(graphicInfo, scaleFactor);
- }
- });
-
- // Boundary timer
- activityDrawInstructions.put(BoundaryEvent.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- BoundaryEvent boundaryEvent = (BoundaryEvent) flowNode;
- if (boundaryEvent.getEventDefinitions() != null && !boundaryEvent.getEventDefinitions().isEmpty()) {
- EventDefinition eventDefinition = boundaryEvent.getEventDefinitions().get(0);
- if (eventDefinition instanceof TimerEventDefinition) {
- processDiagramCanvas.drawCatchingTimerEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
-
- } else if (eventDefinition instanceof ConditionalEventDefinition) {
- processDiagramCanvas.drawCatchingConditionalEvent(graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
-
- } else if (eventDefinition instanceof ErrorEventDefinition) {
- processDiagramCanvas.drawCatchingErrorEvent(graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
-
- } else if (eventDefinition instanceof EscalationEventDefinition) {
- processDiagramCanvas.drawCatchingEscalationEvent(graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
-
- } else if (eventDefinition instanceof SignalEventDefinition) {
- processDiagramCanvas.drawCatchingSignalEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
-
- } else if (eventDefinition instanceof MessageEventDefinition) {
- processDiagramCanvas.drawCatchingMessageEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
-
- } else if (eventDefinition instanceof CompensateEventDefinition) {
- processDiagramCanvas.drawCatchingCompensateEvent(graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
- }
-
- } else {
- List eventTypeElements = boundaryEvent.getExtensionElements().get("eventType");
- if (eventTypeElements != null && eventTypeElements.size() > 0) {
- processDiagramCanvas.drawCatchingEventRegistryEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
- }
- }
- }
- });
-
- // subprocess
- activityDrawInstructions.put(SubProcess.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- if (graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) {
- processDiagramCanvas.drawCollapsedSubProcess(flowNode.getName(), graphicInfo, false, scaleFactor);
- } else {
- processDiagramCanvas.drawExpandedSubProcess(flowNode.getName(), graphicInfo, false, scaleFactor);
- }
- }
- });
-
- // transaction
- activityDrawInstructions.put(Transaction.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- if (graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) {
- processDiagramCanvas.drawCollapsedSubProcess(flowNode.getName(), graphicInfo, false, scaleFactor);
- } else {
- processDiagramCanvas.drawExpandedTransaction(flowNode.getName(), graphicInfo, scaleFactor);
- }
- }
- });
-
- // Event subprocess
- activityDrawInstructions.put(EventSubProcess.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- if (graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) {
- processDiagramCanvas.drawCollapsedSubProcess(flowNode.getName(), graphicInfo, true, scaleFactor);
- } else {
- processDiagramCanvas.drawExpandedSubProcess(flowNode.getName(), graphicInfo, true, scaleFactor);
- }
- }
- });
-
- // Adhoc subprocess
- activityDrawInstructions.put(AdhocSubProcess.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- if (graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) {
- processDiagramCanvas.drawCollapsedSubProcess(flowNode.getName(), graphicInfo, false, scaleFactor);
- } else {
- processDiagramCanvas.drawExpandedSubProcess(flowNode.getName(), graphicInfo, false, scaleFactor);
- }
- }
- });
-
- // call activity
- activityDrawInstructions.put(CallActivity.class, new ActivityDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- processDiagramCanvas.drawCollapsedCallActivity(flowNode.getName(), graphicInfo, scaleFactor);
- }
- });
-
- // text annotation
- artifactDrawInstructions.put(TextAnnotation.class, new ArtifactDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(artifact.getId());
- TextAnnotation textAnnotation = (TextAnnotation) artifact;
- processDiagramCanvas.drawTextAnnotation(textAnnotation.getText(), graphicInfo, scaleFactor);
- }
- });
-
- // association
- artifactDrawInstructions.put(Association.class, new ArtifactDrawInstruction() {
-
- @Override
- public void draw(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact) {
- Association association = (Association) artifact;
- String sourceRef = association.getSourceRef();
- String targetRef = association.getTargetRef();
-
- // source and target can be instance of FlowElement or Artifact
- BaseElement sourceElement = bpmnModel.getFlowElement(sourceRef);
- BaseElement targetElement = bpmnModel.getFlowElement(targetRef);
- if (sourceElement == null) {
- sourceElement = bpmnModel.getArtifact(sourceRef);
- }
- if (targetElement == null) {
- targetElement = bpmnModel.getArtifact(targetRef);
- }
- List graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(artifact.getId());
- graphicInfoList = connectionPerfectionizer(processDiagramCanvas, bpmnModel, sourceElement, targetElement, graphicInfoList);
- int[] xPoints = new int[graphicInfoList.size()];
- int[] yPoints = new int[graphicInfoList.size()];
- for (int i = 1; i < graphicInfoList.size(); i++) {
- GraphicInfo graphicInfo = graphicInfoList.get(i);
- GraphicInfo previousGraphicInfo = graphicInfoList.get(i - 1);
-
- if (i == 1) {
- xPoints[0] = (int) previousGraphicInfo.getX();
- yPoints[0] = (int) previousGraphicInfo.getY();
- }
- xPoints[i] = (int) graphicInfo.getX();
- yPoints[i] = (int) graphicInfo.getY();
- }
-
- AssociationDirection associationDirection = association.getAssociationDirection();
- processDiagramCanvas.drawAssociation(xPoints, yPoints, associationDirection, false, scaleFactor);
- }
- });
- }
-
- @Override
- public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List highLightedActivities, List highLightedFlows,
- String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) {
-
- return generateProcessDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows,
- activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor, drawSequenceFlowNameWithNoLabelDI).generateImage(imageType);
- }
-
- @Override
- public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List highLightedActivities, List highLightedFlows, boolean drawSequenceFlowNameWithNoLabelDI) {
- return generateDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows, null, null, null, null, 1.0, drawSequenceFlowNameWithNoLabelDI);
- }
-
- @Override
- public InputStream generateDiagram(BpmnModel bpmnModel, String imageType,
- List highLightedActivities, List highLightedFlows, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) {
- return generateDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows, null, null, null, null, scaleFactor, drawSequenceFlowNameWithNoLabelDI);
- }
-
- @Override
- public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List highLightedActivities, boolean drawSequenceFlowNameWithNoLabelDI) {
- return generateDiagram(bpmnModel, imageType, highLightedActivities, Collections.emptyList(), drawSequenceFlowNameWithNoLabelDI);
- }
-
- @Override
- public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List highLightedActivities, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) {
- return generateDiagram(bpmnModel, imageType, highLightedActivities, Collections.emptyList(), scaleFactor, drawSequenceFlowNameWithNoLabelDI);
- }
-
- @Override
- public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, String activityFontName,
- String labelFontName, String annotationFontName, ClassLoader customClassLoader, boolean drawSequenceFlowNameWithNoLabelDI) {
-
- return generateDiagram(bpmnModel, imageType, Collections.emptyList(), Collections.emptyList(),
- activityFontName, labelFontName, annotationFontName, customClassLoader, 1.0, drawSequenceFlowNameWithNoLabelDI);
- }
-
- @Override
- public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, String activityFontName,
- String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) {
-
- return generateDiagram(bpmnModel, imageType, Collections.emptyList(), Collections.emptyList(),
- activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor, drawSequenceFlowNameWithNoLabelDI);
- }
-
- @Override
- public InputStream generatePngDiagram(BpmnModel bpmnModel, boolean drawSequenceFlowNameWithNoLabelDI) {
- return generatePngDiagram(bpmnModel, 1.0, drawSequenceFlowNameWithNoLabelDI);
- }
-
- @Override
- public InputStream generatePngDiagram(BpmnModel bpmnModel, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) {
- return generateDiagram(bpmnModel, "png", Collections.emptyList(), Collections.emptyList(), scaleFactor, drawSequenceFlowNameWithNoLabelDI);
- }
-
- @Override
- public InputStream generateJpgDiagram(BpmnModel bpmnModel) {
- return generateJpgDiagram(bpmnModel, 1.0, false);
- }
-
- @Override
- public InputStream generateJpgDiagram(BpmnModel bpmnModel, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) {
- return generateDiagram(bpmnModel, "jpg", Collections.emptyList(), Collections.emptyList(), drawSequenceFlowNameWithNoLabelDI);
- }
-
- public BufferedImage generateImage(BpmnModel bpmnModel, String imageType, List highLightedActivities, List highLightedFlows,
- String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) {
-
- return generateProcessDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows,
- activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor, drawSequenceFlowNameWithNoLabelDI).generateBufferedImage(imageType);
- }
-
- public BufferedImage generateImage(BpmnModel bpmnModel, String imageType,
- List highLightedActivities, List highLightedFlows, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) {
-
- return generateImage(bpmnModel, imageType, highLightedActivities, highLightedFlows, null, null, null, null, scaleFactor, drawSequenceFlowNameWithNoLabelDI);
- }
-
- @Override
- public BufferedImage generatePngImage(BpmnModel bpmnModel, double scaleFactor) {
- return generateImage(bpmnModel, "png", Collections.emptyList(), Collections.emptyList(), scaleFactor, false);
- }
-
- protected CustomDefaultProcessDiagramCanvas generateProcessDiagram(BpmnModel bpmnModel, String imageType,
- List highLightedActivities, List highLightedFlows,
- String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor, boolean drawSequenceFlowNameWithNoLabelDI) {
-
- prepareBpmnModel(bpmnModel);
-
- CustomDefaultProcessDiagramCanvas processDiagramCanvas = initProcessDiagramCanvas(bpmnModel, imageType, activityFontName, labelFontName, annotationFontName, customClassLoader);
-
- // Draw pool shape, if process is participant in collaboration
- for (Pool pool : bpmnModel.getPools()) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(pool.getId());
- processDiagramCanvas.drawPoolOrLane(pool.getName(), graphicInfo, scaleFactor);
- }
-
- // Draw lanes
- for (Process process : bpmnModel.getProcesses()) {
- for (Lane lane : process.getLanes()) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(lane.getId());
- processDiagramCanvas.drawPoolOrLane(lane.getName(), graphicInfo, scaleFactor);
- }
- }
-
- // Draw activities and their sequence-flows
- for (Process process : bpmnModel.getProcesses()) {
- for (FlowNode flowNode : process.findFlowElementsOfType(FlowNode.class)) {
- if (!isPartOfCollapsedSubProcess(flowNode, bpmnModel)) {
- drawActivity(processDiagramCanvas, bpmnModel, flowNode, highLightedActivities, highLightedFlows, scaleFactor, drawSequenceFlowNameWithNoLabelDI);
- }
- }
- }
-
- // Draw artifacts
- for (Process process : bpmnModel.getProcesses()) {
-
- for (Artifact artifact : process.getArtifacts()) {
- drawArtifact(processDiagramCanvas, bpmnModel, artifact);
- }
-
- List subProcesses = process.findFlowElementsOfType(SubProcess.class, true);
- if (subProcesses != null) {
- for (SubProcess subProcess : subProcesses) {
-
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(subProcess.getId());
- if (graphicInfo != null && graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) {
- continue;
- }
-
- if (!isPartOfCollapsedSubProcess(subProcess, bpmnModel)) {
- for (Artifact subProcessArtifact : subProcess.getArtifacts()) {
- drawArtifact(processDiagramCanvas, bpmnModel, subProcessArtifact);
- }
- }
- }
- }
- }
-
- return processDiagramCanvas;
- }
-
- protected void prepareBpmnModel(BpmnModel bpmnModel) {
-
- // Need to make sure all elements have positive x and y.
- // Check all graphicInfo and update the elements accordingly
-
- List allGraphicInfos = new ArrayList<>();
- if (bpmnModel.getLocationMap() != null) {
- allGraphicInfos.addAll(bpmnModel.getLocationMap().values());
- }
- if (bpmnModel.getLabelLocationMap() != null) {
- allGraphicInfos.addAll(bpmnModel.getLabelLocationMap().values());
- }
- if (bpmnModel.getFlowLocationMap() != null) {
- for (List flowGraphicInfos : bpmnModel.getFlowLocationMap().values()) {
- allGraphicInfos.addAll(flowGraphicInfos);
- }
- }
-
- if (allGraphicInfos.size() > 0) {
-
- boolean needsTranslationX = false;
- boolean needsTranslationY = false;
-
- double lowestX = 0.0;
- double lowestY = 0.0;
-
- // Collect lowest x and y
- for (GraphicInfo graphicInfo : allGraphicInfos) {
-
- double x = graphicInfo.getX();
- double y = graphicInfo.getY();
-
- if (x < lowestX) {
- needsTranslationX = true;
- lowestX = x;
- }
- if (y < lowestY) {
- needsTranslationY = true;
- lowestY = y;
- }
-
- }
-
- // Update all graphicInfo objects
- if (needsTranslationX || needsTranslationY) {
-
- double translationX = Math.abs(lowestX);
- double translationY = Math.abs(lowestY);
-
- for (GraphicInfo graphicInfo : allGraphicInfos) {
- if (needsTranslationX) {
- graphicInfo.setX(graphicInfo.getX() + translationX);
- }
- if (needsTranslationY) {
- graphicInfo.setY(graphicInfo.getY() + translationY);
- }
- }
- }
-
- }
-
- }
-
- protected void drawActivity(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel,
- FlowNode flowNode, List highLightedActivities, List highLightedFlows, double scaleFactor, Boolean drawSequenceFlowNameWithNoLabelDI) {
-
- ActivityDrawInstruction drawInstruction = activityDrawInstructions.get(flowNode.getClass());
- if (drawInstruction != null) {
-
- drawInstruction.draw(processDiagramCanvas, bpmnModel, flowNode);
-
- // Gather info on the multi instance marker
- boolean multiInstanceSequential = false;
- boolean multiInstanceParallel = false;
- boolean collapsed = false;
- if (flowNode instanceof Activity) {
- Activity activity = (Activity) flowNode;
- MultiInstanceLoopCharacteristics multiInstanceLoopCharacteristics = activity.getLoopCharacteristics();
- if (multiInstanceLoopCharacteristics != null) {
- multiInstanceSequential = multiInstanceLoopCharacteristics.isSequential();
- multiInstanceParallel = !multiInstanceSequential;
- }
- }
-
- // Gather info on the collapsed marker
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
- if (flowNode instanceof SubProcess) {
- collapsed = graphicInfo.getExpanded() != null && !graphicInfo.getExpanded();
- } else if (flowNode instanceof CallActivity) {
- collapsed = true;
- }
-
- if (scaleFactor == 1.0) {
- // Actually draw the markers
- processDiagramCanvas.drawActivityMarkers((int) graphicInfo.getX(), (int) graphicInfo.getY(), (int) graphicInfo.getWidth(), (int) graphicInfo.getHeight(),
- multiInstanceSequential, multiInstanceParallel, collapsed);
- }
-
- // Draw highlighted activities
- if (highLightedActivities.contains(flowNode.getId())) {
- drawHighLightRed(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId()));
- } else if (highLightedActivities.contains(Color.RED.toString() + flowNode.getId())) {
- drawHighLight(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId()));
- }
-
- } else if (flowNode instanceof Task) {
- activityDrawInstructions.get(Task.class).draw(processDiagramCanvas, bpmnModel, flowNode);
-
- if (highLightedActivities.contains(flowNode.getId())) {
- drawHighLightRed(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId()));
- } else if (highLightedActivities.contains(Color.RED.toString() + flowNode.getId())) {
- drawHighLight(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId()));
- }
- }
-
- // Outgoing transitions of activity
- for (SequenceFlow sequenceFlow : flowNode.getOutgoingFlows()) {
- boolean highLighted = (highLightedFlows.contains(sequenceFlow.getId()));
- String defaultFlow = null;
- if (flowNode instanceof Activity) {
- defaultFlow = ((Activity) flowNode).getDefaultFlow();
- } else if (flowNode instanceof Gateway) {
- defaultFlow = ((Gateway) flowNode).getDefaultFlow();
- }
-
- boolean isDefault = false;
- if (defaultFlow != null && defaultFlow.equalsIgnoreCase(sequenceFlow.getId())) {
- isDefault = true;
- }
- boolean drawConditionalIndicator = sequenceFlow.getConditionExpression() != null && sequenceFlow.getConditionExpression().trim().length() > 0 && !(flowNode instanceof Gateway);
-
- String sourceRef = sequenceFlow.getSourceRef();
- String targetRef = sequenceFlow.getTargetRef();
- FlowElement sourceElement = bpmnModel.getFlowElement(sourceRef);
- FlowElement targetElement = bpmnModel.getFlowElement(targetRef);
- List graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(sequenceFlow.getId());
- if (graphicInfoList != null && graphicInfoList.size() > 0) {
- graphicInfoList = connectionPerfectionizer(processDiagramCanvas, bpmnModel, sourceElement, targetElement, graphicInfoList);
- int[] xPoints = new int[graphicInfoList.size()];
- int[] yPoints = new int[graphicInfoList.size()];
-
- for (int i = 1; i < graphicInfoList.size(); i++) {
- GraphicInfo graphicInfo = graphicInfoList.get(i);
- GraphicInfo previousGraphicInfo = graphicInfoList.get(i - 1);
-
- if (i == 1) {
- xPoints[0] = (int) previousGraphicInfo.getX();
- yPoints[0] = (int) previousGraphicInfo.getY();
- }
- xPoints[i] = (int) graphicInfo.getX();
- yPoints[i] = (int) graphicInfo.getY();
-
- }
-
- processDiagramCanvas.drawSequenceflow(xPoints, yPoints, drawConditionalIndicator, isDefault, highLighted, scaleFactor);
-
- // Draw sequenceflow label
- GraphicInfo labelGraphicInfo = bpmnModel.getLabelGraphicInfo(sequenceFlow.getId());
- if (labelGraphicInfo != null) {
- processDiagramCanvas.drawLabel(sequenceFlow.getName(), labelGraphicInfo, false);
- } else {
- if (drawSequenceFlowNameWithNoLabelDI) {
- GraphicInfo lineCenter = getLineCenter(graphicInfoList);
- processDiagramCanvas.drawLabel(sequenceFlow.getName(), lineCenter, false);
- }
-
- }
- }
- }
-
- // Nested elements
- if (flowNode instanceof FlowElementsContainer) {
- for (FlowElement nestedFlowElement : ((FlowElementsContainer) flowNode).getFlowElements()) {
- if (nestedFlowElement instanceof FlowNode && !isPartOfCollapsedSubProcess(nestedFlowElement, bpmnModel)) {
- drawActivity(processDiagramCanvas, bpmnModel, (FlowNode) nestedFlowElement,
- highLightedActivities, highLightedFlows, scaleFactor, drawSequenceFlowNameWithNoLabelDI);
- }
- }
- }
- }
-
- /**
- * This method makes coordinates of connection flow better.
- *
- * @param processDiagramCanvas
- * @param bpmnModel
- * @param sourceElement
- * @param targetElement
- * @param graphicInfoList
- * @return
- */
- protected static List connectionPerfectionizer(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, BaseElement sourceElement, BaseElement targetElement, List graphicInfoList) {
- GraphicInfo sourceGraphicInfo = bpmnModel.getGraphicInfo(sourceElement.getId());
- GraphicInfo targetGraphicInfo = bpmnModel.getGraphicInfo(targetElement.getId());
-
- CustomDefaultProcessDiagramCanvas.SHAPE_TYPE sourceShapeType = getShapeType(sourceElement);
- CustomDefaultProcessDiagramCanvas.SHAPE_TYPE targetShapeType = getShapeType(targetElement);
-
- return processDiagramCanvas.connectionPerfectionizer(sourceShapeType, targetShapeType, sourceGraphicInfo, targetGraphicInfo, graphicInfoList);
- }
-
- /**
- * This method returns shape type of base element.
- * Each element can be presented as rectangle, rhombus, or ellipse.
- *
- * @param baseElement
- * @return CustomDefaultProcessDiagramCanvas.SHAPE_TYPE
- */
- protected static CustomDefaultProcessDiagramCanvas.SHAPE_TYPE getShapeType(BaseElement baseElement) {
- if (baseElement instanceof Task || baseElement instanceof Activity || baseElement instanceof TextAnnotation) {
- return CustomDefaultProcessDiagramCanvas.SHAPE_TYPE.Rectangle;
- } else if (baseElement instanceof Gateway) {
- return CustomDefaultProcessDiagramCanvas.SHAPE_TYPE.Rhombus;
- } else if (baseElement instanceof Event) {
- return CustomDefaultProcessDiagramCanvas.SHAPE_TYPE.Ellipse;
- } else {
- // unknown source element, just do not correct coordinates
- }
- return null;
- }
-
- protected static GraphicInfo getLineCenter(List graphicInfoList) {
- GraphicInfo gi = new GraphicInfo();
-
- int[] xPoints = new int[graphicInfoList.size()];
- int[] yPoints = new int[graphicInfoList.size()];
-
- double length = 0;
- double[] lengths = new double[graphicInfoList.size()];
- lengths[0] = 0;
- double m;
- for (int i = 1; i < graphicInfoList.size(); i++) {
- GraphicInfo graphicInfo = graphicInfoList.get(i);
- GraphicInfo previousGraphicInfo = graphicInfoList.get(i - 1);
-
- if (i == 1) {
- xPoints[0] = (int) previousGraphicInfo.getX();
- yPoints[0] = (int) previousGraphicInfo.getY();
- }
- xPoints[i] = (int) graphicInfo.getX();
- yPoints[i] = (int) graphicInfo.getY();
-
- length += Math.sqrt(
- Math.pow((int) graphicInfo.getX() - (int) previousGraphicInfo.getX(), 2) +
- Math.pow((int) graphicInfo.getY() - (int) previousGraphicInfo.getY(), 2));
- lengths[i] = length;
- }
- m = length / 2;
- int p1 = 0;
- int p2 = 1;
- for (int i = 1; i < lengths.length; i++) {
- double len = lengths[i];
- p1 = i - 1;
- p2 = i;
- if (len > m) {
- break;
- }
- }
-
- GraphicInfo graphicInfo1 = graphicInfoList.get(p1);
- GraphicInfo graphicInfo2 = graphicInfoList.get(p2);
-
- double AB = (int) graphicInfo2.getX() - (int) graphicInfo1.getX();
- double OA = (int) graphicInfo2.getY() - (int) graphicInfo1.getY();
- double OB = lengths[p2] - lengths[p1];
- double ob = m - lengths[p1];
- double ab = AB * ob / OB;
- double oa = OA * ob / OB;
-
- double mx = graphicInfo1.getX() + ab;
- double my = graphicInfo1.getY() + oa;
-
- gi.setX(mx);
- gi.setY(my);
- return gi;
- }
-
- protected void drawArtifact(CustomDefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact) {
-
- ArtifactDrawInstruction drawInstruction = artifactDrawInstructions.get(artifact.getClass());
- if (drawInstruction != null) {
- drawInstruction.draw(processDiagramCanvas, bpmnModel, artifact);
- }
- }
-
- private static void drawHighLight(CustomDefaultProcessDiagramCanvas processDiagramCanvas, GraphicInfo graphicInfo) {
- processDiagramCanvas.drawHighLight((int) graphicInfo.getX(), (int) graphicInfo.getY(), (int) graphicInfo.getWidth(), (int) graphicInfo.getHeight());
-
- }
-
- private static void drawHighLightRed(CustomDefaultProcessDiagramCanvas processDiagramCanvas, GraphicInfo graphicInfo) {
- processDiagramCanvas.drawHighLightRed((int) graphicInfo.getX(), (int) graphicInfo.getY(), (int) graphicInfo.getWidth(), (int) graphicInfo.getHeight());
-
- }
-
- protected static CustomDefaultProcessDiagramCanvas initProcessDiagramCanvas(BpmnModel bpmnModel, String imageType,
- String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader) {
-
- // We need to calculate maximum values to know how big the image will be in its entirety
- double minX = Double.MAX_VALUE;
- double maxX = 0;
- double minY = Double.MAX_VALUE;
- double maxY = 0;
-
- for (Pool pool : bpmnModel.getPools()) {
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(pool.getId());
- minX = graphicInfo.getX();
- maxX = graphicInfo.getX() + graphicInfo.getWidth();
- minY = graphicInfo.getY();
- maxY = graphicInfo.getY() + graphicInfo.getHeight();
- }
-
- List flowNodes = gatherAllFlowNodes(bpmnModel);
- for (FlowNode flowNode : flowNodes) {
-
- GraphicInfo flowNodeGraphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-
- // width
- if (flowNodeGraphicInfo.getX() + flowNodeGraphicInfo.getWidth() > maxX) {
- maxX = flowNodeGraphicInfo.getX() + flowNodeGraphicInfo.getWidth();
- }
- if (flowNodeGraphicInfo.getX() < minX) {
- minX = flowNodeGraphicInfo.getX();
- }
- // height
- if (flowNodeGraphicInfo.getY() + flowNodeGraphicInfo.getHeight() > maxY) {
- maxY = flowNodeGraphicInfo.getY() + flowNodeGraphicInfo.getHeight();
- }
- if (flowNodeGraphicInfo.getY() < minY) {
- minY = flowNodeGraphicInfo.getY();
- }
-
- for (SequenceFlow sequenceFlow : flowNode.getOutgoingFlows()) {
- List graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(sequenceFlow.getId());
- if (graphicInfoList != null) {
- for (GraphicInfo graphicInfo : graphicInfoList) {
- // width
- if (graphicInfo.getX() > maxX) {
- maxX = graphicInfo.getX();
- }
- if (graphicInfo.getX() < minX) {
- minX = graphicInfo.getX();
- }
- // height
- if (graphicInfo.getY() > maxY) {
- maxY = graphicInfo.getY();
- }
- if (graphicInfo.getY() < minY) {
- minY = graphicInfo.getY();
- }
- }
- }
- }
- }
-
- List artifacts = gatherAllArtifacts(bpmnModel);
- for (Artifact artifact : artifacts) {
-
- GraphicInfo artifactGraphicInfo = bpmnModel.getGraphicInfo(artifact.getId());
-
- if (artifactGraphicInfo != null) {
- // width
- if (artifactGraphicInfo.getX() + artifactGraphicInfo.getWidth() > maxX) {
- maxX = artifactGraphicInfo.getX() + artifactGraphicInfo.getWidth();
- }
- if (artifactGraphicInfo.getX() < minX) {
- minX = artifactGraphicInfo.getX();
- }
- // height
- if (artifactGraphicInfo.getY() + artifactGraphicInfo.getHeight() > maxY) {
- maxY = artifactGraphicInfo.getY() + artifactGraphicInfo.getHeight();
- }
- if (artifactGraphicInfo.getY() < minY) {
- minY = artifactGraphicInfo.getY();
- }
- }
-
- List graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(artifact.getId());
- if (graphicInfoList != null) {
- for (GraphicInfo graphicInfo : graphicInfoList) {
- // width
- if (graphicInfo.getX() > maxX) {
- maxX = graphicInfo.getX();
- }
- if (graphicInfo.getX() < minX) {
- minX = graphicInfo.getX();
- }
- // height
- if (graphicInfo.getY() > maxY) {
- maxY = graphicInfo.getY();
- }
- if (graphicInfo.getY() < minY) {
- minY = graphicInfo.getY();
- }
- }
- }
- }
-
- int nrOfLanes = 0;
- for (Process process : bpmnModel.getProcesses()) {
- for (Lane l : process.getLanes()) {
-
- nrOfLanes++;
-
- GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(l.getId());
- // // width
- if (graphicInfo.getX() + graphicInfo.getWidth() > maxX) {
- maxX = graphicInfo.getX() + graphicInfo.getWidth();
- }
- if (graphicInfo.getX() < minX) {
- minX = graphicInfo.getX();
- }
- // height
- if (graphicInfo.getY() + graphicInfo.getHeight() > maxY) {
- maxY = graphicInfo.getY() + graphicInfo.getHeight();
- }
- if (graphicInfo.getY() < minY) {
- minY = graphicInfo.getY();
- }
- }
- }
-
- // Special case, see https://activiti.atlassian.net/browse/ACT-1431
- if (flowNodes.isEmpty() && bpmnModel.getPools().isEmpty() && nrOfLanes == 0) {
- // Nothing to show
- minX = 0;
- minY = 0;
- }
-
- return new CustomDefaultProcessDiagramCanvas((int) maxX + 10, (int) maxY + 10, (int) minX, (int) minY,
- imageType, activityFontName, labelFontName, annotationFontName, customClassLoader);
- }
-
- protected static List gatherAllArtifacts(BpmnModel bpmnModel) {
- List artifacts = new ArrayList<>();
- for (Process process : bpmnModel.getProcesses()) {
- artifacts.addAll(process.getArtifacts());
- }
- return artifacts;
- }
-
- protected static List gatherAllFlowNodes(BpmnModel bpmnModel) {
- List flowNodes = new ArrayList<>();
- for (Process process : bpmnModel.getProcesses()) {
- flowNodes.addAll(gatherAllFlowNodes(process));
- }
- return flowNodes;
- }
-
- protected static List gatherAllFlowNodes(FlowElementsContainer flowElementsContainer) {
- List flowNodes = new ArrayList<>();
- for (FlowElement flowElement : flowElementsContainer.getFlowElements()) {
- if (flowElement instanceof FlowNode) {
- flowNodes.add((FlowNode) flowElement);
- }
- if (flowElement instanceof FlowElementsContainer) {
- flowNodes.addAll(gatherAllFlowNodes((FlowElementsContainer) flowElement));
- }
- }
- return flowNodes;
- }
-
- protected boolean isPartOfCollapsedSubProcess(FlowElement flowElement, BpmnModel model) {
- SubProcess subProcess = flowElement.getSubProcess();
- if (subProcess != null) {
- GraphicInfo graphicInfo = model.getGraphicInfo(subProcess.getId());
- if (graphicInfo != null && graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) {
- return true;
- }
-
- return isPartOfCollapsedSubProcess(subProcess, model);
- }
-
- return false;
- }
-
- public Map, ActivityDrawInstruction> getActivityDrawInstructions() {
- return activityDrawInstructions;
- }
-
- public void setActivityDrawInstructions(
- Map, ActivityDrawInstruction> activityDrawInstructions) {
- this.activityDrawInstructions = activityDrawInstructions;
- }
-
- public Map