mirror of
				https://gitee.com/hhyykk/ipms-sjy.git
				synced 2025-10-31 10:18:42 +08:00 
			
		
		
		
	1. 默认不开启 bpm 工作流模块,按需启动,提升启动速度
2. 完整移除 activiti 遗留的东东
This commit is contained in:
		| @@ -41,7 +41,6 @@ | |||||||
|         <jedis-mock.version>0.1.16</jedis-mock.version> |         <jedis-mock.version>0.1.16</jedis-mock.version> | ||||||
|         <mockito-inline.version>4.0.0</mockito-inline.version> |         <mockito-inline.version>4.0.0</mockito-inline.version> | ||||||
|         <!-- Bpm 工作流相关 --> |         <!-- Bpm 工作流相关 --> | ||||||
|         <activiti.version>7.1.0.M6</activiti.version> |  | ||||||
|         <flowable.version>6.7.0</flowable.version> |         <flowable.version>6.7.0</flowable.version> | ||||||
|         <!-- 工具类相关 --> |         <!-- 工具类相关 --> | ||||||
|         <jasypt-spring-boot-starter.version>3.0.4</jasypt-spring-boot-starter.version> |         <jasypt-spring-boot-starter.version>3.0.4</jasypt-spring-boot-starter.version> | ||||||
| @@ -376,41 +375,6 @@ | |||||||
|             </dependency> |             </dependency> | ||||||
|  |  | ||||||
|             <!-- 工作流相关 --> |             <!-- 工作流相关 --> | ||||||
|             <dependency> |  | ||||||
|                 <groupId>org.activiti</groupId> |  | ||||||
|                 <artifactId>activiti-spring-boot-starter</artifactId> |  | ||||||
|                 <version>${activiti.version}</version> |  | ||||||
|                 <exclusions> |  | ||||||
|                     <exclusion> |  | ||||||
|                         <groupId>de.odysseus.juel</groupId> |  | ||||||
|                         <artifactId>juel-api</artifactId> |  | ||||||
|                     </exclusion> |  | ||||||
|                     <exclusion> |  | ||||||
|                         <groupId>de.odysseus.juel</groupId> |  | ||||||
|                         <artifactId>juel-spi</artifactId> |  | ||||||
|                     </exclusion> |  | ||||||
|                     <exclusion> |  | ||||||
|                         <groupId>org.mybatis</groupId> |  | ||||||
|                         <artifactId>mybatis</artifactId> |  | ||||||
|                     </exclusion> |  | ||||||
|                     <exclusion> |  | ||||||
|                         <artifactId>el-api</artifactId> |  | ||||||
|                         <groupId>javax.el</groupId> |  | ||||||
|                     </exclusion> |  | ||||||
|                 </exclusions> |  | ||||||
|             </dependency> |  | ||||||
|             <dependency> |  | ||||||
|                 <groupId>org.activiti</groupId> |  | ||||||
|                 <artifactId>activiti-image-generator</artifactId> |  | ||||||
|                 <version>${activiti.version}</version> |  | ||||||
|             </dependency> |  | ||||||
|  |  | ||||||
|             <dependency> |  | ||||||
|                 <groupId>cn.iocoder.boot</groupId> |  | ||||||
|                 <artifactId>yudao-spring-boot-starter-activiti</artifactId> |  | ||||||
|                 <version>${revision}</version> |  | ||||||
|             </dependency> |  | ||||||
|             <!-- 工作流相关 flowable --> |  | ||||||
|             <dependency> |             <dependency> | ||||||
|                 <groupId>cn.iocoder.boot</groupId> |                 <groupId>cn.iocoder.boot</groupId> | ||||||
|                 <artifactId>yudao-spring-boot-starter-flowable</artifactId> |                 <artifactId>yudao-spring-boot-starter-flowable</artifactId> | ||||||
|   | |||||||
| @@ -34,9 +34,12 @@ public class BannerApplicationRunner implements ApplicationRunner { | |||||||
|  |  | ||||||
|             // 数据报表 |             // 数据报表 | ||||||
|             if (isNotPresent("cn.iocoder.yudao.module.visualization.framework.security.config.SecurityConfiguration")) { |             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/ 开启]"); | ||||||
|             } |             } | ||||||
|             // 支付模块 |  | ||||||
|         }); |         }); | ||||||
|     } |     } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -12,9 +12,9 @@ | |||||||
|  |  | ||||||
|     <name>${project.artifactId}</name> |     <name>${project.artifactId}</name> | ||||||
|     <description> |     <description> | ||||||
|         bpm-base 模块,实现公用的工作流的逻辑,提供给 bpm-activiti 和 bpm-flowable 复用 |         bpm 包下,业务流程管理(Business Process Management),我们放工作流的功能,基于 Flowable 6 版本实现。 | ||||||
|  |         例如说:流程定义、表单配置、审核中心(我的申请、我的待办、我的已办)等等 | ||||||
|     </description> |     </description> | ||||||
|  |  | ||||||
|     <dependencies> |     <dependencies> | ||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>cn.iocoder.boot</groupId> |             <groupId>cn.iocoder.boot</groupId> | ||||||
|   | |||||||
| @@ -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<BpmActivityDO> { |  | ||||||
|  |  | ||||||
|  |  | ||||||
|     // TODO @ke:可以试试,把 activiti 的表,映射成对应的实体,然后读取下。我们尽量避免 xml 操作,因为要做多 db 类型的支持,例如说 oracle 等。通过 mybatis plus 帮助我们生成不同数据库的表操作 |  | ||||||
|     /** |  | ||||||
|      * 获取指定流程的历史任务 |  | ||||||
|      * |  | ||||||
|      * @param procInstId 流程id |  | ||||||
|      * |  | ||||||
|      * @return 返回历史任务 |  | ||||||
|      */ |  | ||||||
|     List<BpmActivityDO> listAllByProcInstIdAndDelete(@Param("procInstId") String procInstId); |  | ||||||
|  |  | ||||||
|     /** |  | ||||||
|      * 逻辑删除hiActInst表任务 |  | ||||||
|      * |  | ||||||
|      * @param taskIdList 任务列表 |  | ||||||
|      * |  | ||||||
|      * @return 返回是否成功 |  | ||||||
|      */ |  | ||||||
|     Boolean delHiActInstByTaskId(@Param("taskIdList") List<String> taskIdList); |  | ||||||
|  |  | ||||||
|     /** |  | ||||||
|      * 逻辑删除hiTaskInst任务 |  | ||||||
|      * |  | ||||||
|      * @param taskIdList 任务列表 |  | ||||||
|      * |  | ||||||
|      * @return 返回是否成功 |  | ||||||
|      */ |  | ||||||
|     Boolean delHiTaskInstByTaskId(@Param("taskIdList") List<String> taskIdList); |  | ||||||
| } |  | ||||||
| @@ -1,5 +1,5 @@ | |||||||
| /** | /** | ||||||
|  * bpm 包下,业务流程管理(Business Process Management),我们放工作流的功能,基于 activiti 7 版本实现。 |  * bpm 包下,业务流程管理(Business Process Management),我们放工作流的功能,基于 Flowable 6 版本实现。 | ||||||
|  * 例如说:流程定义、表单配置、审核中心(我的申请、我的待办、我的已办)等等 |  * 例如说:流程定义、表单配置、审核中心(我的申请、我的待办、我的已办)等等 | ||||||
|  * |  * | ||||||
|  * bpm 解释:https://baike.baidu.com/item/BPM/1933 |  * bpm 解释:https://baike.baidu.com/item/BPM/1933 | ||||||
|   | |||||||
| @@ -58,11 +58,11 @@ | |||||||
| <!--            <version>${revision}</version>--> | <!--            <version>${revision}</version>--> | ||||||
| <!--        </dependency>--> | <!--        </dependency>--> | ||||||
|         <!-- 工作流 --> |         <!-- 工作流 --> | ||||||
|         <dependency> | <!--        <dependency>--> | ||||||
|             <groupId>cn.iocoder.boot</groupId> | <!--            <groupId>cn.iocoder.boot</groupId>--> | ||||||
|             <artifactId>yudao-module-bpm-biz</artifactId> | <!--            <artifactId>yudao-module-bpm-biz</artifactId>--> | ||||||
|             <version>${revision}</version> | <!--            <version>${revision}</version>--> | ||||||
|         </dependency> | <!--        </dependency>--> | ||||||
|         <dependency> |         <dependency> | ||||||
|             <groupId>cn.iocoder.boot</groupId> |             <groupId>cn.iocoder.boot</groupId> | ||||||
|             <artifactId>yudao-spring-boot-starter-biz-error-code</artifactId> |             <artifactId>yudao-spring-boot-starter-biz-error-code</artifactId> | ||||||
|   | |||||||
| @@ -111,7 +111,7 @@ export default { | |||||||
|       showBpmnOpen: false, |       showBpmnOpen: false, | ||||||
|       bpmnXML: null, |       bpmnXML: null, | ||||||
|       bpmnControlForm: { |       bpmnControlForm: { | ||||||
|         prefix: "activiti" |         prefix: "flowable" | ||||||
|       }, |       }, | ||||||
|  |  | ||||||
|       // 数据字典 |       // 数据字典 | ||||||
|   | |||||||
| @@ -259,7 +259,7 @@ export default { | |||||||
|       showBpmnOpen: false, |       showBpmnOpen: false, | ||||||
|       bpmnXML: null, |       bpmnXML: null, | ||||||
|       bpmnControlForm: { |       bpmnControlForm: { | ||||||
|         prefix: "activiti" |         prefix: "flowable" | ||||||
|       }, |       }, | ||||||
|  |  | ||||||
|       // 流程表单详情 |       // 流程表单详情 | ||||||
|   | |||||||
| @@ -80,7 +80,7 @@ export default { | |||||||
|       // BPMN 数据 |       // BPMN 数据 | ||||||
|       bpmnXML: null, |       bpmnXML: null, | ||||||
|       bpmnControlForm: { |       bpmnControlForm: { | ||||||
|         prefix: "activiti" |         prefix: "flowable" | ||||||
|       }, |       }, | ||||||
|  |  | ||||||
|       // 流程表单 |       // 流程表单 | ||||||
|   | |||||||
| @@ -138,7 +138,7 @@ export default { | |||||||
|       // BPMN 数据 |       // BPMN 数据 | ||||||
|       bpmnXML: null, |       bpmnXML: null, | ||||||
|       bpmnControlForm: { |       bpmnControlForm: { | ||||||
|         prefix: "activiti" |         prefix: "flowable" | ||||||
|       }, |       }, | ||||||
|       activityList: [], |       activityList: [], | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 YunaiV
					YunaiV