update 更新warm-flow版本

pom.xml

@@ -50,7 +50,7 @@
         <!-- 面向运行时的D-ORM依赖 -->
         <anyline.version>8.7.2-20241022</anyline.version>
         <!--工作流配置-->
-        <warm-flow.version>1.3.0</warm-flow.version>
+        <warm-flow.version>1.3.3</warm-flow.version>
 
         <!-- 插件版本 -->
         <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
@@ -118,24 +118,23 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- Warm-Flow国产工作流引擎, 在线文档：http://warm-flow.cn/ -->
             <dependency>
-                <groupId>io.github.minliuhua</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>warm-flow-mybatis-plus-sb-starter</artifactId>
                 <version>${warm-flow.version}</version>
             </dependency>
-
             <dependency>
-                <groupId>io.github.minliuhua</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>warm-flow-plugin-spel</artifactId>
                 <version>${warm-flow.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.github.minliuhua</groupId>
+                <groupId>org.dromara</groupId>
                 <artifactId>warm-flow-plugin-ui-sb-web</artifactId>
                 <version>${warm-flow.version}</version>
             </dependency>
 
-
             <!-- JustAuth 的依赖配置-->
             <dependency>
                 <groupId>me.zhyd.oauth</groupId>

ruoyi-modules/ruoyi-workflow/pom.xml

@@ -67,15 +67,15 @@
         </dependency>
 
         <dependency>
-            <groupId>io.github.minliuhua</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>warm-flow-mybatis-plus-sb-starter</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.github.minliuhua</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>warm-flow-plugin-spel</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.github.minliuhua</groupId>
+            <groupId>org.dromara</groupId>
             <artifactId>warm-flow-plugin-ui-sb-web</artifactId>
         </dependency>
     </dependencies>

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java

@@ -1,8 +1,5 @@
 package org.dromara.workflow.controller;
 
-import com.warm.flow.core.entity.Definition;
-import com.warm.flow.core.service.DefService;
-import com.warm.flow.orm.entity.FlowDefinition;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
@@ -11,6 +8,9 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.warm.flow.core.entity.Definition;
+import org.dromara.warm.flow.core.service.DefService;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
 import org.dromara.workflow.domain.vo.FlowDefinitionVo;
 import org.dromara.workflow.service.IFlwDefinitionService;
 import org.springframework.transaction.annotation.Transactional;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java

@@ -1,12 +1,12 @@
 package org.dromara.workflow.controller;
 
-import com.warm.flow.core.entity.Instance;
-import com.warm.flow.core.service.InsService;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 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.Instance;
+import org.dromara.warm.flow.core.service.InsService;
 import org.dromara.workflow.domain.bo.InstanceBo;
 import org.dromara.workflow.domain.vo.FlowInstanceVo;
 import org.dromara.workflow.service.IFlwInstanceService;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java

@@ -2,15 +2,6 @@ package org.dromara.workflow.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.warm.flow.core.dto.FlowParams;
-import com.warm.flow.core.dto.ModifyHandler;
-import com.warm.flow.core.entity.HisTask;
-import com.warm.flow.core.entity.Instance;
-import com.warm.flow.core.entity.Task;
-import com.warm.flow.core.enums.CooperateType;
-import com.warm.flow.core.enums.FlowStatus;
-import com.warm.flow.core.service.InsService;
-import com.warm.flow.core.service.TaskService;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
@@ -21,6 +12,14 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.warm.flow.core.dto.ModifyHandler;
+import org.dromara.warm.flow.core.entity.HisTask;
+import org.dromara.warm.flow.core.entity.Instance;
+import org.dromara.warm.flow.core.entity.Task;
+import org.dromara.warm.flow.core.enums.CooperateType;
+import org.dromara.warm.flow.core.enums.FlowStatus;
+import org.dromara.warm.flow.core.service.InsService;
+import org.dromara.warm.flow.core.service.TaskService;
 import org.dromara.workflow.domain.bo.*;
 import org.dromara.workflow.domain.vo.FlowHisTaskVo;
 import org.dromara.workflow.domain.vo.FlowTaskVo;
@@ -29,7 +28,6 @@ import org.dromara.workflow.utils.WorkflowUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -49,7 +47,6 @@ public class FlwTaskController extends BaseController {
     private final TaskService taskService;
     private final InsService insService;
 
-
     /**
      * 启动任务
      *

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java

@@ -1,6 +1,6 @@
 package org.dromara.workflow.domain.vo;
 
-import com.warm.flow.orm.entity.FlowDefinition;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
 
 public class FlowDefinitionVo extends FlowDefinition {
 }

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java

@@ -1,9 +1,9 @@
 package org.dromara.workflow.domain.vo;
 
-import com.warm.flow.core.enums.FlowStatus;
 import lombok.Data;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.warm.flow.core.enums.FlowStatus;
 
 import java.io.Serial;
 import java.io.Serializable;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java

@@ -1,9 +1,9 @@
 package org.dromara.workflow.domain.vo;
 
-import com.warm.flow.core.entity.User;
 import lombok.Data;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.warm.flow.core.entity.User;
 
 import java.io.Serial;
 import java.io.Serializable;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwDefMapper.java

@@ -3,8 +3,8 @@ package org.dromara.workflow.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.warm.flow.orm.entity.FlowDefinition;
 import org.apache.ibatis.annotations.Param;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
 
 /**
  * 实例信息Mapper接口

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java

@@ -1,9 +1,9 @@
 package org.dromara.workflow.service;
 
-import com.warm.flow.orm.entity.FlowDefinition;
 import jakarta.servlet.http.HttpServletResponse;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
 import org.dromara.workflow.domain.vo.FlowDefinitionVo;
 import org.springframework.web.multipart.MultipartFile;
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java

@@ -1,9 +1,9 @@
 package org.dromara.workflow.service;
 
-import com.warm.flow.core.entity.Instance;
-import com.warm.flow.orm.entity.FlowInstance;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.warm.flow.core.entity.Instance;
+import org.dromara.warm.flow.orm.entity.FlowInstance;
 import org.dromara.workflow.domain.bo.InstanceBo;
 import org.dromara.workflow.domain.vo.FlowInstanceVo;
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java

@@ -1,9 +1,8 @@
 package org.dromara.workflow.service;
 
-import com.warm.flow.core.entity.HisTask;
-import com.warm.flow.core.entity.Instance;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.warm.flow.core.entity.HisTask;
 import org.dromara.workflow.domain.bo.*;
 import org.dromara.workflow.domain.vo.FlowHisTaskVo;
 import org.dromara.workflow.domain.vo.FlowTaskVo;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java

@@ -5,10 +5,6 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.warm.flow.core.entity.Definition;
-import com.warm.flow.core.service.DefService;
-import com.warm.flow.orm.entity.FlowDefinition;
-import com.warm.flow.orm.mapper.FlowDefinitionMapper;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -18,6 +14,10 @@ import org.dom4j.io.XMLWriter;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.warm.flow.core.entity.Definition;
+import org.dromara.warm.flow.core.service.DefService;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
+import org.dromara.warm.flow.orm.mapper.FlowDefinitionMapper;
 import org.dromara.workflow.domain.vo.FlowDefinitionVo;
 import org.dromara.workflow.mapper.FlwDefMapper;
 import org.dromara.workflow.service.IFlwDefinitionService;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java

@@ -7,18 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.warm.flow.core.entity.Instance;
-import com.warm.flow.core.enums.CooperateType;
-import com.warm.flow.core.enums.FlowStatus;
-import com.warm.flow.core.enums.NodeType;
-import com.warm.flow.core.service.DefService;
-import com.warm.flow.core.service.InsService;
-import com.warm.flow.orm.entity.FlowDefinition;
-import com.warm.flow.orm.entity.FlowHisTask;
-import com.warm.flow.orm.entity.FlowInstance;
-import com.warm.flow.orm.mapper.FlowDefinitionMapper;
-import com.warm.flow.orm.mapper.FlowHisTaskMapper;
-import com.warm.flow.orm.mapper.FlowInstanceMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.SystemConstants;
@@ -27,6 +15,18 @@ 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.entity.Instance;
+import org.dromara.warm.flow.core.enums.CooperateType;
+import org.dromara.warm.flow.core.enums.FlowStatus;
+import org.dromara.warm.flow.core.enums.NodeType;
+import org.dromara.warm.flow.core.service.DefService;
+import org.dromara.warm.flow.core.service.InsService;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
+import org.dromara.warm.flow.orm.entity.FlowHisTask;
+import org.dromara.warm.flow.orm.entity.FlowInstance;
+import org.dromara.warm.flow.orm.mapper.FlowDefinitionMapper;
+import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper;
+import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper;
 import org.dromara.workflow.domain.bo.FlowInstanceBo;
 import org.dromara.workflow.domain.bo.InstanceBo;
 import org.dromara.workflow.domain.vo.FlowHisTaskVo;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java

@@ -5,22 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.warm.flow.core.dto.FlowParams;
-import com.warm.flow.core.entity.*;
-import com.warm.flow.core.enums.FlowStatus;
-import com.warm.flow.core.enums.NodeType;
-import com.warm.flow.core.enums.SkipType;
-import com.warm.flow.core.service.DefService;
-import com.warm.flow.core.service.InsService;
-import com.warm.flow.core.service.TaskService;
-import com.warm.flow.core.service.UserService;
-import com.warm.flow.orm.entity.FlowHisTask;
-import com.warm.flow.orm.entity.FlowInstance;
-import com.warm.flow.orm.entity.FlowSkip;
-import com.warm.flow.orm.entity.FlowTask;
-import com.warm.flow.orm.mapper.FlowHisTaskMapper;
-import com.warm.flow.orm.mapper.FlowSkipMapper;
-import com.warm.flow.orm.mapper.FlowTaskMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.dto.UserDTO;
@@ -32,6 +16,22 @@ 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.dto.FlowParams;
+import org.dromara.warm.flow.core.entity.*;
+import org.dromara.warm.flow.core.enums.FlowStatus;
+import org.dromara.warm.flow.core.enums.NodeType;
+import org.dromara.warm.flow.core.enums.SkipType;
+import org.dromara.warm.flow.core.service.DefService;
+import org.dromara.warm.flow.core.service.InsService;
+import org.dromara.warm.flow.core.service.TaskService;
+import org.dromara.warm.flow.core.service.UserService;
+import org.dromara.warm.flow.orm.entity.FlowHisTask;
+import org.dromara.warm.flow.orm.entity.FlowInstance;
+import org.dromara.warm.flow.orm.entity.FlowSkip;
+import org.dromara.warm.flow.orm.entity.FlowTask;
+import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper;
+import org.dromara.warm.flow.orm.mapper.FlowSkipMapper;
+import org.dromara.warm.flow.orm.mapper.FlowTaskMapper;
 import org.dromara.workflow.common.enums.TaskStatusEnum;
 import org.dromara.workflow.domain.bo.*;
 import org.dromara.workflow.domain.vo.FlowHisTaskVo;
@@ -109,7 +109,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
         FlowParams flowParams = new FlowParams();
         flowParams.flowCode(wfDefinitionConfigVo.getProcessKey());
         flowParams.variable(startProcessBo.getVariables());
-        flowParams.setHandler(userId);
+        flowParams.handler(userId);
         flowParams.flowStatus(BusinessStatusEnum.DRAFT.getStatus());
         Instance instance;
         try {
@@ -332,7 +332,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService, AssigneeService {
             flowParams.message(bo.getMessage());
             flowParams.handler(userId);
             flowParams.nodeCode(bo.getNodeCode());
-            flowParams.setPermissionFlag(WorkflowUtils.permissionList());
+            flowParams.permissionFlag(WorkflowUtils.permissionList());
             Instance instance = taskService.skip(taskId, flowParams);
             setHandler(instance);
             flowProcessEventHandler.processHandler(definition.getFlowCode(),

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java

@@ -3,7 +3,6 @@ package org.dromara.workflow.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.warm.flow.core.enums.FlowStatus;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.event.ProcessEvent;
@@ -16,6 +15,7 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.warm.flow.core.enums.FlowStatus;
 import org.dromara.workflow.domain.TestLeave;
 import org.dromara.workflow.domain.bo.TestLeaveBo;
 import org.dromara.workflow.domain.vo.TestLeaveVo;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskAssigneeServiceImpl.java

@@ -2,11 +2,6 @@ package org.dromara.workflow.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import com.warm.flow.ui.dto.HandlerFunDto;
-import com.warm.flow.ui.dto.HandlerQuery;
-import com.warm.flow.ui.dto.TreeFunDto;
-import com.warm.flow.ui.service.HandlerSelectService;
-import com.warm.flow.ui.vo.HandlerSelectVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.dto.DeptDTO;
@@ -20,6 +15,11 @@ import org.dromara.common.core.service.RoleService;
 import org.dromara.common.core.service.UserService;
 import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.warm.flow.ui.dto.HandlerFunDto;
+import org.dromara.warm.flow.ui.dto.HandlerQuery;
+import org.dromara.warm.flow.ui.dto.TreeFunDto;
+import org.dromara.warm.flow.ui.service.HandlerSelectService;
+import org.dromara.warm.flow.ui.vo.HandlerSelectVo;
 import org.dromara.workflow.common.enums.TaskAssigneeEnum;
 import org.dromara.workflow.service.IWfTaskAssigneeService;
 import org.springframework.stereotype.Service;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java

@@ -1,14 +1,14 @@
 package org.dromara.workflow.utils;
 
 import cn.hutool.core.collection.CollUtil;
-import com.warm.flow.core.entity.User;
-import com.warm.flow.orm.entity.FlowUser;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.dromara.common.core.domain.dto.UserDTO;
 import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.warm.flow.core.entity.User;
+import org.dromara.warm.flow.orm.entity.FlowUser;
 import org.dromara.workflow.common.enums.TaskAssigneeEnum;
 import org.dromara.workflow.service.IWfTaskAssigneeService;
 

ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwDefMapper.xml

@@ -3,7 +3,7 @@
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.workflow.mapper.FlwDefMapper">
-    <select id="page" resultType="com.warm.flow.orm.entity.FlowDefinition">
+    <select id="page" resultType="org.dromara.warm.flow.orm.entity.FlowDefinition">
         select *
         from (select a.* from flow_definition a
         inner join (select flow_code,max(version) version from flow_definition group by flow_code) b