7 Commits

16 changed files with 390 additions and 337 deletions

View File

@ -30,7 +30,9 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
*/ */
default String buildDeptByRoleSql(Long roleId) { default String buildDeptByRoleSql(Long roleId) {
return """ return """
select dept_id from sys_role_dept where role_id = %d select srd.dept_id from sys_role_dept srd
left join sys_role sr on sr.role_id = srd.role_id
where srd.role_id = %d and sr.status = 0
""".formatted(roleId); """.formatted(roleId);
} }
@ -47,7 +49,9 @@ public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
default String buildParentDeptByRoleSql(Long roleId) { default String buildParentDeptByRoleSql(Long roleId) {
return """ return """
select parent_id from sys_dept where dept_id in ( select parent_id from sys_dept where dept_id in (
select dept_id from sys_role_dept where role_id = %d select srd.dept_id from sys_role_dept srd
left join sys_role sr on sr.role_id = srd.role_id
where srd.role_id = %d and sr.status = 0
) )
""".formatted(roleId); """.formatted(roleId);
} }

View File

@ -32,7 +32,9 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
default String buildMenuByUserSql(Long userId) { default String buildMenuByUserSql(Long userId) {
return """ return """
select menu_id from sys_role_menu where role_id in ( select menu_id from sys_role_menu where role_id in (
select role_id from sys_user_role where user_id = %d select sur.role_id from sys_user_role sur
left join sys_role sr on sr.role_id = sur.role_id
where sur.user_id = %d and sr.status = 0
) )
""".formatted(userId); """.formatted(userId);
} }
@ -50,7 +52,9 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
*/ */
default String buildMenuByRoleSql(Long roleId) { default String buildMenuByRoleSql(Long roleId) {
return """ return """
select menu_id from sys_role_menu where role_id = %d select srm.menu_id from sys_role_menu srm
left join sys_role sr on sr.role_id = srm.role_id
where srm.role_id = %d and sr.status = 0
""".formatted(roleId); """.formatted(roleId);
} }
@ -68,7 +72,9 @@ public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
default String buildParentMenuByRoleSql(Long roleId) { default String buildParentMenuByRoleSql(Long roleId) {
return """ return """
select parent_id from sys_menu where menu_id in ( select parent_id from sys_menu where menu_id in (
select menu_id from sys_role_menu where role_id = %d select srm.menu_id from sys_role_menu srm
left join sys_role sr on sr.role_id = srm.role_id
where srm.role_id = %d and sr.status = 0
) )
""".formatted(roleId); """.formatted(roleId);
} }

View File

@ -0,0 +1,20 @@
package org.dromara.workflow.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 抄送设置枚举
*
* @author AprilWind
*/
@Getter
@AllArgsConstructor
public enum CopySettingEnum implements NodeExtEnum {
;
private final String label;
private final String value;
private final boolean selected;
}

View File

@ -0,0 +1,20 @@
package org.dromara.workflow.common.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 变量枚举
*
* @author AprilWind
*/
@Getter
@AllArgsConstructor
public enum VariablesEnum implements NodeExtEnum {
;
private final String label;
private final String value;
private final boolean selected;
}

View File

@ -1,46 +0,0 @@
package org.dromara.workflow.domain.bo;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.workflow.domain.FlowInstanceBizExt;
/**
* 流程实例业务扩展业务对象 flow_instance_biz_ext
*
* @author may
* @date 2025-08-05
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = FlowInstanceBizExt.class, reverseConvertGenerate = false)
public class FlowInstanceBizExtBo extends BaseEntity {
/**
* 主键
*/
private Long id;
/**
* 流程实例ID
*/
private Long instanceId;
/**
* 业务ID
*/
private String businessId;
/**
* 业务编码
*/
private String businessCode;
/**
* 业务标题
*/
private String businessTitle;
}

View File

@ -1,9 +1,11 @@
package org.dromara.workflow.domain.bo; package org.dromara.workflow.domain.bo;
import cn.hutool.core.util.ObjectUtil;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.workflow.domain.FlowInstanceBizExt;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
@ -47,7 +49,7 @@ public class StartProcessBo implements Serializable {
/** /**
* 流程业务扩展信息 * 流程业务扩展信息
*/ */
private FlowInstanceBizExtBo flowInstanceBizExtBo; private FlowInstanceBizExt bizExt;
public Map<String, Object> getVariables() { public Map<String, Object> getVariables() {
if (variables == null) { if (variables == null) {
@ -56,4 +58,11 @@ public class StartProcessBo implements Serializable {
variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue())); variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
return variables; return variables;
} }
public FlowInstanceBizExt getBizExt() {
if (ObjectUtil.isNull(bizExt)) {
bizExt = new FlowInstanceBizExt();
}
return bizExt;
}
} }

View File

@ -1,58 +0,0 @@
package org.dromara.workflow.domain.vo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import org.dromara.workflow.domain.FlowInstanceBizExt;
import java.io.Serial;
import java.io.Serializable;
/**
* 流程实例业务扩展视图对象 flow_instance_biz_ext
*
* @author may
* @date 2025-08-05
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = FlowInstanceBizExt.class)
public class FlowInstanceBizExtVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键
*/
@ExcelProperty(value = "主键")
private Long id;
/**
* 流程实例ID
*/
@ExcelProperty(value = "流程实例ID")
private Long instanceId;
/**
* 业务ID
*/
@ExcelProperty(value = "业务ID")
private String businessId;
/**
* 业务编码
*/
@ExcelProperty(value = "业务编码")
private String businessCode;
/**
* 业务标题
*/
@ExcelProperty(value = "业务标题")
private String businessTitle;
}

