diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 0adc219ce..1fa2b1d4c 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -41,7 +41,6 @@
0.1.16
4.0.0
- 7.1.0.M6
6.7.0
3.0.4
@@ -376,41 +375,6 @@
-
- org.activiti
- activiti-spring-boot-starter
- ${activiti.version}
-
-
- de.odysseus.juel
- juel-api
-
-
- de.odysseus.juel
- juel-spi
-
-
- org.mybatis
- mybatis
-
-
- el-api
- javax.el
-
-
-
-
- org.activiti
- activiti-image-generator
- ${activiti.version}
-
-
-
- cn.iocoder.boot
- yudao-spring-boot-starter-activiti
- ${revision}
-
-
cn.iocoder.boot
yudao-spring-boot-starter-flowable
diff --git a/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java b/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java
index b39b9641c..c22316ef1 100644
--- a/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java
+++ b/yudao-framework/yudao-spring-boot-starter-banner/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java
@@ -34,9 +34,12 @@ public class BannerApplicationRunner implements ApplicationRunner {
// 数据报表
if (isNotPresent("cn.iocoder.yudao.module.visualization.framework.security.config.SecurityConfiguration")) {
- System.out.println("[报表模块 yudao-module-visualization-biz - 已禁用][参考 https://doc.iocoder.cn/report/ 开启]");
+ System.out.println("[报表模块 yudao-module-visualization - 已禁用][参考 https://doc.iocoder.cn/report/ 开启]");
+ }
+ // 工作流
+ if (isNotPresent("cn.iocoder.yudao.framework.flowable.config.YudaoFlowableConfiguration")) {
+ System.out.println("[工作流模块 yudao-module-bpm - 已禁用][参考 https://doc.iocoder.cn/bpm/ 开启]");
}
- // 支付模块
});
}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/pom.xml b/yudao-module-bpm/yudao-module-bpm-biz/pom.xml
index 81c0f36a8..12d5c5beb 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/pom.xml
+++ b/yudao-module-bpm/yudao-module-bpm-biz/pom.xml
@@ -12,9 +12,9 @@
${project.artifactId}
- bpm-base 模块,实现公用的工作流的逻辑,提供给 bpm-activiti 和 bpm-flowable 复用
+ bpm 包下,业务流程管理(Business Process Management),我们放工作流的功能,基于 Flowable 6 版本实现。
+ 例如说:流程定义、表单配置、审核中心(我的申请、我的待办、我的已办)等等
-
cn.iocoder.boot
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmActivityMapper.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmActivityMapper.java
deleted file mode 100644
index 7e93b240f..000000000
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmActivityMapper.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package cn.iocoder.yudao.module.bpm.dal.mysql.task;
-
-import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmActivityDO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface BpmActivityMapper extends BaseMapperX {
-
-
- // TODO @ke:可以试试,把 activiti 的表,映射成对应的实体,然后读取下。我们尽量避免 xml 操作,因为要做多 db 类型的支持,例如说 oracle 等。通过 mybatis plus 帮助我们生成不同数据库的表操作
- /**
- * 获取指定流程的历史任务
- *
- * @param procInstId 流程id
- *
- * @return 返回历史任务
- */
- List listAllByProcInstIdAndDelete(@Param("procInstId") String procInstId);
-
- /**
- * 逻辑删除hiActInst表任务
- *
- * @param taskIdList 任务列表
- *
- * @return 返回是否成功
- */
- Boolean delHiActInstByTaskId(@Param("taskIdList") List taskIdList);
-
- /**
- * 逻辑删除hiTaskInst任务
- *
- * @param taskIdList 任务列表
- *
- * @return 返回是否成功
- */
- Boolean delHiTaskInstByTaskId(@Param("taskIdList") List taskIdList);
-}
diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/package-info.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/package-info.java
index 333ae35a4..9d02824f6 100644
--- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/package-info.java
+++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/package-info.java
@@ -1,5 +1,5 @@
/**
- * bpm 包下,业务流程管理(Business Process Management),我们放工作流的功能,基于 activiti 7 版本实现。
+ * bpm 包下,业务流程管理(Business Process Management),我们放工作流的功能,基于 Flowable 6 版本实现。
* 例如说:流程定义、表单配置、审核中心(我的申请、我的待办、我的已办)等等
*
* bpm 解释:https://baike.baidu.com/item/BPM/1933
diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml
index 975752709..55c91e2f8 100644
--- a/yudao-server/pom.xml
+++ b/yudao-server/pom.xml
@@ -58,11 +58,11 @@
-
- cn.iocoder.boot
- yudao-module-bpm-biz
- ${revision}
-
+
+
+
+
+
cn.iocoder.boot
yudao-spring-boot-starter-biz-error-code
diff --git a/yudao-ui-admin/src/views/bpm/definition/index.vue b/yudao-ui-admin/src/views/bpm/definition/index.vue
index 43f194234..5ca778382 100644
--- a/yudao-ui-admin/src/views/bpm/definition/index.vue
+++ b/yudao-ui-admin/src/views/bpm/definition/index.vue
@@ -111,7 +111,7 @@ export default {
showBpmnOpen: false,
bpmnXML: null,
bpmnControlForm: {
- prefix: "activiti"
+ prefix: "flowable"
},
// 数据字典
diff --git a/yudao-ui-admin/src/views/bpm/model/index.vue b/yudao-ui-admin/src/views/bpm/model/index.vue
index 8bc24eccf..b123e0d64 100644
--- a/yudao-ui-admin/src/views/bpm/model/index.vue
+++ b/yudao-ui-admin/src/views/bpm/model/index.vue
@@ -259,7 +259,7 @@ export default {
showBpmnOpen: false,
bpmnXML: null,
bpmnControlForm: {
- prefix: "activiti"
+ prefix: "flowable"
},
// 流程表单详情
diff --git a/yudao-ui-admin/src/views/bpm/processInstance/create.vue b/yudao-ui-admin/src/views/bpm/processInstance/create.vue
index 948052f26..6713849f4 100644
--- a/yudao-ui-admin/src/views/bpm/processInstance/create.vue
+++ b/yudao-ui-admin/src/views/bpm/processInstance/create.vue
@@ -80,7 +80,7 @@ export default {
// BPMN 数据
bpmnXML: null,
bpmnControlForm: {
- prefix: "activiti"
+ prefix: "flowable"
},
// 流程表单
diff --git a/yudao-ui-admin/src/views/bpm/processInstance/detail.vue b/yudao-ui-admin/src/views/bpm/processInstance/detail.vue
index 0cdba1b7a..52eebe83d 100644
--- a/yudao-ui-admin/src/views/bpm/processInstance/detail.vue
+++ b/yudao-ui-admin/src/views/bpm/processInstance/detail.vue
@@ -138,7 +138,7 @@ export default {
// BPMN 数据
bpmnXML: null,
bpmnControlForm: {
- prefix: "activiti"
+ prefix: "flowable"
},
activityList: [],