From abf2f697fbcb926ef355623d51bc7b04cef3c9c2 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Fri, 5 Nov 2021 07:50:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20wl=20=3D=E3=80=8Bbpm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/{workflow => bpm}/convert/package-info.java | 2 +- .../《芋道 Spring Boot 对象转换 MapStruct 入门》.md | 0 .../WfForm.java => bpm/dal/dataobject/form/BpmForm.java} | 6 +++--- .../dal/dataobject/form/BpmFormData.java} | 8 ++++---- .../modules/bpm/dal/dataobject/leave/package-info.java | 4 ++++ .../modules/bpm/dal/dataobject/process/package-info.java | 4 ++++ .../modules/bpm/dal/dataobject/task/package-info.java | 4 ++++ .../yudao/adminserver/modules/bpm/package-info.java | 9 +++++++++ .../workflow/dal/dataobject/leave/package-info.java | 4 ---- .../workflow/dal/dataobject/process/package-info.java | 4 ---- .../workflow/dal/dataobject/task/package-info.java | 4 ---- .../yudao/adminserver/modules/workflow/package-info.java | 7 ------- 12 files changed, 29 insertions(+), 27 deletions(-) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{workflow => bpm}/convert/package-info.java (55%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{workflow => bpm}/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md (100%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{workflow/dal/dataobject/form/WfForm.java => bpm/dal/dataobject/form/BpmForm.java} (86%) rename yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/{workflow/dal/dataobject/form/WfFormData.java => bpm/dal/dataobject/form/BpmFormData.java} (84%) create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/leave/package-info.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/process/package-info.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/task/package-info.java create mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/package-info.java delete mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/leave/package-info.java delete mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/process/package-info.java delete mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/task/package-info.java delete mode 100644 yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/package-info.java diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/convert/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/package-info.java similarity index 55% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/convert/package-info.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/package-info.java index 39eb68b9b..497d7afa0 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/convert/package-info.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/package-info.java @@ -3,4 +3,4 @@ * * 目前使用 MapStruct 框架 */ -package cn.iocoder.yudao.adminserver.modules.workflow.convert; +package cn.iocoder.yudao.adminserver.modules.bpm.convert; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md similarity index 100% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/form/WfForm.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/form/BpmForm.java similarity index 86% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/form/WfForm.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/form/BpmForm.java index e182f62b9..d780b526b 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/form/WfForm.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/form/BpmForm.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.workflow.dal.dataobject.form; +package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; @@ -15,14 +15,14 @@ import java.util.List; * * @author 芋道源码 */ -@TableName(value = "wf_form", autoResultMap = true) +@TableName(value = "bpm_form", autoResultMap = true) @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) @Builder @NoArgsConstructor @AllArgsConstructor -public class WfForm extends BaseDO { +public class BpmForm extends BaseDO { /** * 编号 diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/form/WfFormData.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/form/BpmFormData.java similarity index 84% rename from yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/form/WfFormData.java rename to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/form/BpmFormData.java index 639f0d717..6fa978720 100644 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/form/WfFormData.java +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/form/BpmFormData.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.adminserver.modules.workflow.dal.dataobject.form; +package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.TableField; @@ -22,7 +22,7 @@ import java.util.Map; @Builder @NoArgsConstructor @AllArgsConstructor -public class WfFormData extends BaseDO { +public class BpmFormData extends BaseDO { /** * 编号 @@ -31,13 +31,13 @@ public class WfFormData extends BaseDO { /** * 表单编号 * - * 关联 {@link WfForm#getId()} + * 关联 {@link BpmForm#getId()} */ private Long formId; /** * 表单配置 * - * 冗余 {@link WfForm#getFields()} + * 冗余 {@link BpmForm#getFields()} * 主要考虑，表单是可以修改的 */ @TableField(typeHandler = JacksonTypeHandler.class) diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/leave/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/leave/package-info.java new file mode 100644 index 000000000..23ebef9c5 --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/leave/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 芋艿：实现请假流程，接入工作流 + */ +package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.leave; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/process/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/process/package-info.java new file mode 100644 index 000000000..0410bc3ca --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/process/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 芋艿：工作流的定义 + */ +package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.process; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/task/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/task/package-info.java new file mode 100644 index 000000000..0cb016039 --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/task/package-info.java @@ -0,0 +1,4 @@ +/** + * TODO 芋艿：工作流创建后的定义 + */ +package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/package-info.java new file mode 100644 index 000000000..2757e578b --- /dev/null +++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/package-info.java @@ -0,0 +1,9 @@ +/** + * bpm 包下，业务流程管理（Business Process Management），我们放工作流的功能，基于 activiti 7 版本实现。 + * 例如说：流程定义、表单配置、审核中心（我的申请、我的待办、我的已办）等等 + * + * bpm 解释：https://baike.baidu.com/item/BPM/1933 + * + * 缩写：bpm + */ +package cn.iocoder.yudao.adminserver.modules.bpm; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/leave/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/leave/package-info.java deleted file mode 100644 index e96ebce32..000000000 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/leave/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * TODO 芋艿：实现请假流程，接入工作流 - */ -package cn.iocoder.yudao.adminserver.modules.workflow.dal.dataobject.leave; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/process/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/process/package-info.java deleted file mode 100644 index 801d02f45..000000000 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/process/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * TODO 芋艿：工作流的定义 - */ -package cn.iocoder.yudao.adminserver.modules.workflow.dal.dataobject.process; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/task/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/task/package-info.java deleted file mode 100644 index 005f29ff0..000000000 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/dal/dataobject/task/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * TODO 芋艿：工作流创建后的定义 - */ -package cn.iocoder.yudao.adminserver.modules.workflow.dal.dataobject.task; diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/package-info.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/package-info.java deleted file mode 100644 index 290a72903..000000000 --- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/workflow/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * workflow 包下，我们放工作流的功能，基于 activiti 7 版本实现。 - * 例如说：流程定义、表单配置、审核中心（我的申请、我的待办、我的已办）等等 - * - * 缩写：wf 。嘿嘿，实在想不到合适的缩写了！ - */ -package cn.iocoder.yudao.adminserver.modules.workflow;