View File

@ -5,12 +5,14 @@ import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant; import org.dromara.common.translation.constant.TransConstant;
import org.dromara.warm.flow.core.entity.User; import org.dromara.warm.flow.core.entity.User;
import org.dromara.workflow.common.constant.FlowConstant; import org.dromara.workflow.common.constant.FlowConstant;
import org.dromara.workflow.domain.bo.FlowCopyBo;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 任务视图 * 任务视图
@ -185,6 +187,20 @@ public class FlowTaskVo implements Serializable {
*/ */
private List<ButtonPermissionVo> buttonList; private List<ButtonPermissionVo> buttonList;
/**
* 抄送对象 ID 集合
* <p>
* 根据扩展属性中 CopySettingEnum 类型的数据生成,存储需要抄送的对象 ID
*/
private List<FlowCopyBo> copyList;
/**
* 自定义参数 Map
* <p>
* 根据扩展属性中 VariablesEnum 类型的数据生成,存储 key=value 格式的自定义参数
*/
private Map<String, String> varList;
//业务扩展信息开始 //业务扩展信息开始
/** /**
* 业务编码 * 业务编码

View File

@ -0,0 +1,45 @@
package org.dromara.workflow.domain.vo;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* Node 扩展属性解析结果 VO
* <p>
* 用于封装从扩展属性 JSON 中解析出的各类信息,包括按钮权限、抄送对象和自定义参数。
*
* @author AprilWind
*/
@Data
public class NodeExtVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 按钮权限列表
* <p>
* 根据扩展属性中 ButtonPermissionEnum 类型的数据生成,每个元素表示一个按钮及其是否勾选。
*/
private List<ButtonPermissionVo> buttonPermissions;
/**
* 抄送对象 ID 集合
* <p>
* 根据扩展属性中 CopySettingEnum 类型的数据生成,存储需要抄送的对象 ID
*/
private Set<String> copySettings;
/**
* 自定义参数 Map
* <p>
* 根据扩展属性中 VariablesEnum 类型的数据生成,存储 key=value 格式的自定义参数
*/
private Map<String, String> variables;
}

View File

@ -1,12 +1,15 @@
package org.dromara.workflow.listener; package org.dromara.workflow.listener;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.TypeReference; import cn.hutool.core.lang.TypeReference;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.common.core.service.UserService;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.warm.flow.core.dto.FlowParams; import org.dromara.warm.flow.core.dto.FlowParams;
import org.dromara.warm.flow.core.entity.Definition; import org.dromara.warm.flow.core.entity.Definition;
@ -19,15 +22,18 @@ import org.dromara.workflow.common.ConditionalOnEnable;
import org.dromara.workflow.common.constant.FlowConstant; import org.dromara.workflow.common.constant.FlowConstant;
import org.dromara.workflow.common.enums.TaskStatusEnum; import org.dromara.workflow.common.enums.TaskStatusEnum;
import org.dromara.workflow.domain.bo.FlowCopyBo; import org.dromara.workflow.domain.bo.FlowCopyBo;
import org.dromara.workflow.domain.vo.NodeExtVo;
import org.dromara.workflow.handler.FlowProcessEventHandler; import org.dromara.workflow.handler.FlowProcessEventHandler;
import org.dromara.workflow.service.IFlwCommonService; import org.dromara.workflow.service.IFlwCommonService;
import org.dromara.workflow.service.IFlwInstanceService; import org.dromara.workflow.service.IFlwInstanceService;
import org.dromara.workflow.service.IFlwNodeExtService;
import org.dromara.workflow.service.IFlwTaskService; import org.dromara.workflow.service.IFlwTaskService;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
/** /**
* 全局任务办理监听 * 全局任务办理监听
@ -44,6 +50,8 @@ public class WorkflowGlobalListener implements GlobalListener {
private final IFlwInstanceService instanceService; private final IFlwInstanceService instanceService;
private final FlowProcessEventHandler flowProcessEventHandler; private final FlowProcessEventHandler flowProcessEventHandler;
private final IFlwCommonService flwCommonService; private final IFlwCommonService flwCommonService;
private final IFlwNodeExtService nodeExtService;
private final UserService userService;
private final InsService insService; private final InsService insService;
/** /**
@ -63,6 +71,25 @@ public class WorkflowGlobalListener implements GlobalListener {
*/ */
@Override @Override
public void start(ListenerVariable listenerVariable) { public void start(ListenerVariable listenerVariable) {
String ext = listenerVariable.getNode().getExt();
if (StringUtils.isNotBlank(ext)) {
NodeExtVo nodeExt = nodeExtService.parseNodeExt(ext);
Map<String, Object> variable = listenerVariable.getVariable();
Set<String> copyList = nodeExt.getCopySettings();
if (CollUtil.isNotEmpty(copyList)) {
List<FlowCopyBo> list = StreamUtils.toList(copyList, x -> {
FlowCopyBo bo = new FlowCopyBo();
Long id = Convert.toLong(x);
bo.setUserId(id);
bo.setUserName(userService.selectUserNameById(id));
return bo;
});
variable.put(FlowConstant.FLOW_COPY_LIST, list);
}
if (CollUtil.isNotEmpty(nodeExt.getVariables())) {
variable.putAll(nodeExt.getVariables());
}
}
} }
/** /**

View File

@ -1,8 +1,11 @@
package org.dromara.workflow.mapper; package org.dromara.workflow.mapper;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.workflow.domain.FlowInstanceBizExt; import org.dromara.workflow.domain.FlowInstanceBizExt;
import org.dromara.workflow.domain.vo.FlowInstanceBizExtVo;
import java.util.List;
/** /**
* 流程实例业务扩展Mapper接口 * 流程实例业务扩展Mapper接口
@ -10,6 +13,49 @@ import org.dromara.workflow.domain.vo.FlowInstanceBizExtVo;
* @author may * @author may
* @date 2025-08-05 * @date 2025-08-05
*/ */
public interface FlwInstanceBizExtMapper extends BaseMapperPlus<FlowInstanceBizExt, FlowInstanceBizExtVo> { public interface FlwInstanceBizExtMapper extends BaseMapperPlus<FlowInstanceBizExt, FlowInstanceBizExt> {
/**
* 根据 instanceId 保存或更新流程实例业务扩展
*
* @param entity 流程实例业务扩展实体
* @return 操作是否成功
*/
default int saveOrUpdateByInstanceId(FlowInstanceBizExt entity) {
// 查询是否存在
FlowInstanceBizExt exist = this.selectOne(new LambdaQueryWrapper<FlowInstanceBizExt>()
.eq(FlowInstanceBizExt::getInstanceId, entity.getInstanceId()));
if (ObjectUtil.isNotNull(exist)) {
// 存在就带上主键更新
entity.setId(exist.getId());
return updateById(entity);
} else {
// 不存在就插入
return insert(entity);
}
}
/**
* 按照流程实例ID删除单个流程实例业务扩展
*
* @param instanceId 流程实例ID
* @return 删除的行数
*/
default int deleteByInstId(Long instanceId) {
return this.delete(new LambdaQueryWrapper<FlowInstanceBizExt>()
.eq(FlowInstanceBizExt::getInstanceId, instanceId));
}
/**
* 按照流程实例ID批量删除流程实例业务扩展
*
* @param instanceIds 流程实例ID列表
* @return 删除的行数
*/
default int deleteByInstIds(List<Long> instanceIds) {
return this.delete(new LambdaQueryWrapper<FlowInstanceBizExt>()
.in(FlowInstanceBizExt::getInstanceId, instanceIds));
}
} }

