()
+ .select(SysPost::getPostId, SysPost::getPostName)
+ .in(SysPost::getPostId, postIds)
+ ).stream()
+ .collect(Collectors.toMap(SysPost::getPostId, SysPost::getPostName));
+ }
+
}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java
index 5d24b350..e844398e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java
@@ -7,6 +7,21 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * 自定义条件注解，用于基于配置启用或禁用特定功能
+ *
+ * 该注解只会在配置文件中 `warm-flow.enabled=true` 时，标注了此注解的类或方法才会被 Spring 容器加载
+ *
+ * 示例配置：
+ *
+ * warm-flow:
+ * enabled: true # 设置为 true 时，启用工作流功能
+ *
+ *
+ * 使用此注解时，可以动态控制工作流功能是否启用，而不需要修改代码逻辑
+ *
+ * @author Lion Li
+ */
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE, ElementType.METHOD })
@ConditionalOnProperty(value = "warm-flow.enabled", havingValue = "true")
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java
index 1b10eb8e..aaa640bf 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java
@@ -13,21 +13,11 @@ public interface FlowConstant {
*/
String INITIATOR = "initiator";
- /**
- * 流程实例id
- */
- String PROCESS_INSTANCE_ID = "processInstanceId";
-
/**
* 业务id
*/
String BUSINESS_ID = "businessId";
- /**
- * 任务id
- */
- String TASK_ID = "taskId";
-
/**
* 委托
*/
@@ -63,4 +53,29 @@ public interface FlowConstant {
*/
Long FLOW_CATEGORY_ID = 100L;
+ /**
+ * 是否为申请人提交常量
+ */
+ String SUBMIT = "submit";
+
+ /**
+ * 抄送常量
+ */
+ String FLOW_COPY_LIST = "flowCopyList";
+
+ /**
+ * 消息类型常量
+ */
+ String MESSAGE_TYPE = "messageType";
+
+ /**
+ * 消息通知常量
+ */
+ String MESSAGE_NOTICE = "messageNotice";
+
+ /**
+ * 任务状态
+ */
+ String WF_TASK_STATUS = "wf_task_status";
+
}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java
new file mode 100644
index 00000000..598cd05c
--- /dev/null
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java
@@ -0,0 +1,65 @@
+package org.dromara.workflow.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 按钮权限枚举
+ *
+ * @author AprilWind
+ */
+@Getter
+@AllArgsConstructor
+public enum ButtonPermissionEnum implements NodeExtEnum {
+
+ /**
+ * 是否弹窗选人
+ */
+ POP("是否弹窗选人", "pop", false),
+
+ /**
+ * 是否能委托
+ */
+ TRUST("是否能委托", "trust", false),
+
+ /**
+ * 是否能转办
+ */
+ TRANSFER("是否能转办", "transfer", false),
+
+ /**
+ * 是否能抄送
+ */
+ COPY("是否能抄送", "copy", false),
+
+ /**
+ * 是否显示退回
+ */
+ BACK("是否显示退回", "back", true),
+
+ /**
+ * 是否能加签
+ */
+ ADD_SIGN("是否能加签", "addSign", false),
+
+ /**
+ * 是否能减签
+ */
+ SUB_SIGN("是否能减签", "subSign", false),
+
+ /**
+ * 是否能终止
+ */
+ TERMINATION("是否能终止", "termination", true),
+
+ /**
+ * 是否能上传附件
+ */
+ FILE("是否能上传附件", "file", true);
+
+ private final String label;
+ private final String value;
+ private final boolean selected;
+
+}
+
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java
new file mode 100644
index 00000000..9926a8eb
--- /dev/null
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java
@@ -0,0 +1,32 @@
+package org.dromara.workflow.common.enums;
+
+/**
+ * 节点扩展属性枚举
+ *
+ * @author AprilWind
+ */
+public interface NodeExtEnum {
+
+ /**
+ * 选项label
+ *
+ * @return 选项label
+ */
+ String getLabel();
+
+ /**
+ * 选项值
+ *
+ * @return 选项值
+ */
+ String getValue();
+
+ /**
+ * 是否默认选中
+ *
+ * @return 是否默认选中
+ */
+ boolean isSelected();
+
+}
+
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java
index 37d414fc..3018b084 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java
@@ -14,6 +14,7 @@ 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.common.ConditionalOnEnable;
+import org.dromara.workflow.common.constant.FlowConstant;
import org.dromara.workflow.domain.bo.FlowCategoryBo;
import org.dromara.workflow.domain.vo.FlowCategoryVo;
import org.dromara.workflow.service.IFlwCategoryService;
@@ -110,6 +111,9 @@ public class FlwCategoryController extends BaseController {
@Log(title = "流程分类", businessType = BusinessType.DELETE)
@DeleteMapping("/{categoryId}")
public R remove(@PathVariable Long categoryId) {
+ if (FlowConstant.FLOW_CATEGORY_ID.equals(categoryId)) {
+ return R.warn("默认流程分类,不允许删除");
+ }
if (flwCategoryService.hasChildByCategoryId(categoryId)) {
return R.warn("存在下级流程分类,不允许删除");
}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
index ae99c16f..e7ea5e4c 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
@@ -127,9 +127,9 @@ public class FlwInstanceController extends BaseController {
*
* @param businessId 业务id
*/
- @GetMapping("/flowImage/{businessId}")
- public R> flowImage(@PathVariable String businessId) {
- return R.ok(flwInstanceService.flowImage(businessId));
+ @GetMapping("/flowHisTaskList/{businessId}")
+ public R> flowHisTaskList(@PathVariable String businessId) {
+ return R.ok(flwInstanceService.flowHisTaskList(businessId));
}
/**
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java
index 463916b1..5534b673 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java
@@ -12,6 +12,7 @@ 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.warm.flow.orm.entity.FlowNode;
import org.dromara.workflow.common.ConditionalOnEnable;
import org.dromara.workflow.domain.bo.*;
import org.dromara.workflow.domain.vo.FlowHisTaskVo;
@@ -127,6 +128,16 @@ public class FlwTaskController extends BaseController {
return R.ok(flwTaskService.selectById(taskId));
}
+ /**
+ * 获取下一节点信息
+ *
+ * @param bo 参数
+ */
+ @PostMapping("/getNextNodeList")
+ public R> getNextNodeList(@RequestBody FlowNextNodeBo bo) {
+ return R.ok(flwTaskService.getNextNodeList(bo));
+ }
+
/**
* 终止任务
*
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
index 86ac1ac3..28918f1d 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
@@ -1,5 +1,6 @@
package org.dromara.workflow.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -8,6 +9,8 @@ import lombok.EqualsAndHashCode;
import org.dromara.common.tenant.core.TenantEntity;
import java.io.Serial;
+import java.util.ArrayList;
+import java.util.List;
/**
* 流程分类对象 wf_category
@@ -55,4 +58,10 @@ public class FlowCategory extends TenantEntity {
@TableLogic
private String delFlag;
+ /**
+ * 子菜单
+ */
+ @TableField(exist = false)
+ private List children = new ArrayList<>();
+
}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java
index 3117a33f..a67a1f78 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java
@@ -1,6 +1,5 @@
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;
@@ -43,7 +42,6 @@ public class BackProcessBo implements Serializable {
/**
* 驳回的节点id(目前未使用，直接驳回到申请人)
*/
- @NotBlank(message = "驳回的节点不能为空", groups = AddGroup.class)
private String nodeCode;
/**
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java
index 9fdf4847..360fc3b8 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java
@@ -58,15 +58,20 @@ public class CompleteTaskBo implements Serializable {
*/
private Map variables;
+ /**
+ * 弹窗选择的办理人
+ */
+ private Map assigneeMap;
+
/**
* 扩展变量(此处为逗号分隔的ossId)
- * @return
*/
private String ext;
public Map getVariables() {
if (variables == null) {
- return new HashMap<>(16);
+ variables = new HashMap<>(16);
+ return variables;
}
variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
return variables;
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java
new file mode 100644
index 00000000..12f0653e
--- /dev/null
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java
@@ -0,0 +1,38 @@
+package org.dromara.workflow.domain.bo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 下一节点信息
+ *
+ * @author may
+ */
+@Data
+public class FlowNextNodeBo implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+ /**
+ * 任务id
+ */
+ private Long taskId;
+
+ /**
+ * 流程变量
+ */
+ 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/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java
index a1a4b596..395f71d9 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java
@@ -10,6 +10,7 @@ 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.TestLeave;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -40,6 +41,7 @@ public class TestLeaveBo extends BaseEntity {
* 开始时间
*/
@NotNull(message = "开始时间不能为空", groups = {AddGroup.class, EditGroup.class})
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@@ -47,6 +49,7 @@ public class TestLeaveBo extends BaseEntity {
* 结束时间
*/
@NotNull(message = "结束时间不能为空", groups = {AddGroup.class, EditGroup.class})
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermissionVo.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermissionVo.java
new file mode 100644
index 00000000..7175e5e0
--- /dev/null
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermissionVo.java
@@ -0,0 +1,43 @@
+package org.dromara.workflow.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 按钮权限
+ *
+ * @author may
+ * @date 2025-02-28
+ */
+@Data
+public class ButtonPermissionVo implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 唯一编码
+ */
+ private String code;
+
+ /**
+ * 选项值
+ */
+ private String value;
+
+ /**
+ * 是否显示
+ */
+ private Boolean show;
+
+ public ButtonPermissionVo() {
+ }
+
+ public ButtonPermissionVo(String code, Boolean show) {
+ this.code = code;
+ this.show = show;
+ }
+
+}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java
index c5d27855..37d1bc80 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java
@@ -4,13 +4,14 @@ 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.translation.annotation.Translation;
+import org.dromara.workflow.common.constant.FlowConstant;
import org.dromara.workflow.domain.FlowCategory;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
-
/**
* 流程分类视图对象 wf_category
*
@@ -32,13 +33,14 @@ public class FlowCategoryVo implements Serializable {
private Long categoryId;
/**
- * 父级id
+ * 父级分类id
*/
private Long parentId;
/**
- * 父类别名称
+ * 父级分类名称
*/
+ @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "parentId")
private String parentName;
/**
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java
index 3fb08d95..07a22c4f 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java
@@ -173,4 +173,15 @@ public class FlowTaskVo implements Serializable {
*/
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
private String createByName;
+
+ /**
+ * 是否为申请人节点
+ */
+ private Boolean applyNode;
+
+ /**
+ * 按钮权限
+ */
+ private List buttonList;
+
}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java
index 4b215ef6..c465271c 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java
@@ -1,11 +1,12 @@
package org.dromara.workflow.handler;
import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.event.ProcessTaskEvent;
import org.dromara.common.core.domain.event.ProcessDeleteEvent;
import org.dromara.common.core.domain.event.ProcessEvent;
-import org.dromara.common.core.domain.event.ProcessTaskEvent;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.warm.flow.core.entity.Instance;
import org.dromara.workflow.common.ConditionalOnEnable;
import org.springframework.stereotype.Component;
@@ -23,20 +24,25 @@ import java.util.Map;
public class FlowProcessEventHandler {
/**
- * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成等)
+ * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等)
*
* @param flowCode 流程定义编码
- * @param businessId 业务id
- * @param status 状态
+ * @param instance 实例数据
+ * @param status 流程状态
+ * @param params 办理参数
* @param submit 当为true时为申请人节点办理
*/
- public void processHandler(String flowCode, String businessId, String status, Map params, boolean submit) {
+ public void processHandler(String flowCode, Instance instance, String status, Map params, boolean submit) {
String tenantId = TenantHelper.getTenantId();
- log.info("发布流程事件，租户ID: {}, 流程状态: {}, 流程编码: {}, 业务ID: {}, 是否申请人节点办理: {}", tenantId, status, flowCode, businessId, submit);
+ log.info("【流程事件发布】租户ID: {}, 流程编码: {}, 业务ID: {}, 流程状态: {}, 节点类型: {}, 节点编码: {}, 节点名称: {}, 是否申请人节点: {}, 参数: {}",
+ tenantId, flowCode, instance.getBusinessId(), status, instance.getNodeType(), instance.getNodeCode(), instance.getNodeName(), submit, params);
ProcessEvent processEvent = new ProcessEvent();
processEvent.setTenantId(tenantId);
processEvent.setFlowCode(flowCode);
- processEvent.setBusinessId(businessId);
+ processEvent.setBusinessId(instance.getBusinessId());
+ processEvent.setNodeType(instance.getNodeType());
+ processEvent.setNodeCode(instance.getNodeCode());
+ processEvent.setNodeName(instance.getNodeName());
processEvent.setStatus(status);
processEvent.setParams(params);
processEvent.setSubmit(submit);
@@ -44,22 +50,25 @@ public class FlowProcessEventHandler {
}
/**
- * 执行办理任务监听
+ * 执行创建任务监听
*
* @param flowCode 流程定义编码
- * @param nodeCode 审批节点编码
+ * @param instance 实例数据
* @param taskId 任务id
- * @param businessId 业务id
*/
- public void processTaskHandler(String flowCode, String nodeCode, Long taskId, String businessId) {
+ public void processTaskHandler(String flowCode, Instance instance, Long taskId) {
String tenantId = TenantHelper.getTenantId();
- log.info("发布流程任务事件, 租户ID: {}, 流程编码: {}, 节点编码: {}, 任务ID: {}, 业务ID: {}", tenantId, flowCode, nodeCode, taskId, businessId);
+ log.info("【流程任务事件发布】租户ID: {}, 流程编码: {}, 业务ID: {}, 节点类型: {}, 节点编码: {}, 节点名称: {}, 任务ID: {}",
+ tenantId, flowCode, instance.getBusinessId(), instance.getNodeType(), instance.getNodeCode(), instance.getNodeName(), taskId);
ProcessTaskEvent processTaskEvent = new ProcessTaskEvent();
processTaskEvent.setTenantId(tenantId);
processTaskEvent.setFlowCode(flowCode);
- processTaskEvent.setNodeCode(nodeCode);
+ processTaskEvent.setBusinessId(instance.getBusinessId());
+ processTaskEvent.setNodeType(instance.getNodeType());
+ processTaskEvent.setNodeCode(instance.getNodeCode());
+ processTaskEvent.setNodeName(instance.getNodeName());
processTaskEvent.setTaskId(taskId);
- processTaskEvent.setBusinessId(businessId);
+ processTaskEvent.setStatus(instance.getFlowStatus());
SpringUtils.context().publishEvent(processTaskEvent);
}
@@ -71,7 +80,7 @@ public class FlowProcessEventHandler {
*/
public void processDeleteHandler(String flowCode, String businessId) {
String tenantId = TenantHelper.getTenantId();
- log.info("发布删除流程事件, 租户ID: {}, 流程编码: {}, 业务ID: {}", tenantId, flowCode, businessId);
+ log.info("【流程删除事件发布】租户ID: {}, 流程编码: {}, 业务ID: {}", tenantId, flowCode, businessId);
ProcessDeleteEvent processDeleteEvent = new ProcessDeleteEvent();
processDeleteEvent.setTenantId(tenantId);
processDeleteEvent.setFlowCode(flowCode);
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java
index c18e4ed5..f9ede15c 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java
@@ -1,22 +1,17 @@
package org.dromara.workflow.handler;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.collection.CollUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.workflow.common.ConditionalOnEnable;
-import org.dromara.workflow.common.enums.TaskAssigneeEnum;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.warm.flow.core.dto.FlowParams;
import org.dromara.warm.flow.core.handler.PermissionHandler;
-import org.dromara.warm.flow.core.service.impl.TaskServiceImpl;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.service.IFlwCommonService;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Collections;
import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
* 办理人权限处理器
@@ -29,35 +24,16 @@ import java.util.stream.Stream;
@Slf4j
public class WorkflowPermissionHandler implements PermissionHandler {
+ private final IFlwCommonService flwCommonService;
+
/**
- * 审批前获取当前办理人，办理时会校验的该权限集合
- * 后续在{@link TaskServiceImpl#checkAuth(Task, FlowParams)} 中调用
+ * 办理人权限标识，比如用户，角色，部门等，用于校验是否有权限办理任务
+ * 后续在{@link FlowParams#getPermissionFlag} 中获取
* 返回当前用户权限集合
*/
@Override
public List permissions() {
- LoginUser loginUser = LoginHelper.getLoginUser();
- if (ObjectUtil.isNull(loginUser)) {
- return new ArrayList<>();
- }
- // 使用一个流来构建权限列表
- return Stream.of(
- // 角色权限前缀
- loginUser.getRoles().stream()
- .map(role -> TaskAssigneeEnum.ROLE.getCode() + role.getRoleId()),
-
- // 岗位权限前缀
- Stream.ofNullable(loginUser.getPosts())
- .flatMap(Collection::stream)
- .map(post -> TaskAssigneeEnum.POST.getCode() + post.getPostId()),
-
- // 用户和部门权限
- Stream.of(String.valueOf(loginUser.getUserId()),
- TaskAssigneeEnum.DEPT.getCode() + loginUser.getDeptId()
- )
- )
- .flatMap(stream -> stream)
- .collect(Collectors.toList());
+ return Collections.singletonList(LoginHelper.getUserIdStr());
}
/**
@@ -70,4 +46,14 @@ public class WorkflowPermissionHandler implements PermissionHandler {
return LoginHelper.getUserIdStr();
}
+ /**
+ * 转换办理人，比如设计器中预设了能办理的人，如果其中包含角色或者部门id等，可以通过此接口进行转换成用户id
+ */
+ @Override
+ public List convertPermissions(List permissions) {
+ if (CollUtil.isNotEmpty(permissions)) {
+ permissions = flwCommonService.buildUser(permissions);
+ }
+ return permissions;
+ }
}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
index b1878548..c1ef2622 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
@@ -1,20 +1,28 @@
package org.dromara.workflow.listener;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.common.core.utils.StringUtils;
+import org.dromara.warm.flow.core.FlowEngine;
import org.dromara.warm.flow.core.dto.FlowParams;
import org.dromara.warm.flow.core.entity.Definition;
import org.dromara.warm.flow.core.entity.Instance;
import org.dromara.warm.flow.core.entity.Task;
import org.dromara.warm.flow.core.listener.GlobalListener;
import org.dromara.warm.flow.core.listener.ListenerVariable;
+import org.dromara.warm.flow.core.service.InsService;
+import org.dromara.warm.flow.orm.entity.FlowInstance;
import org.dromara.warm.flow.orm.entity.FlowTask;
import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.constant.FlowConstant;
+import org.dromara.workflow.common.enums.TaskStatusEnum;
+import org.dromara.workflow.domain.bo.FlowCopyBo;
import org.dromara.workflow.handler.FlowProcessEventHandler;
+import org.dromara.workflow.service.IFlwCommonService;
import org.dromara.workflow.service.IFlwInstanceService;
import org.dromara.workflow.service.IFlwTaskService;
import org.springframework.stereotype.Component;
@@ -34,9 +42,11 @@ import java.util.Map;
@RequiredArgsConstructor
public class WorkflowGlobalListener implements GlobalListener {
- private final IFlwTaskService taskService;
+ private final IFlwTaskService flwTaskService;
private final IFlwInstanceService instanceService;
private final FlowProcessEventHandler flowProcessEventHandler;
+ private final IFlwCommonService flwCommonService;
+ private final InsService insService;
/**
* 创建监听器，任务创建时执行
@@ -45,15 +55,7 @@ public class WorkflowGlobalListener implements GlobalListener {
*/
@Override
public void create(ListenerVariable listenerVariable) {
- Instance instance = listenerVariable.getInstance();
- Definition definition = listenerVariable.getDefinition();
- String businessId = instance.getBusinessId();
- String flowStatus = instance.getFlowStatus();
- Task task = listenerVariable.getTask();
- if (task != null && BusinessStatusEnum.WAITING.getStatus().equals(flowStatus)) {
- // 判断流程状态（发布审批中事件）
- flowProcessEventHandler.processTaskHandler(definition.getFlowCode(), task.getNodeCode(), task.getId(), businessId);
- }
+
}
/**
@@ -72,6 +74,25 @@ public class WorkflowGlobalListener implements GlobalListener {
*/
@Override
public void assignment(ListenerVariable listenerVariable) {
+ Map variable = listenerVariable.getVariable();
+ List nextTasks = listenerVariable.getNextTasks();
+ FlowParams flowParams = listenerVariable.getFlowParams();
+ Definition definition = listenerVariable.getDefinition();
+ Instance instance = listenerVariable.getInstance();
+ String applyNodeCode = flwCommonService.applyNodeCode(definition.getId());
+ for (Task flowTask : nextTasks) {
+ // 如果办理或者退回并行存在需要指定办理人，则直接覆盖办理人
+ if (variable.containsKey(flowTask.getNodeCode()) && (TaskStatusEnum.PASS.getStatus().equals(flowParams.getHisStatus())
+ || TaskStatusEnum.BACK.getStatus().equals(flowParams.getHisStatus()))) {
+ String userIds = variable.get(flowTask.getNodeCode()).toString();
+ flowTask.setPermissionList(List.of(userIds.split(StringUtils.SEPARATOR)));
+ variable.remove(flowTask.getNodeCode());
+ }
+ // 如果是申请节点，则把启动人添加到办理人
+ if (flowTask.getNodeCode().equals(applyNodeCode)) {
+ flowTask.setPermissionList(List.of(instance.getCreateBy()));
+ }
+ }
}
/**
@@ -83,10 +104,10 @@ public class WorkflowGlobalListener implements GlobalListener {
public void finish(ListenerVariable listenerVariable) {
Instance instance = listenerVariable.getInstance();
Definition definition = listenerVariable.getDefinition();
- String businessId = instance.getBusinessId();
- String flowStatus = instance.getFlowStatus();
+ Task task = listenerVariable.getTask();
Map params = new HashMap<>();
FlowParams flowParams = listenerVariable.getFlowParams();
+ Map variable = new HashMap<>();
if (ObjectUtil.isNotNull(flowParams)) {
// 历史任务扩展(通常为附件)
params.put("hisTaskExt", flowParams.getHisTaskExt());
@@ -94,28 +115,70 @@ public class WorkflowGlobalListener implements GlobalListener {
params.put("handler", flowParams.getHandler());
// 办理意见
params.put("message", flowParams.getMessage());
+ variable = flowParams.getVariable();
}
- // 判断流程状态（发布：撤销，退回，作废，终止，已完成事件）
- String status = determineFlowStatus(instance, flowStatus);
- if (StringUtils.isNotBlank(status)) {
- flowProcessEventHandler.processHandler(definition.getFlowCode(), businessId, status, params, false);
+ //申请人提交事件
+ Boolean submit = MapUtil.getBool(variable, FlowConstant.SUBMIT);
+ if (submit != null && submit) {
+ flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, instance.getFlowStatus(), variable, true);
+ } else {
+ // 判断流程状态（发布：撤销，退回，作废，终止，已完成事件）
+ String status = determineFlowStatus(instance);
+ if (StringUtils.isNotBlank(status)) {
+ flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, status, params, false);
+ }
+ }
+ //发布任务事件
+ if (task != null) {
+ flowProcessEventHandler.processTaskHandler(definition.getFlowCode(), instance, task.getId());
+ }
+ if (ObjectUtil.isNull(flowParams)) {
+ return;
+ }
+ // 只有办理或者退回的时候才执行消息通知和抄送
+ if (TaskStatusEnum.PASS.getStatus().equals(flowParams.getHisStatus())
+ || TaskStatusEnum.BACK.getStatus().equals(flowParams.getHisStatus())) {
+ if (variable != null) {
+ if (variable.containsKey(FlowConstant.FLOW_COPY_LIST)) {
+ List flowCopyList = (List) variable.get(FlowConstant.FLOW_COPY_LIST);
+ // 添加抄送人
+ flwTaskService.setCopy(task, flowCopyList);
+ }
+ if (variable.containsKey(FlowConstant.MESSAGE_TYPE)) {
+ List messageType = (List) variable.get(FlowConstant.MESSAGE_TYPE);
+ String notice = (String) variable.get(FlowConstant.MESSAGE_NOTICE);
+ // 消息通知
+ if (CollUtil.isNotEmpty(messageType)) {
+ flwCommonService.sendMessage(definition.getFlowName(), instance.getId(), messageType, notice);
+ }
+ }
+ FlowInstance ins = new FlowInstance();
+ Map variableMap = instance.getVariableMap();
+ variableMap.remove(FlowConstant.FLOW_COPY_LIST);
+ variableMap.remove(FlowConstant.MESSAGE_TYPE);
+ variableMap.remove(FlowConstant.MESSAGE_NOTICE);
+ variableMap.remove(FlowConstant.SUBMIT);
+ ins.setId(instance.getId());
+ ins.setVariable(FlowEngine.jsonConvert.objToStr(variableMap));
+ insService.updateById(ins);
+ }
}
}
/**
- * 根据流程实例和当前流程状态确定最终状态
+ * 根据流程实例确定最终状态
*
- * @param instance 流程实例
- * @param flowStatus 流程实例当前状态
+ * @param instance 流程实例
* @return 流程最终状态
*/
- private String determineFlowStatus(Instance instance, String flowStatus) {
+ private String determineFlowStatus(Instance instance) {
+ String flowStatus = instance.getFlowStatus();
if (StringUtils.isNotBlank(flowStatus) && BusinessStatusEnum.initialState(flowStatus)) {
log.info("流程实例当前状态: {}", flowStatus);
return flowStatus;
} else {
Long instanceId = instance.getId();
- List flowTasks = taskService.selectByInstId(instanceId);
+ List flowTasks = flwTaskService.selectByInstId(instanceId);
if (CollUtil.isEmpty(flowTasks)) {
String status = BusinessStatusEnum.FINISH.getStatus();
// 更新流程状态为已完成
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java
index d2c0b3a4..4a59f258 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java
@@ -29,7 +29,9 @@ public interface FlwCategoryMapper extends BaseMapperPlus().eq(FlowCategory::getCategoryId, categoryId));
+ }
/**
* 根据父流程分类ID查询其所有子流程分类的列表
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java
new file mode 100644
index 00000000..662d599e
--- /dev/null
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java
@@ -0,0 +1,37 @@
+package org.dromara.workflow.service;
+
+import java.util.List;
+
+/**
+ * 通用 工作流服务
+ *
+ * @author LionLi
+ */
+public interface IFlwCommonService {
+
+ /**
+ * 构建工作流用户
+ *
+ * @param permissionList 办理用户
+ * @return 用户
+ */
+ List buildUser(List permissionList);
+
+ /**
+ * 发送消息
+ *
+ * @param flowName 流程定义名称
+ * @param instId 实例id
+ * @param messageType 消息类型
+ * @param message 消息内容，为空则发送默认配置的消息内容
+ */
+ void sendMessage(String flowName, Long instId, List messageType, String message);
+
+ /**
+ * 申请人节点编码
+ *
+ * @param definitionId 流程定义id
+ * @return 申请人节点编码
+ */
+ String applyNodeCode(Long definitionId);
+}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java
index 1a2d29f7..54743b72 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java
@@ -35,7 +35,6 @@ public interface IFlwDefinitionService {
*/
TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery);
-
/**
* 发布流程定义
*
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java
index 99729c2a..01e5124b 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java
@@ -107,7 +107,7 @@ public interface IFlwInstanceService {
* @param businessId 业务id
* @return 结果
*/
- Map flowImage(String businessId);
+ Map flowHisTaskList(String businessId);
/**
* 按照实例id更新状态
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwNodeExtService.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwNodeExtService.java
new file mode 100644
index 00000000..95951653
--- /dev/null
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwNodeExtService.java
@@ -0,0 +1,22 @@
+package org.dromara.workflow.service;
+
+import org.dromara.workflow.domain.vo.ButtonPermissionVo;
+
+import java.util.List;
+
+/**
+ * 流程节点扩展属性 服务层
+ *
+ * @author AprilWind
+ */
+public interface IFlwNodeExtService {
+
+ /**
+ * 从扩展属性构建按钮权限列表：根据 ext 中记录的权限值，标记每个按钮是否勾选
+ *
+ * @param ext 扩展属性 JSON 字符串
+ * @return 按钮权限 VO 列表
+ */
+ List buildButtonPermissionsFromExt(String ext);
+
+}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java
index 116cb74f..830abaf5 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java
@@ -12,11 +12,13 @@ import java.util.List;
public interface IFlwTaskAssigneeService {
/**
- * 根据存储标识符（storageId）解析分配类型和ID，并获取对应的用户列表
+ * 批量解析多个存储标识符（storageIds），按类型分类并合并查询用户列表
+ * 输入格式支持多个以逗号分隔的标识（如 "user:123,role:456,789"）
+ * 会自动去重返回结果，非法格式的标识将被忽略
*
- * @param storageId 包含分配类型和ID的字符串（例如 "user:123" 或 "role:456"）
- * @return 与分配类型和ID匹配的用户列表，如果格式无效则返回空列表
+ * @param storageIds 多个存储标识符字符串（逗号分隔）
+ * @return 合并后的用户列表，去重后返回，非法格式的标识将被跳过
*/
- List fetchUsersByStorageId(String storageId);
+ List fetchUsersByStorageIds(String storageIds);
}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java
index 11034e75..e172c001 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java
@@ -5,7 +5,9 @@ import org.dromara.common.core.domain.dto.UserDTO;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.warm.flow.core.entity.Node;
+import org.dromara.warm.flow.core.entity.Task;
import org.dromara.warm.flow.orm.entity.FlowHisTask;
+import org.dromara.warm.flow.orm.entity.FlowNode;
import org.dromara.warm.flow.orm.entity.FlowTask;
import org.dromara.workflow.domain.bo.*;
import org.dromara.workflow.domain.vo.FlowHisTaskVo;
@@ -37,6 +39,14 @@ public interface IFlwTaskService {
*/
boolean completeTask(CompleteTaskBo completeTaskBo);
+ /**
+ * 添加抄送人
+ *
+ * @param task 任务信息
+ * @param flowCopyList 抄送人
+ */
+ void setCopy(Task task, List flowCopyList);
+
/**
* 查询当前用户的待办任务
*
@@ -132,6 +142,14 @@ public interface IFlwTaskService {
*/
FlowTaskVo selectById(Long taskId);
+ /**
+ * 获取下一节点信息
+ *
+ * @param bo 参数
+ * @return 结果
+ */
+ List getNextNodeList(FlowNextNodeBo bo);
+
/**
* 按照任务id查询任务
*
@@ -188,4 +206,13 @@ public interface IFlwTaskService {
* @return 结果
*/
List currentTaskAllUser(Long taskId);
+
+ /**
+ * 按照节点编码查询节点
+ *
+ * @param nodeCode 节点编码
+ * @param definitionId 流程定义id
+ * @return 节点
+ */
+ FlowNode getByNodeCode(String nodeCode, Long definitionId);
}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java
index 8c73b59e..883a967a 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java
@@ -26,12 +26,6 @@ public class CategoryNameTranslationImpl implements TranslationInterface
@Override
public String translation(Object key, String other) {
- Long id = null;
- if (key instanceof String categoryId) {
- id = Convert.toLong(categoryId);
- } else if (key instanceof Long categoryId) {
- id = categoryId;
- }
- return flwCategoryService.selectCategoryNameById(id);
+ return flwCategoryService.selectCategoryNameById(Convert.toLong(key));
}
}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java
index db1b7b7f..d42a48a2 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java
@@ -8,7 +8,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.utils.*;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.ObjectUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.TreeBuildUtils;
import org.dromara.common.mybatis.helper.DataBaseHelper;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.warm.flow.core.service.DefService;
@@ -48,14 +51,7 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService {
*/
@Override
public FlowCategoryVo queryById(Long categoryId) {
- FlowCategoryVo category = baseMapper.selectVoById(categoryId);
- if (ObjectUtil.isNull(category)) {
- return null;
- }
- FlowCategoryVo parentCategory = baseMapper.selectVoOne(new LambdaQueryWrapper()
- .select(FlowCategory::getCategoryName).eq(FlowCategory::getCategoryId, category.getParentId()));
- category.setParentName(ObjectUtils.notNullGetter(parentCategory, FlowCategoryVo::getCategoryName));
- return category;
+ return baseMapper.selectVoById(categoryId);
}
/**
@@ -95,27 +91,20 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService {
*/
@Override
public List> selectCategoryTreeList(FlowCategoryBo category) {
- LambdaQueryWrapper lqw = buildQueryWrapper(category);
- List categorys = baseMapper.selectVoList(lqw);
- if (CollUtil.isEmpty(categorys)) {
+ List categoryList = this.queryList(category);
+ if (CollUtil.isEmpty(categoryList)) {
return CollUtil.newArrayList();
}
- // 获取当前列表中每一个节点的parentId，然后在列表中查找是否有id与其parentId对应，若无对应，则表明此时节点列表中，该节点在当前列表中属于顶级节点
- List> treeList = CollUtil.newArrayList();
- for (FlowCategoryVo d : categorys) {
- String parentId = d.getParentId().toString();
- FlowCategoryVo categoryVo = StreamUtils.findFirst(categorys, it -> it.getCategoryId().toString().equals(parentId));
- if (ObjectUtil.isNull(categoryVo)) {
- List> trees = TreeBuildUtils.build(categorys, parentId, (dept, tree) ->
- tree.setId(dept.getCategoryId().toString())
- .setParentId(dept.getParentId().toString())
- .setName(dept.getCategoryName())
- .setWeight(dept.getOrderNum()));
- Tree tree = StreamUtils.findFirst(trees, it -> it.getId().equals(d.getCategoryId().toString()));
- treeList.add(tree);
- }
- }
- return treeList;
+ return TreeBuildUtils.buildMultiRoot(
+ categoryList,
+ node -> String.valueOf(node.getCategoryId()),
+ node -> String.valueOf(node.getParentId()),
+ (node, treeNode) -> treeNode
+ .setId(String.valueOf(node.getCategoryId()))
+ .setParentId(String.valueOf(node.getParentId()))
+ .setName(node.getCategoryName())
+ .setWeight(node.getOrderNum())
+ );
}
/**
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java
new file mode 100644
index 00000000..d7c6f77e
--- /dev/null
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java
@@ -0,0 +1,247 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.core.service.DeptService;
+import org.dromara.common.core.service.DictService;
+import org.dromara.common.core.service.UserService;
+import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.warm.flow.core.dto.DefJson;
+import org.dromara.warm.flow.core.dto.NodeJson;
+import org.dromara.warm.flow.core.dto.PromptContent;
+import org.dromara.warm.flow.core.enums.NodeType;
+import org.dromara.warm.flow.core.utils.MapUtil;
+import org.dromara.warm.flow.orm.entity.FlowHisTask;
+import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper;
+import org.dromara.warm.flow.ui.service.ChartExtService;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.constant.FlowConstant;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 流程图提示信息
+ *
+ * @author AprilWind
+ */
+@ConditionalOnEnable
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class FlwChartExtServiceImpl implements ChartExtService {
+
+ private final UserService userService;
+ private final DeptService deptService;
+ private final FlowHisTaskMapper flowHisTaskMapper;
+ private final DictService dictService;
+
+ /**
+ * 设置流程图提示信息
+ *
+ * @param defJson 流程定义json对象
+ */
+ @Override
+ public void execute(DefJson defJson) {
+ // 临时修复 后续版本将通过defjson获取流程实例ID
+ String[] parts = ServletUtils.getRequest().getRequestURI().split("/");
+ Long instanceId = Convert.toLong(parts[parts.length - 1]);
+
+ // 根据流程实例ID查询所有相关的历史任务列表
+ List flowHisTasks = this.getHisTaskGroupedByNode(instanceId);
+ if (CollUtil.isEmpty(flowHisTasks)) {
+ return;
+ }
+
+ // 按节点编号（nodeCode）对历史任务进行分组
+ Map> groupedByNode = StreamUtils.groupByKey(flowHisTasks, FlowHisTask::getNodeCode);
+
+ // 批量查询所有审批人的用户信息
+ List userDTOList = userService.selectListByIds(StreamUtils.toList(flowHisTasks, e -> Convert.toLong(e.getApprover())));
+
+ // 将查询到的用户列表转换为以用户ID为key的映射
+ Map userMap = StreamUtils.toIdentityMap(userDTOList, UserDTO::getUserId);
+
+ Map dictType = dictService.getAllDictByDictType(FlowConstant.WF_TASK_STATUS);
+
+ // 遍历流程定义中的每个节点，调用处理方法，将对应节点的任务列表及用户信息传入，生成扩展提示内容
+ for (NodeJson nodeJson : defJson.getNodeList()) {
+ // 获取当前节点对应的历史任务列表，如果没有则返回空列表避免空指针
+ List taskList = groupedByNode.get(nodeJson.getNodeCode());
+ if (CollUtil.isEmpty(taskList)) {
+ continue;
+ }
+ // 处理当前节点的扩展信息，包括构建审批人提示内容等
+ this.processNodeExtInfo(nodeJson, taskList, userMap, dictType);
+ }
+ }
+
+ /**
+ * 初始化流程图提示信息
+ *
+ * @param defJson 流程定义json对象
+ */
+ @Override
+ public void initPromptContent(DefJson defJson) {
+ defJson.setTopText("流程名称: " + defJson.getFlowName());
+ defJson.getNodeList().forEach(nodeJson -> {
+ nodeJson.setPromptContent(
+ new PromptContent()
+ // 提示信息
+ .setInfo(
+ CollUtil.newArrayList(
+ new PromptContent.InfoItem()
+ .setPrefix("任务名称: ")
+ .setContent(nodeJson.getNodeName())
+ .setContentStyle(Map.of(
+ "border", "1px solid #d1e9ff",
+ "backgroundColor", "#e8f4ff",
+ "padding", "4px 8px",
+ "borderRadius", "4px"
+ ))
+ .setRowStyle(Map.of(
+ "fontWeight", "bold",
+ "margin", "0 0 6px 0",
+ "padding", "0 0 8px 0",
+ "borderBottom", "1px solid #ccc"
+ ))
+ )
+ )
+ // 弹窗样式
+ .setDialogStyle(MapUtil.mergeAll(
+ "position", "absolute",
+ "backgroundColor", "#fff",
+ "border", "1px solid #ccc",
+ "borderRadius", "4px",
+ "boxShadow", "0 2px 8px rgba(0, 0, 0, 0.15)",
+ "padding", "8px 12px",
+ "fontSize", "14px",
+ "zIndex", "1000",
+ "maxWidth", "500px",
+ "overflowY", "visible",
+ "overflowX", "hidden",
+ "color", "#333",
+ "pointerEvents", "auto",
+ "scrollbarWidth", "thin"
+ ))
+ );
+ });
+ }
+
+ /**
+ * 处理节点的扩展信息，构建用于流程图悬浮提示的内容
+ *
+ * @param nodeJson 当前节点对象
+ * @param taskList 当前节点对应的历史审批任务列表
+ */
+ private void processNodeExtInfo(NodeJson nodeJson, List taskList, Map userMap, Map dictType) {
+
+ // 获取节点提示内容对象中的 info 列表，用于追加提示项
+ List info = nodeJson.getPromptContent().getInfo();
+
+ // 遍历所有任务记录，构建提示内容
+ for (FlowHisTask task : taskList) {
+ UserDTO userDTO = userMap.get(Convert.toLong(task.getApprover()));
+ if (ObjectUtil.isEmpty(userDTO)) {
+ continue;
+ }
+
+ // 查询用户所属部门名称
+ String deptName = deptService.selectDeptNameByIds(Convert.toStr(userDTO.getDeptId()));
+
+ // 添加标题项，如：👤 张三（市场部）
+ info.add(new PromptContent.InfoItem()
+ .setPrefix(StringUtils.format("👥 {}（{}）", userDTO.getNickName(), deptName))
+ .setPrefixStyle(Map.of(
+ "fontWeight", "bold",
+ "fontSize", "15px",
+ "color", "#333"
+ ))
+ .setRowStyle(Map.of(
+ "margin", "8px 0",
+ "borderBottom", "1px dashed #ccc"
+ ))
+ );
+
+ // 添加具体信息项：账号、耗时、时间
+ info.add(buildInfoItem("用户账号", userDTO.getUserName()));
+ info.add(buildInfoItem("审批状态", dictType.get(task.getFlowStatus())));
+ info.add(buildInfoItem("审批耗时", DateUtils.getTimeDifference(task.getUpdateTime(), task.getCreateTime())));
+ info.add(buildInfoItem("办理时间", DateUtils.formatDateTime(task.getUpdateTime())));
+ }
+ }
+
+ /**
+ * 构建单条提示内容对象 InfoItem，用于悬浮窗显示（key: value）
+ *
+ * @param key 字段名（作为前缀）
+ * @param value 字段值
+ * @return 提示项对象
+ */
+ private PromptContent.InfoItem buildInfoItem(String key, String value) {
+ return new PromptContent.InfoItem()
+ // 前缀
+ .setPrefix(key + ": ")
+ // 前缀样式
+ .setPrefixStyle(Map.of(
+ "textAlign", "right",
+ "color", "#444",
+ "userSelect", "none",
+ "display", "inline-block",
+ "width", "100px",
+ "paddingRight", "8px",
+ "fontWeight", "500",
+ "fontSize", "14px",
+ "lineHeight", "24px",
+ "verticalAlign", "middle"
+ ))
+ // 内容
+ .setContent(value)
+ // 内容样式
+ .setContentStyle(Map.of(
+ "backgroundColor", "#f7faff",
+ "color", "#005cbf",
+ "padding", "4px 8px",
+ "fontSize", "14px",
+ "borderRadius", "4px",
+ "whiteSpace", "normal",
+ "border", "1px solid #d0e5ff",
+ "userSelect", "text",
+ "lineHeight", "20px"
+ ))
+ // 行样式
+ .setRowStyle(Map.of(
+ "color", "#222",
+ "alignItems", "center",
+ "display", "flex",
+ "marginBottom", "6px",
+ "fontWeight", "400",
+ "fontSize", "14px"
+ ));
+ }
+
+ /**
+ * 根据流程实例ID获取历史任务列表
+ *
+ * @param instanceId 流程实例ID
+ * @return 历史任务列表
+ */
+ public List getHisTaskGroupedByNode(Long instanceId) {
+ LambdaQueryWrapper wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(FlowHisTask::getInstanceId, instanceId)
+ .eq(FlowHisTask::getNodeType, NodeType.BETWEEN.getKey())
+ .orderByDesc(FlowHisTask::getCreateTime, FlowHisTask::getUpdateTime);
+ return flowHisTaskMapper.selectList(wrapper);
+ }
+
+}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java
new file mode 100644
index 00000000..e6dc8155
--- /dev/null
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java
@@ -0,0 +1,122 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mail.utils.MailUtils;
+import org.dromara.common.sse.dto.SseMessageDto;
+import org.dromara.common.sse.utils.SseMessageUtils;
+import org.dromara.warm.flow.core.entity.Node;
+import org.dromara.warm.flow.core.entity.Task;
+import org.dromara.warm.flow.core.enums.SkipType;
+import org.dromara.warm.flow.core.service.NodeService;
+import org.dromara.warm.flow.orm.entity.FlowTask;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.enums.MessageTypeEnum;
+import org.dromara.workflow.service.IFlwCommonService;
+import org.dromara.workflow.service.IFlwTaskAssigneeService;
+import org.dromara.workflow.service.IFlwTaskService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * 工作流工具
+ *
+ * @author LionLi
+ */
+@ConditionalOnEnable
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class FlwCommonServiceImpl implements IFlwCommonService {
+ private final NodeService nodeService;
+
+ /**
+ * 构建工作流用户
+ *
+ * @param permissionList 办理用户
+ * @return 用户
+ */
+ @Override
+ public List buildUser(List permissionList) {
+ if (CollUtil.isEmpty(permissionList)) {
+ return List.of();
+ }
+ IFlwTaskAssigneeService taskAssigneeService = SpringUtils.getBean(IFlwTaskAssigneeService.class);
+ String processedBys = CollUtil.join(permissionList, StringUtils.SEPARATOR);
+ // 根据 processedBy 前缀判断处理人类型，分别获取用户列表
+ List users = taskAssigneeService.fetchUsersByStorageIds(processedBys);
+
+ return StreamUtils.toList(users, userDTO -> String.valueOf(userDTO.getUserId()));
+ }
+
+
+ /**
+ * 发送消息
+ *
+ * @param flowName 流程定义名称
+ * @param messageType 消息类型
+ * @param message 消息内容，为空则发送默认配置的消息内容
+ */
+ @Override
+ public void sendMessage(String flowName, Long instId, List messageType, String message) {
+ IFlwTaskService flwTaskService = SpringUtils.getBean(IFlwTaskService.class);
+ List userList = new ArrayList<>();
+ List list = flwTaskService.selectByInstId(instId);
+ if (StringUtils.isBlank(message)) {
+ message = "有新的【" + flowName + "】单据已经提交至您，请您及时处理。";
+ }
+ for (Task task : list) {
+ List users = flwTaskService.currentTaskAllUser(task.getId());
+ if (CollUtil.isNotEmpty(users)) {
+ userList.addAll(users);
+ }
+ }
+ if (CollUtil.isNotEmpty(userList)) {
+ for (String code : messageType) {
+ MessageTypeEnum messageTypeEnum = MessageTypeEnum.getByCode(code);
+ if (ObjectUtil.isNotEmpty(messageTypeEnum)) {
+ switch (messageTypeEnum) {
+ case SYSTEM_MESSAGE:
+ SseMessageDto dto = new SseMessageDto();
+ dto.setUserIds(StreamUtils.toList(userList, UserDTO::getUserId).stream().distinct().collect(Collectors.toList()));
+ dto.setMessage(message);
+ SseMessageUtils.publishMessage(dto);
+ break;
+ case EMAIL_MESSAGE:
+ MailUtils.sendText(StreamUtils.join(userList, UserDTO::getEmail), "单据审批提醒", message);
+ break;
+ case SMS_MESSAGE:
+ //todo 短信发送
+ break;
+ default:
+ throw new IllegalStateException("Unexpected value: " + messageTypeEnum);
+ }
+ }
+ }
+ }
+ }
+
+
+ /**
+ * 申请人节点编码
+ *
+ * @param definitionId 流程定义id
+ * @return 申请人节点编码
+ */
+ @Override
+ public String applyNodeCode(Long definitionId) {
+ Node startNode = nodeService.getStartNode(definitionId);
+ Node nextNode = nodeService.getNextNode(definitionId, startNode.getNodeCode(), null, SkipType.PASS.getKey());
+ return nextNode.getNodeCode();
+ }
+}
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
index 591339b3..e595f46e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
@@ -33,8 +33,8 @@ import org.dromara.workflow.common.constant.FlowConstant;
import org.dromara.workflow.domain.FlowCategory;
import org.dromara.workflow.domain.vo.FlowDefinitionVo;
import org.dromara.workflow.mapper.FlwCategoryMapper;
+import org.dromara.workflow.service.IFlwCommonService;
import org.dromara.workflow.service.IFlwDefinitionService;
-import org.dromara.workflow.utils.WorkflowUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -64,6 +64,7 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
private final FlowNodeMapper flowNodeMapper;
private final FlowSkipMapper flowSkipMapper;
private final FlwCategoryMapper flwCategoryMapper;
+ private final IFlwCommonService flwCommonService;
/**
* 查询流程定义列表
@@ -77,10 +78,8 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
LambdaQueryWrapper wrapper = buildQueryWrapper(flowDefinition);
wrapper.eq(FlowDefinition::getIsPublish, PublishStatus.PUBLISHED.getKey());
Page page = flowDefinitionMapper.selectPage(pageQuery.build(), wrapper);
- TableDataInfo build = TableDataInfo.build();
- build.setRows(BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class));
- build.setTotal(page.getTotal());
- return build;
+ List list = BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class);
+ return new TableDataInfo<>(list, page.getTotal());
}
/**
@@ -95,10 +94,8 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
LambdaQueryWrapper wrapper = buildQueryWrapper(flowDefinition);
wrapper.in(FlowDefinition::getIsPublish, Arrays.asList(PublishStatus.UNPUBLISHED.getKey(), PublishStatus.EXPIRED.getKey()));
Page page = flowDefinitionMapper.selectPage(pageQuery.build(), wrapper);
- TableDataInfo build = TableDataInfo.build();
- build.setRows(BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class));
- build.setTotal(page.getTotal());
- return build;
+ List list = BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class);
+ return new TableDataInfo<>(list, page.getTotal());
}
private LambdaQueryWrapper buildQueryWrapper(FlowDefinition flowDefinition) {
@@ -125,7 +122,7 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
List errorMsg = new ArrayList<>();
if (CollUtil.isNotEmpty(flowNodes)) {
for (FlowNode flowNode : flowNodes) {
- String applyNodeCode = WorkflowUtils.applyNodeCode(id);
+ String applyNodeCode = flwCommonService.applyNodeCode(id);
if (StringUtils.isBlank(flowNode.getPermissionFlag()) && !applyNodeCode.equals(flowNode.getNodeCode()) && NodeType.BETWEEN.getKey().equals(flowNode.getNodeType())) {
errorMsg.add(flowNode.getNodeName());
}
@@ -190,7 +187,7 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
List flowDefinitions = flowDefinitionMapper.selectByIds(StreamUtils.toList(flowHisTasks, FlowHisTask::getDefinitionId));
if (CollUtil.isNotEmpty(flowDefinitions)) {
String join = StreamUtils.join(flowDefinitions, FlowDefinition::getFlowCode);
- log.error("流程定义【{}】已被使用不可被删除！", join);
+ log.info("流程定义【{}】已被使用不可被删除！", join);
throw new ServiceException("流程定义【" + join + "】已被使用不可被删除！");
}
}
@@ -219,6 +216,10 @@ public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
.eq(FlowCategory::getTenantId, DEFAULT_TENANT_ID).eq(FlowCategory::getCategoryId, FlowConstant.FLOW_CATEGORY_ID));
flowCategory.setCategoryId(null);
flowCategory.setTenantId(tenantId);
+ flowCategory.setCreateBy(null);
+ flowCategory.setCreateTime(null);
+ flowCategory.setUpdateBy(null);
+ flowCategory.setUpdateTime(null);
flwCategoryMapper.insert(flowCategory);
List defIds = StreamUtils.toList(flowDefinitions, FlowDefinition::getId);
List flowNodes = flowNodeMapper.selectList(new LambdaQueryWrapper().in(FlowNode::getDefinitionId, defIds));
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
index db8ab71b..a3e272f7 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
@@ -19,14 +19,12 @@ import org.dromara.common.core.utils.StringUtils;
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.warm.flow.core.FlowEngine;
import org.dromara.warm.flow.core.constant.ExceptionCons;
import org.dromara.warm.flow.core.dto.FlowParams;
import org.dromara.warm.flow.core.entity.Definition;
import org.dromara.warm.flow.core.entity.Instance;
import org.dromara.warm.flow.core.entity.Task;
import org.dromara.warm.flow.core.enums.NodeType;
-import org.dromara.warm.flow.core.service.ChartService;
import org.dromara.warm.flow.core.service.DefService;
import org.dromara.warm.flow.core.service.InsService;
import org.dromara.warm.flow.core.service.TaskService;
@@ -42,13 +40,11 @@ import org.dromara.workflow.domain.bo.FlowInstanceBo;
import org.dromara.workflow.domain.bo.FlowInvalidBo;
import org.dromara.workflow.domain.vo.FlowHisTaskVo;
import org.dromara.workflow.domain.vo.FlowInstanceVo;
-import org.dromara.workflow.domain.vo.FlowVariableVo;
import org.dromara.workflow.handler.FlowProcessEventHandler;
import org.dromara.workflow.mapper.FlwCategoryMapper;
import org.dromara.workflow.mapper.FlwInstanceMapper;
import org.dromara.workflow.service.IFlwInstanceService;
import org.dromara.workflow.service.IFlwTaskService;
-import org.dromara.workflow.utils.WorkflowUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -68,7 +64,6 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
private final InsService insService;
private final DefService defService;
- private final ChartService chartService;
private final TaskService taskService;
private final FlowHisTaskMapper flowHisTaskMapper;
private final FlowInstanceMapper flowInstanceMapper;
@@ -185,7 +180,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
@Override
@Transactional(rollbackFor = Exception.class)
public boolean deleteByBusinessIds(List businessIds) {
- List flowInstances = flowInstanceMapper.selectList(new LambdaQueryWrapper().in(FlowInstance::getBusinessId, businessIds));
+ List flowInstances = flowInstanceMapper.selectList(new LambdaQueryWrapper().in(FlowInstance::getBusinessId, StreamUtils.toList(businessIds, Convert::toStr)));
if (CollUtil.isEmpty(flowInstances)) {
log.warn("未找到对应的流程实例信息，无法执行删除操作。");
return false;
@@ -244,19 +239,15 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
throw new ServiceException(ExceptionCons.NOT_FOUNT_DEF);
}
String message = bo.getMessage();
+ String userIdStr = LoginHelper.getUserIdStr();
BusinessStatusEnum.checkCancelStatus(instance.getFlowStatus());
- String applyNodeCode = WorkflowUtils.applyNodeCode(definition.getId());
- //撤销
- WorkflowUtils.backTask(message, instance.getId(), applyNodeCode, BusinessStatusEnum.CANCEL.getStatus(), BusinessStatusEnum.CANCEL.getStatus());
- //判断或签节点是否有多个，只保留一个
- List currentTaskList = taskService.list(FlowEngine.newTask().setInstanceId(instance.getId()));
- if (CollUtil.isNotEmpty(currentTaskList)) {
- if (currentTaskList.size() > 1) {
- currentTaskList.remove(0);
- WorkflowUtils.deleteRunTask(StreamUtils.toList(currentTaskList, Task::getId));
- }
- }
-
+ FlowParams flowParams = FlowParams.build()
+ .message(message)
+ .flowStatus(BusinessStatusEnum.CANCEL.getStatus())
+ .hisStatus(BusinessStatusEnum.CANCEL.getStatus())
+ .handler(userIdStr)
+ .ignore(true);
+ taskService.revoke(instance.getId(), flowParams);
} catch (Exception e) {
log.error("撤销失败: {}", e.getMessage(), e);
throw new ServiceException(e.getMessage());
@@ -284,7 +275,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
* @param businessId 业务id
*/
@Override
- public Map flowImage(String businessId) {
+ public Map flowHisTaskList(String businessId) {
FlowInstance flowInstance = this.selectInstByBusinessId(businessId);
if (ObjectUtil.isNull(flowInstance)) {
throw new ServiceException(ExceptionCons.NOT_FOUNT_INSTANCE);
@@ -313,15 +304,14 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
}
//历史任务
LambdaQueryWrapper wrapper = Wrappers.lambdaQuery();
- wrapper.eq(FlowHisTask::getInstanceId, instanceId);
- wrapper.eq(FlowHisTask::getNodeType, NodeType.BETWEEN.getKey());
- wrapper.orderByDesc(FlowHisTask::getCreateTime).orderByDesc(FlowHisTask::getUpdateTime);
+ wrapper.eq(FlowHisTask::getInstanceId, instanceId)
+ .eq(FlowHisTask::getNodeType, NodeType.BETWEEN.getKey())
+ .orderByDesc(FlowHisTask::getCreateTime, FlowHisTask::getUpdateTime);
List flowHisTasks = flowHisTaskMapper.selectList(wrapper);
if (CollUtil.isNotEmpty(flowHisTasks)) {
list.addAll(BeanUtil.copyToList(flowHisTasks, FlowHisTaskVo.class));
}
- String flowChart = chartService.chartIns(instanceId);
- return Map.of("list", list, "image", flowChart);
+ return Map.of("list", list, "instanceId", instanceId);
}
/**
@@ -345,21 +335,12 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
*/
@Override
public Map instanceVariable(Long instanceId) {
- Map map = new HashMap<>();
FlowInstance flowInstance = flowInstanceMapper.selectById(instanceId);
- Map variableMap = flowInstance.getVariableMap();
- List list = new ArrayList<>();
- if (CollUtil.isNotEmpty(variableMap)) {
- for (Map.Entry entry : variableMap.entrySet()) {
- FlowVariableVo flowVariableVo = new FlowVariableVo();
- flowVariableVo.setKey(entry.getKey());
- flowVariableVo.setValue(entry.getValue().toString());
- list.add(flowVariableVo);
- }
- }
- map.put("variableList", list);
- map.put("variable", flowInstance.getVariable());
- return map;
+ Map variableMap = Optional.ofNullable(flowInstance.getVariableMap()).orElse(Collections.emptyMap());
+ List> variableList = variableMap.entrySet().stream()
+ .map(entry -> Map.of("key", entry.getKey(), "value", entry.getValue()))
+ .toList();
+ return Map.of("variableList", variableList, "variable", flowInstance.getVariable());
}
/**
@@ -373,6 +354,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
Instance instance = insService.getById(instanceId);
if (instance != null) {
taskService.mergeVariable(instance, variable);
+ insService.updateById(instance);
}
}
@@ -433,15 +415,12 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService {
if (instance != null) {
BusinessStatusEnum.checkInvalidStatus(instance.getFlowStatus());
}
- List flowTaskList = flwTaskService.selectByInstId(bo.getId());
- for (FlowTask flowTask : flowTaskList) {
- FlowParams flowParams = new FlowParams();
- flowParams.message(bo.getComment());
- flowParams.flowStatus(BusinessStatusEnum.INVALID.getStatus())
- .hisStatus(TaskStatusEnum.INVALID.getStatus());
- flowParams.ignore(true);
- taskService.termination(flowTask.getId(), flowParams);
- }
+ FlowParams flowParams = FlowParams.build()
+ .message(bo.getComment())
+ .flowStatus(BusinessStatusEnum.INVALID.getStatus())
+ .hisStatus(TaskStatusEnum.INVALID.getStatus())
+ .ignore(true);
+ taskService.terminationByInsId(bo.getId(), flowParams);
return true;
} catch (Exception e) {
log.error(e.getMessage(), e);
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java
new file mode 100644
index 00000000..fca21a36
--- /dev/null
+++ b/xinnengyuan/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java
@@ -0,0 +1,243 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.dto.DictTypeDTO;
+import org.dromara.common.core.service.DictService;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.warm.flow.ui.service.NodeExtService;
+import org.dromara.warm.flow.ui.vo.NodeExt;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.enums.ButtonPermissionEnum;
+import org.dromara.workflow.common.enums.NodeExtEnum;
+import org.dromara.workflow.domain.vo.ButtonPermissionVo;
+import org.dromara.workflow.service.IFlwNodeExtService;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 流程设计器-节点扩展属性
+ *
+ * @author AprilWind
+ */
+@ConditionalOnEnable
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class FlwNodeExtServiceImpl implements NodeExtService, IFlwNodeExtService {
+
+ /**
+ * 存储不同 dictType 对应的配置信息
+ */
+ private static final Map CHILD_NODE_MAP = new HashMap<>();
+
+ record ButtonPermission(String label, Integer type, Boolean must, Boolean multiple) {
+ }
+
+ static {
+ CHILD_NODE_MAP.put(ButtonPermissionEnum.class.getSimpleName(),
+ new ButtonPermission("权限按钮", 4, false, true));
+ }
+
+ private final DictService dictService;
+
+ /**
+ * 获取节点扩展属性
+ *
+ * @return 节点扩展属性列表
+ */
+ @Override
+ public List getNodeExt() {
+ List nodeExtList = new ArrayList<>();
+ // 构建按钮权限页面
+ nodeExtList.add(buildNodeExt("wf_button_tab", "权限", 2,
+ List.of(ButtonPermissionEnum.class)));
+ // 自定义构建 规则参考 NodeExt 与 warm-flow文档说明
+ // nodeExtList.add(buildNodeExt("xxx_xxx", "xxx", 1, List);
+ return nodeExtList;
+ }
+
+ /**
+ * 构建一个 `NodeExt` 对象
+ *
+ * @param code 唯一编码
+ * @param name 名称（新页签时，作为页签名称）
+ * @param type 节点类型（1: 基础设置，2: 新页签）
+ * @param sources 数据来源（枚举类或字典类型）
+ * @return 构建的 `NodeExt` 对象
+ */
+ @SuppressWarnings("unchecked cast")
+ private NodeExt buildNodeExt(String code, String name, int type, List