mirror of
https://gitee.com/dromara/RuoYi-Cloud-Plus.git
synced 2026-04-25 03:48:35 +08:00
!164 从vue版本迁移flowable到cloud版本
* update 按照vue版逻辑改造工作流 * update 去除泛化调用逻辑 * update 更改 工作流 测试用例接口路径 * fix 去除无用修改,还原demo,testLeave挪入工作流模块 * fix 清理无效代码,还原配置 * update 修改监听器属性名 * update 集成工作流
This commit is contained in:
@@ -0,0 +1,34 @@
|
||||
# Tomcat
|
||||
server:
|
||||
port: 9205
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
application:
|
||||
# 应用名称
|
||||
name: ruoyi-workflow
|
||||
profiles:
|
||||
# 环境配置
|
||||
active: @profiles.active@
|
||||
|
||||
--- # nacos 配置
|
||||
spring:
|
||||
cloud:
|
||||
nacos:
|
||||
# nacos 服务地址
|
||||
server-addr: @nacos.server@
|
||||
username: @nacos.username@
|
||||
password: @nacos.password@
|
||||
discovery:
|
||||
# 注册组
|
||||
group: @nacos.discovery.group@
|
||||
namespace: ${spring.profiles.active}
|
||||
config:
|
||||
# 配置组
|
||||
group: @nacos.config.group@
|
||||
namespace: ${spring.profiles.active}
|
||||
config:
|
||||
import:
|
||||
- optional:nacos:application-common.yml
|
||||
- optional:nacos:datasource.yml
|
||||
- optional:nacos:${spring.application.name}.yml
|
||||
10
ruoyi-modules/ruoyi-workflow/src/main/resources/banner.txt
Normal file
10
ruoyi-modules/ruoyi-workflow/src/main/resources/banner.txt
Normal file
@@ -0,0 +1,10 @@
|
||||
Spring Boot Version: ${spring-boot.version}
|
||||
Spring Application Name: ${spring.application.name}
|
||||
_ _
|
||||
(_) | |
|
||||
_ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___
|
||||
| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \
|
||||
| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | |
|
||||
|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_|
|
||||
__/ | __/ |
|
||||
|___/ |___/
|
||||
@@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration scan="true" scanPeriod="60 seconds" debug="false">
|
||||
<!-- 日志存放路径 -->
|
||||
<property name="log.path" value="logs/${project.artifactId}" />
|
||||
<!-- 日志输出格式 -->
|
||||
<property name="console.log.pattern"
|
||||
value="%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
|
||||
|
||||
<!-- 控制台输出 -->
|
||||
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>${console.log.pattern}</pattern>
|
||||
<charset>utf-8</charset>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<include resource="logback-common.xml" />
|
||||
|
||||
<include resource="logback-logstash.xml" />
|
||||
|
||||
<!-- 开启 skywalking 日志收集 -->
|
||||
<include resource="logback-skylog.xml" />
|
||||
|
||||
<!--系统操作日志-->
|
||||
<root level="info">
|
||||
<appender-ref ref="console" />
|
||||
</root>
|
||||
</configuration>
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.workflow.testleave.mapper.TestLeaveMapper">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,3 @@
|
||||
java包使用 `.` 分割 resource 目录使用 `/` 分割
|
||||
<br>
|
||||
此文件目的 防止文件夹粘连找不到 `xml` 文件
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.workflow.mapper.ActHiProcinstMapper">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.workflow.mapper.ActHiTaskinstMapper">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,78 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.workflow.mapper.ActTaskMapper">
|
||||
<resultMap type="org.dromara.workflow.domain.vo.TaskVo" id="TaskVoResult">
|
||||
<result property="id" column="ID_"/>
|
||||
<result property="name" column="NAME_"/>
|
||||
<result property="description" column="DESCRIPTION_"/>
|
||||
<result property="priority" column="PRIORITY_"/>
|
||||
<result property="owner" column="OWNER_"/>
|
||||
<result property="assignee" column="ASSIGNEE_"/>
|
||||
<result property="processInstanceId" column="PROC_INST_ID_"/>
|
||||
<result property="executionId" column="EXECUTION_ID_"/>
|
||||
<result property="taskDefinitionId" column="TASK_DEF_ID_"/>
|
||||
<result property="processDefinitionId" column="PROC_DEF_ID_"/>
|
||||
<result property="createTime" column="CREATE_TIME_"/>
|
||||
<result property="startTime" column="START_TIME_"/>
|
||||
<result property="endTime" column="END_TIME_"/>
|
||||
<result property="taskDefinitionKey" column="TASK_DEF_KEY_"/>
|
||||
<result property="dueDate" column="DUE_DATE_"/>
|
||||
<result property="category" column="CATEGORY_"/>
|
||||
<result property="parentTaskId" column="PARENT_TASK_ID_"/>
|
||||
<result property="tenantId" column="TENANT_ID_"/>
|
||||
<result property="claimTime" column="CLAIM_TIME"/>
|
||||
<result property="businessStatus" column="BUSINESS_STATUS_"/>
|
||||
<result property="processDefinitionName" column="processDefinitionName"/>
|
||||
<result property="processDefinitionKey" column="processDefinitionKey"/>
|
||||
<result property="processDefinitionVersion" column="processDefinitionVersion"/>
|
||||
<result property="businessKey" column="BUSINESS_KEY_"/>
|
||||
|
||||
</resultMap>
|
||||
<select id="getTaskWaitByPage" resultMap="TaskVoResult">
|
||||
select *
|
||||
from (SELECT RES.*,
|
||||
AHP.BUSINESS_STATUS_,
|
||||
AHP.BUSINESS_KEY_,
|
||||
ARP.NAME_ AS processDefinitionName,
|
||||
ARP.KEY_ AS processDefinitionKey,
|
||||
ARP.VERSION_ AS processDefinitionVersion
|
||||
FROM ACT_RU_TASK RES
|
||||
INNER JOIN ACT_HI_PROCINST AHP ON RES.PROC_INST_ID_ = AHP.PROC_INST_ID_
|
||||
INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = RES.PROC_DEF_ID_
|
||||
WHERE RES.PARENT_TASK_ID_ IS NULL
|
||||
ORDER BY RES.CREATE_TIME_ DESC) t ${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
<select id="getTaskFinishByPage" resultMap="TaskVoResult">
|
||||
select *
|
||||
from (SELECT HTI.*,
|
||||
AHP.BUSINESS_STATUS_,
|
||||
AHP.BUSINESS_KEY_,
|
||||
ARP.NAME_ AS processDefinitionName,
|
||||
ARP.KEY_ AS processDefinitionKey,
|
||||
ARP.VERSION_ AS processDefinitionVersion
|
||||
FROM ACT_HI_TASKINST HTI
|
||||
INNER JOIN ACT_HI_PROCINST AHP ON HTI.PROC_INST_ID_ = AHP.PROC_INST_ID_
|
||||
INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = HTI.PROC_DEF_ID_
|
||||
WHERE HTI.PARENT_TASK_ID_ IS NULL AND HTI.END_TIME_ IS NOT NULL
|
||||
ORDER BY HTI.START_TIME_ DESC) t ${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
|
||||
<select id="getTaskCopyByPage" resultMap="TaskVoResult">
|
||||
select *
|
||||
from (SELECT AHT.*,
|
||||
AHP.BUSINESS_STATUS_,
|
||||
AHP.BUSINESS_KEY_,
|
||||
ARP.NAME_ as processDefinitionName,
|
||||
ARP.KEY_ as processDefinitionKey,
|
||||
ARP.VERSION_ AS processDefinitionVersion
|
||||
FROM ACT_HI_TASKINST AHT
|
||||
INNER JOIN ACT_HI_PROCINST AHP ON AHT.PROC_INST_ID_ = AHP.PROC_INST_ID_
|
||||
INNER JOIN ACT_RE_PROCDEF ARP ON ARP.ID_ = AHT.PROC_DEF_ID_
|
||||
WHERE AHT.PARENT_TASK_ID_ IS NOT NULL
|
||||
and AHT.scope_type_ = 'copy'
|
||||
ORDER BY AHT.START_TIME_ DESC) t ${ew.getCustomSqlSegment}
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.workflow.mapper.WfCategoryMapper">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.workflow.mapper.WfDefinitionConfigMapper">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.workflow.mapper.WfFormManageMapper">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.workflow.mapper.WfNodeConfigMapper">
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="org.dromara.workflow.mapper.WfTaskBackNodeMapper">
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user