View File

@ -1,30 +0,0 @@
package org.dromara.workflow.service;
import org.dromara.workflow.domain.bo.FlowInstanceBizExtBo;
import java.util.List;
/**
* 流程实例业务扩展Service接口
*
* @author may
* @date 2025-08-05
*/
public interface IFlwInstanceBizExtService {
/**
* 新增/修改流程实例业务扩展
*
* @param bo 流程实例业务扩展
* @return 是否新增成功
*/
Boolean saveOrUpdate(FlowInstanceBizExtBo bo);
/**
* 按照流程实例ID批量删除
*
* @param instanceIds 流程实例ID
* @return 是否删除成功
*/
Boolean deleteByInstIds(List<Long> instanceIds);
}

View File

@ -1,8 +1,6 @@
package org.dromara.workflow.service; package org.dromara.workflow.service;
import org.dromara.workflow.domain.vo.ButtonPermissionVo; import org.dromara.workflow.domain.vo.NodeExtVo;
import java.util.List;
/** /**
* 流程节点扩展属性 服务层 * 流程节点扩展属性 服务层
@ -12,11 +10,23 @@ import java.util.List;
public interface IFlwNodeExtService { public interface IFlwNodeExtService {
/** /**
* 扩展属性构建按钮权限列表:根据 ext 中记录的权限值,标记每个按钮是否勾选 * 解析扩展属性 JSON 并构建 Node 扩展属性对象
* <p>
* 根据传入的 JSON 字符串,将扩展属性分为三类:
* 1. ButtonPermissionEnum解析为按钮权限列表标记每个按钮是否勾选
* 2. CopySettingEnum解析为抄送对象 ID 集合
* 3. VariablesEnum解析为自定义参数 Map
*
* <p>示例 JSON
* [
* {"code": "ButtonPermissionEnum", "value": "back,termination"},
* {"code": "CopySettingEnum", "value": "1"},
* {"code": "VariablesEnum", "value": "key1=value1,key2=value2"}
* ]
* *
* @param ext 扩展属性 JSON 字符串 * @param ext 扩展属性 JSON 字符串
* @return 按钮权限 VO 列表 * @return NodeExtVo 对象,封装按钮权限列表、抄送对象集合和自定义参数 Map
*/ */
List<ButtonPermissionVo> buildButtonPermissionsFromExt(String ext); NodeExtVo parseNodeExt(String ext);
} }

View File

@ -1,57 +0,0 @@
package org.dromara.workflow.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.workflow.domain.FlowInstanceBizExt;
import org.dromara.workflow.domain.bo.FlowInstanceBizExtBo;
import org.dromara.workflow.mapper.FlwInstanceBizExtMapper;
import org.dromara.workflow.service.IFlwInstanceBizExtService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* 流程实例业务扩展Service业务层处理
*
* @author may
* @date 2025-08-05
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class FlwInstanceBizExtServiceImpl implements IFlwInstanceBizExtService {
private final FlwInstanceBizExtMapper baseMapper;
/**
* 新增/修改流程实例业务扩展
*
* @param bo 流程实例业务扩展
* @return 是否新增成功
*/
@Override
public Boolean saveOrUpdate(FlowInstanceBizExtBo bo) {
FlowInstanceBizExt convert = MapstructUtils.convert(bo, FlowInstanceBizExt.class);
FlowInstanceBizExt flowInstanceBizExt = baseMapper.selectOne(new LambdaQueryWrapper<FlowInstanceBizExt>()
.eq(FlowInstanceBizExt::getInstanceId, bo.getInstanceId()));
if (flowInstanceBizExt != null) {
flowInstanceBizExt.setBusinessTitle(convert.getBusinessTitle());
return baseMapper.insertOrUpdate(flowInstanceBizExt);
}
return baseMapper.insertOrUpdate(convert);
}
/**
* 按照流程实例ID批量删除
*
* @param instanceIds 流程实例ID
* @return 是否删除成功
*/
@Override
public Boolean deleteByInstIds(List<Long> instanceIds) {
return baseMapper.delete(new LambdaQueryWrapper<FlowInstanceBizExt>().in(FlowInstanceBizExt::getInstanceId, instanceIds)) > 0;
}
}

View File

@ -1,8 +1,8 @@
package org.dromara.workflow.service.impl; package org.dromara.workflow.service.impl;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.dto.DictTypeDTO; import org.dromara.common.core.domain.dto.DictTypeDTO;
@ -13,14 +13,16 @@ import org.dromara.warm.flow.ui.service.NodeExtService;
import org.dromara.warm.flow.ui.vo.NodeExt; import org.dromara.warm.flow.ui.vo.NodeExt;
import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.common.ConditionalOnEnable;
import org.dromara.workflow.common.enums.ButtonPermissionEnum; import org.dromara.workflow.common.enums.ButtonPermissionEnum;
import org.dromara.workflow.common.enums.CopySettingEnum;
import org.dromara.workflow.common.enums.NodeExtEnum; import org.dromara.workflow.common.enums.NodeExtEnum;
import org.dromara.workflow.common.enums.VariablesEnum;
import org.dromara.workflow.domain.vo.ButtonPermissionVo; import org.dromara.workflow.domain.vo.ButtonPermissionVo;
import org.dromara.workflow.domain.vo.NodeExtVo;
import org.dromara.workflow.service.IFlwNodeExtService; import org.dromara.workflow.service.IFlwNodeExtService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
/** /**
* 流程设计器-节点扩展属性 * 流程设计器-节点扩展属性
@ -36,14 +38,35 @@ public class FlwNodeExtServiceImpl implements NodeExtService, IFlwNodeExtService
/** /**
* 存储不同 dictType 对应的配置信息 * 存储不同 dictType 对应的配置信息
*/ */
private static final Map<String, ButtonPermission> CHILD_NODE_MAP = new HashMap<>(); private static final Map<String, Map<String, Object>> CHILD_NODE_MAP;
record ButtonPermission(String label, Integer type, Boolean must, Boolean multiple) {
}
static { static {
CHILD_NODE_MAP.put(ButtonPermissionEnum.class.getSimpleName(), CHILD_NODE_MAP = Map.of(
new ButtonPermission("权限按钮", 4, false, true)); CopySettingEnum.class.getSimpleName(),
Map.of(
"label", "抄送对象",
"type", 2,
"must", false,
"multiple", false,
"desc", "设置该节点的抄送办理人"
),
VariablesEnum.class.getSimpleName(),
Map.of(
"label", "自定义参数",
"type", 2,
"must", false,
"multiple", false,
"desc", "节点执行时可以使用的自定义参数"
),
ButtonPermissionEnum.class.getSimpleName(),
Map.of(
"label", "权限按钮",
"type", 4,
"must", false,
"multiple", true,
"desc", "控制该节点的按钮权限"
)
);
} }
private final DictService dictService; private final DictService dictService;
@ -56,6 +79,9 @@ public class FlwNodeExtServiceImpl implements NodeExtService, IFlwNodeExtService
@Override @Override
public List<NodeExt> getNodeExt() { public List<NodeExt> getNodeExt() {
List<NodeExt> nodeExtList = new ArrayList<>(); List<NodeExt> nodeExtList = new ArrayList<>();
// 构建基础设置页面
nodeExtList.add(buildNodeExt("wf_basic_tab", "基础设置", 1,
List.of(CopySettingEnum.class, VariablesEnum.class)));
// 构建按钮权限页面 // 构建按钮权限页面
nodeExtList.add(buildNodeExt("wf_button_tab", "权限", 2, nodeExtList.add(buildNodeExt("wf_button_tab", "权限", 2,
List.of(ButtonPermissionEnum.class))); List.of(ButtonPermissionEnum.class)));
@ -105,9 +131,20 @@ public class FlwNodeExtServiceImpl implements NodeExtService, IFlwNodeExtService
return null; return null;
} }
String simpleName = enumClass.getSimpleName(); String simpleName = enumClass.getSimpleName();
NodeExt.ChildNode childNode = buildChildNodeMap(simpleName); NodeExt.ChildNode childNode = new NodeExt.ChildNode();
Map<String, Object> map = CHILD_NODE_MAP.get(simpleName);
// 编码此json中唯 // 编码此json中唯
childNode.setCode(simpleName); childNode.setCode(simpleName);
// label名称
childNode.setLabel(Convert.toStr(map.get("label")));
// 1输入框 2文本域 3下拉框 4选择框
childNode.setType(Convert.toInt(map.get("type"), 1));
// 是否必填
childNode.setMust(Convert.toBool(map.get("must"), false));
// 是否多选
childNode.setMultiple(Convert.toBool(map.get("multiple"), true));
// 描述
childNode.setDesc(Convert.toStr(map.get("desc"), null));
// 字典,下拉框和复选框时用到 // 字典,下拉框和复选框时用到
childNode.setDict(Arrays.stream(enumClass.getEnumConstants()) childNode.setDict(Arrays.stream(enumClass.getEnumConstants())
.map(NodeExtEnum.class::cast) .map(NodeExtEnum.class::cast)
@ -128,12 +165,18 @@ public class FlwNodeExtServiceImpl implements NodeExtService, IFlwNodeExtService
if (ObjectUtil.isNull(dictTypeDTO)) { if (ObjectUtil.isNull(dictTypeDTO)) {
return null; return null;
} }
NodeExt.ChildNode childNode = buildChildNodeMap(dictType); NodeExt.ChildNode childNode = new NodeExt.ChildNode();
// 编码此json中唯一 // 编码此json中唯一
childNode.setCode(dictType); childNode.setCode(dictType);
// label名称 // label名称
childNode.setLabel(dictTypeDTO.getDictName()); childNode.setLabel(dictTypeDTO.getDictName());
// 描述 // 1输入框 2文本域 3下拉框 4选择框
childNode.setType(3);
// 是否必填
childNode.setMust(false);
// 是否多选
childNode.setMultiple(true);
// 描述 (可根据描述参数解析更多配置如typemustmultiple等)
childNode.setDesc(dictTypeDTO.getRemark()); childNode.setDesc(dictTypeDTO.getRemark());
// 字典,下拉框和复选框时用到 // 字典,下拉框和复选框时用到
childNode.setDict(dictService.getDictData(dictType) childNode.setDict(dictService.getDictData(dictType)
@ -144,100 +187,71 @@ public class FlwNodeExtServiceImpl implements NodeExtService, IFlwNodeExtService
} }
/** /**
* 根据 CHILD_NODE_MAP 中的配置信息,构建一个基本的 ChildNode 对象 * 解析扩展属性 JSON 并构建 Node 扩展属性对象
* 该方法用于设置 ChildNode 的常规属性,例如 label、type、是否必填、是否多选等 * <p>
* 根据传入的 JSON 字符串,将扩展属性分为三类:
* 1. ButtonPermissionEnum解析为按钮权限列表标记每个按钮是否勾选
* 2. CopySettingEnum解析为抄送对象 ID 集合
* 3. VariablesEnum解析为自定义参数 Map
* *
* @param key CHILD_NODE_MAP 的 key * <p>示例 JSON
* @return 返回构建好的 ChildNode 对象 * [
*/ * {"code": "ButtonPermissionEnum", "value": "back,termination"},
private NodeExt.ChildNode buildChildNodeMap(String key) { * {"code": "CopySettingEnum", "value": "1"},
NodeExt.ChildNode childNode = new NodeExt.ChildNode(); * {"code": "VariablesEnum", "value": "key1=value1,key2=value2"}
ButtonPermission bp = CHILD_NODE_MAP.get(key); * ]
if (bp == null) {
childNode.setType(1);
childNode.setMust(false);
childNode.setMultiple(true);
return childNode;
}
// label名称
childNode.setLabel(bp.label());
// 1输入框 2输入框 3下拉框 4选择框
childNode.setType(bp.type());
// 是否必填
childNode.setMust(bp.must());
// 是否多选
childNode.setMultiple(bp.multiple());
return childNode;
}
/**
* 从扩展属性构建按钮权限列表:根据 ext 中记录的权限值,标记每个按钮是否勾选
* *
* @param ext 扩展属性 JSON 字符串 * @param ext 扩展属性 JSON 字符串
* @return 按钮权限 VO 列表 * @return NodeExtVo 对象,封装按钮权限列表、抄送对象集合和自定义参数 Map
*/ */
@Override @Override
public List<ButtonPermissionVo> buildButtonPermissionsFromExt(String ext) { public NodeExtVo parseNodeExt(String ext) {
// 解析 ext 为 Map<code, Set<value>>,用于标记权限 NodeExtVo nodeExtVo = new NodeExtVo();
Map<String, Set<String>> permissionMap = JsonUtils.parseArray(ext, ButtonPermissionVo.class)
.stream()
.collect(Collectors.toMap(
ButtonPermissionVo::getCode,
item -> StringUtils.splitList(item.getValue()).stream()
.map(String::trim)
.filter(StrUtil::isNotBlank)
.collect(Collectors.toSet()),
(a, b) -> b,
HashMap::new
));
// 构建按钮权限列表,标记哪些按钮在 permissionMap 中出现(表示已勾选) // 解析 JSON 为 Dict 列表
return buildPermissionsFromSources(permissionMap, List.of(ButtonPermissionEnum.class)); List<Dict> nodeExtMap = JsonUtils.parseArrayMap(ext);
}
/** for (Dict nodeExt : nodeExtMap) {
* 将权限映射与按钮权限来源(枚举类或字典类型)进行匹配,生成权限视图列表 String code = nodeExt.getStr("code");
* <p> String value = nodeExt.getStr("value");
* 使用说明:
* - sources 支持传入多个来源类型,支持 NodeExtEnum 枚举类 或 字典类型字符串dictType
* - 若需要扩展更多按钮权限,只需在 sources 中新增对应的枚举类或字典类型
* <p>
* 示例:
* buildPermissionsFromSources(permissionMap, List.of(ButtonPermissionEnum.class, "custom_button_dict"));
*
* @param permissionMap 权限映射
* @param sources 枚举类或字典类型列表
* @return 按钮权限视图对象列表
*/
@SuppressWarnings("unchecked cast")
private List<ButtonPermissionVo> buildPermissionsFromSources(Map<String, Set<String>> permissionMap, List<Object> sources) {
return sources.stream()
.flatMap(source -> {
if (source instanceof Class<?> clazz && NodeExtEnum.class.isAssignableFrom(clazz)) {
Set<String> selectedSet = permissionMap.getOrDefault(clazz.getSimpleName(), Collections.emptySet());
return extractDictItems(this.buildChildNode((Class<? extends NodeExtEnum>) clazz), selectedSet).stream();
} else if (source instanceof String dictType) {
Set<String> selectedSet = permissionMap.getOrDefault(dictType, Collections.emptySet());
return extractDictItems(this.buildChildNode(dictType), selectedSet).stream();
}
return Stream.empty();
}).toList();
}
/** if (ButtonPermissionEnum.class.getSimpleName().equals(code)) {
* 从节点子项中提取字典项,并构建按钮权限视图对象列表 // 解析按钮权限
* // 将 value 拆分为 Set<String>,便于精确匹配
* @param childNode 子节点 Set<String> buttonSet = StringUtils.str2Set(value, StringUtils.SEPARATOR);
* @param selectedSet 已选中的值集
* @return 按钮权限视图对象列表 // 获取按钮字典配置
*/ NodeExt.ChildNode childNode = buildChildNode(ButtonPermissionEnum.class);
private List<ButtonPermissionVo> extractDictItems(NodeExt.ChildNode childNode, Set<String> selectedSet) {
return Optional.ofNullable(childNode) // 构建 ButtonPermissionVo 列表
.map(NodeExt.ChildNode::getDict) List<ButtonPermissionVo> buttonList = Optional.ofNullable(childNode)
.orElse(List.of()) .map(NodeExt.ChildNode::getDict)
.stream() .orElse(List.of())
.map(dict -> new ButtonPermissionVo(dict.getValue(), selectedSet.contains(dict.getValue()))) .stream()
.toList(); .map(dict -> new ButtonPermissionVo(dict.getValue(), buttonSet.contains(dict.getValue())))
.toList();
nodeExtVo.setButtonPermissions(buttonList);
} else if (CopySettingEnum.class.getSimpleName().equals(code)) {
// 解析抄送对象 ID 集合
nodeExtVo.setCopySettings(StringUtils.str2Set(value, StringUtils.SEPARATOR));
} else if (VariablesEnum.class.getSimpleName().equals(code)) {
// 解析自定义参数
// 将 key=value 字符串拆分为 Map
Map<String, String> variables = Arrays.stream(StringUtils.split(value, StringUtils.SEPARATOR))
.map(s -> StringUtils.split(s, "="))
.filter(arr -> arr.length == 2)
.collect(Collectors.toMap(arr -> arr[0], arr -> arr[1]));
nodeExtVo.setVariables(variables);
} else {
// 未知扩展类型,记录日志
log.warn("未知扩展类型code={}, value={}", code, value);
}
}
return nodeExtVo;
} }
} }

View File

@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Dict; import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
@ -37,17 +36,26 @@ import org.dromara.warm.flow.core.service.*;
import org.dromara.warm.flow.core.utils.ExpressionUtil; import org.dromara.warm.flow.core.utils.ExpressionUtil;
import org.dromara.warm.flow.core.utils.MapUtil; import org.dromara.warm.flow.core.utils.MapUtil;
import org.dromara.warm.flow.orm.entity.*; import org.dromara.warm.flow.orm.entity.*;
import org.dromara.warm.flow.orm.mapper.*; import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper;
import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper;
import org.dromara.warm.flow.orm.mapper.FlowNodeMapper;
import org.dromara.warm.flow.orm.mapper.FlowTaskMapper;
import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.common.ConditionalOnEnable;
import org.dromara.workflow.common.constant.FlowConstant; import org.dromara.workflow.common.constant.FlowConstant;
import org.dromara.workflow.common.enums.TaskAssigneeType; import org.dromara.workflow.common.enums.TaskAssigneeType;
import org.dromara.workflow.common.enums.TaskStatusEnum; import org.dromara.workflow.common.enums.TaskStatusEnum;
import org.dromara.workflow.domain.FlowInstanceBizExt;
import org.dromara.workflow.domain.bo.*; import org.dromara.workflow.domain.bo.*;
import org.dromara.workflow.domain.vo.FlowHisTaskVo; import org.dromara.workflow.domain.vo.FlowHisTaskVo;
import org.dromara.workflow.domain.vo.FlowTaskVo; import org.dromara.workflow.domain.vo.FlowTaskVo;
import org.dromara.workflow.domain.vo.NodeExtVo;
import org.dromara.workflow.mapper.FlwCategoryMapper; import org.dromara.workflow.mapper.FlwCategoryMapper;
import org.dromara.workflow.mapper.FlwInstanceBizExtMapper;
import org.dromara.workflow.mapper.FlwTaskMapper; import org.dromara.workflow.mapper.FlwTaskMapper;
import org.dromara.workflow.service.*; import org.dromara.workflow.service.IFlwCommonService;
import org.dromara.workflow.service.IFlwNodeExtService;
import org.dromara.workflow.service.IFlwTaskAssigneeService;
import org.dromara.workflow.service.IFlwTaskService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -83,7 +91,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
private final IFlwTaskAssigneeService flwTaskAssigneeService; private final IFlwTaskAssigneeService flwTaskAssigneeService;
private final IFlwCommonService flwCommonService; private final IFlwCommonService flwCommonService;
private final IFlwNodeExtService flwNodeExtService; private final IFlwNodeExtService flwNodeExtService;
private final IFlwInstanceBizExtService flowInstanceBizExtService; private final FlwInstanceBizExtMapper flwInstanceBizExtMapper;
/** /**
* 启动任务 * 启动任务
@ -97,6 +105,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
if (StringUtils.isBlank(businessId)) { if (StringUtils.isBlank(businessId)) {
throw new ServiceException("启动工作流时必须包含业务ID"); throw new ServiceException("启动工作流时必须包含业务ID");
} }
// 启动流程实例(提交申请) // 启动流程实例(提交申请)
Map<String, Object> variables = startProcessBo.getVariables(); Map<String, Object> variables = startProcessBo.getVariables();
// 流程发起人 // 流程发起人
@ -105,14 +114,14 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
variables.put(INITIATOR_DEPT_ID, LoginHelper.getDeptId()); variables.put(INITIATOR_DEPT_ID, LoginHelper.getDeptId());
// 业务id // 业务id
variables.put(BUSINESS_ID, businessId); variables.put(BUSINESS_ID, businessId);
FlowInstanceBizExt bizExt = startProcessBo.getBizExt();
// 获取已有流程实例
FlowInstance flowInstance = flowInstanceMapper.selectOne(new LambdaQueryWrapper<>(FlowInstance.class) FlowInstance flowInstance = flowInstanceMapper.selectOne(new LambdaQueryWrapper<>(FlowInstance.class)
.eq(FlowInstance::getBusinessId, businessId)); .eq(FlowInstance::getBusinessId, businessId));
FlowInstanceBizExtBo extBo = startProcessBo.getFlowInstanceBizExtBo();
if (ObjectUtil.isEmpty(extBo)) {
extBo = new FlowInstanceBizExtBo();
startProcessBo.setFlowInstanceBizExtBo(extBo);
}
if (ObjectUtil.isNotNull(flowInstance)) { if (ObjectUtil.isNotNull(flowInstance)) {
// 已存在流程
BusinessStatusEnum.checkStartStatus(flowInstance.getFlowStatus()); BusinessStatusEnum.checkStartStatus(flowInstance.getFlowStatus());
List<Task> taskList = taskService.list(new FlowTask().setInstanceId(flowInstance.getId())); List<Task> taskList = taskService.list(new FlowTask().setInstanceId(flowInstance.getId()));
taskService.mergeVariable(flowInstance, variables); taskService.mergeVariable(flowInstance, variables);
@ -121,24 +130,16 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
dto.setProcessInstanceId(taskList.get(0).getInstanceId()); dto.setProcessInstanceId(taskList.get(0).getInstanceId());
dto.setTaskId(taskList.get(0).getId()); dto.setTaskId(taskList.get(0).getId());
// 保存流程实例业务信息 // 保存流程实例业务信息
buildFlowInstanceBizExt(flowInstance, startProcessBo.getFlowInstanceBizExtBo()); this.buildFlowInstanceBizExt(flowInstance, bizExt);
return dto; return dto;
} }
String businessCode;
// 生成业务编号
if (StringUtils.isBlank(extBo.getBusinessCode())) {
//todo 按照自己业务自行修改
businessCode = System.currentTimeMillis()+ StrUtil.EMPTY;
extBo.setBusinessCode(businessCode);
} else {
businessCode = extBo.getBusinessCode();
}
// 将流程定义内的扩展参数设置到变量中 // 将流程定义内的扩展参数设置到变量中
Definition definition = FlowEngine.defService().getPublishByFlowCode(startProcessBo.getFlowCode()); Definition definition = FlowEngine.defService().getPublishByFlowCode(startProcessBo.getFlowCode());
Dict dict = JsonUtils.parseMap(definition.getExt()); Dict dict = JsonUtils.parseMap(definition.getExt());
boolean autoPass = !ObjectUtil.isNull(dict) && dict.getBool(FlowConstant.AUTO_PASS); boolean autoPass = !ObjectUtil.isNull(dict) && dict.getBool(FlowConstant.AUTO_PASS);
variables.put(FlowConstant.AUTO_PASS, autoPass); variables.put(FlowConstant.AUTO_PASS, autoPass);
variables.put(FlowConstant.BUSINESS_CODE, businessCode); variables.put(FlowConstant.BUSINESS_CODE, this.generateBusinessCode(bizExt));
FlowParams flowParams = FlowParams.build() FlowParams flowParams = FlowParams.build()
.handler(startProcessBo.getHandler()) .handler(startProcessBo.getHandler())
.flowCode(startProcessBo.getFlowCode()) .flowCode(startProcessBo.getFlowCode())
@ -151,7 +152,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
throw new ServiceException(e.getMessage()); throw new ServiceException(e.getMessage());
} }
// 保存流程实例业务信息 // 保存流程实例业务信息
buildFlowInstanceBizExt(instance, startProcessBo.getFlowInstanceBizExtBo()); this.buildFlowInstanceBizExt(instance, bizExt);
// 申请人执行流程 // 申请人执行流程
List<Task> taskList = taskService.list(new FlowTask().setInstanceId(instance.getId())); List<Task> taskList = taskService.list(new FlowTask().setInstanceId(instance.getId()));
if (taskList.size() > 1) { if (taskList.size() > 1) {
@ -163,17 +164,29 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
return dto; return dto;
} }
/**
* 生成业务编号,如果已有则直接返回已有值
*/
private String generateBusinessCode(FlowInstanceBizExt bizExt) {
if (StringUtils.isBlank(bizExt.getBusinessCode())) {
// TODO: 按照自己业务规则生成编号
String businessCode = Convert.toStr(System.currentTimeMillis());
bizExt.setBusinessCode(businessCode);
return businessCode;
}
return bizExt.getBusinessCode();
}
/** /**
* 构建流程实例业务信息 * 构建流程实例业务信息
* *
* @param instance 流程实例 * @param instance 流程实例
* @param flowInstanceBizExtBo 业务扩展信息 * @param bizExt 流程业务扩展信息
*/ */
private void buildFlowInstanceBizExt(Instance instance, FlowInstanceBizExtBo flowInstanceBizExtBo) { private void buildFlowInstanceBizExt(Instance instance, FlowInstanceBizExt bizExt) {
flowInstanceBizExtBo.setInstanceId(instance.getId()); bizExt.setInstanceId(instance.getId());
flowInstanceBizExtBo.setBusinessId(instance.getBusinessId()); bizExt.setBusinessId(instance.getBusinessId());
flowInstanceBizExtBo.setBusinessCode(flowInstanceBizExtBo.getBusinessCode()); flwInstanceBizExtMapper.saveOrUpdateByInstanceId(bizExt);
flowInstanceBizExtService.saveOrUpdate(flowInstanceBizExtBo);
} }
/** /**
@ -235,10 +248,10 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
/** /**
* 流程办理 * 流程办理
* *
* @param taskId 任务ID * @param taskId 任务ID
* @param flowParams 参数 * @param flowParams 参数
* @param instanceId 实例ID * @param instanceId 实例ID
* @param autoPass 自动审批 * @param autoPass 自动审批
*/ */
private void skipTask(Long taskId, FlowParams flowParams, Long instanceId, Boolean autoPass) { private void skipTask(Long taskId, FlowParams flowParams, Long instanceId, Boolean autoPass) {
// 执行任务跳转,并根据返回的处理人设置下一步处理人 // 执行任务跳转,并根据返回的处理人设置下一步处理人
@ -494,8 +507,8 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
/** /**
* 获取可驳回的前置节点 * 获取可驳回的前置节点
* *
* @param taskId 任务id * @param taskId 任务id
* @param nowNodeCode 当前节点 * @param nowNodeCode 当前节点
*/ */
@Override @Override
public List<Node> getBackTaskNode(Long taskId, String nowNodeCode) { public List<Node> getBackTaskNode(Long taskId, String nowNodeCode) {
@ -585,8 +598,22 @@ public class FlwTaskServiceImpl implements IFlwTaskService {
if (ObjectUtil.isNull(flowNode)) { if (ObjectUtil.isNull(flowNode)) {
throw new NullPointerException("当前【" + flowTaskVo.getNodeCode() + "】节点编码不存在"); throw new NullPointerException("当前【" + flowTaskVo.getNodeCode() + "】节点编码不存在");
} }
NodeExtVo nodeExtVo = flwNodeExtService.parseNodeExt(flowNode.getExt());
//设置按钮权限 //设置按钮权限
flowTaskVo.setButtonList(flwNodeExtService.buildButtonPermissionsFromExt(flowNode.getExt())); flowTaskVo.setButtonList(nodeExtVo.getButtonPermissions());
if (CollUtil.isNotEmpty(nodeExtVo.getCopySettings())) {
List<FlowCopyBo> list = StreamUtils.toList(nodeExtVo.getCopySettings(), x -> {
FlowCopyBo bo = new FlowCopyBo();
Long id = Convert.toLong(x);
bo.setUserId(id);
bo.setUserName(userService.selectUserNameById(id));
return bo;
});
flowTaskVo.setCopyList(list);
} else {
flowTaskVo.setCopyList(new ArrayList<>());
}
flowTaskVo.setVarList(nodeExtVo.getVariables());
flowTaskVo.setNodeRatio(flowNode.getNodeRatio()); flowTaskVo.setNodeRatio(flowNode.getNodeRatio());
flowTaskVo.setApplyNode(flowNode.getNodeCode().equals(flwCommonService.applyNodeCode(task.getDefinitionId()))); flowTaskVo.setApplyNode(flowNode.getNodeCode().equals(flwCommonService.applyNodeCode(task.getDefinitionId())));
return flowTaskVo; return flowTaskVo;