From 082aaf5b8bddd1f93e392135b0a1621b786d1f23 Mon Sep 17 00:00:00 2001 From: fengcheng <2929004360@qq.com> Date: Wed, 8 Jan 2025 14:33:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/work}/WorkLeaveController.java | 2 +- .../api/domain/WfBusinessProcess.java | 39 ++--------- .../com/ruoyi/flowable/domain/ActReModel.java | 4 ++ .../com/ruoyi/flowable/domain/Deploy.java | 4 ++ .../com/ruoyi/flowable/domain/WfCategory.java | 4 ++ .../com/ruoyi/flowable/domain/WfCopy.java | 4 ++ .../ruoyi/flowable/domain/WfDeployForm.java | 4 ++ .../com/ruoyi/flowable/domain/WfFlowMenu.java | 4 ++ .../com/ruoyi/flowable/domain/WfForm.java | 4 ++ .../com/ruoyi/flowable/domain/WfIcon.java | 49 ++++--------- .../domain/WfModelAssociationTemplate.java | 49 ++++--------- .../flowable/domain/WfModelPermission.java | 69 ++----------------- .../ruoyi/flowable/domain/WfModelProcdef.java | 60 ++-------------- .../flowable/domain/WfModelTemplate.java | 4 ++ .../com/ruoyi/flowable/page/PageQuery.java | 4 ++ .../ruoyi/flowable/page/TableDataInfo.java | 2 + 16 files changed, 83 insertions(+), 223 deletions(-) rename {ruoyi-work/src/main/java/com/ruoyi/work/controller => ruoyi-admin/src/main/java/com/ruoyi/web/controller/work}/WorkLeaveController.java (99%) diff --git a/ruoyi-work/src/main/java/com/ruoyi/work/controller/WorkLeaveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/work/WorkLeaveController.java similarity index 99% rename from ruoyi-work/src/main/java/com/ruoyi/work/controller/WorkLeaveController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/work/WorkLeaveController.java index b5b7746..0bf93a6 100644 --- a/ruoyi-work/src/main/java/com/ruoyi/work/controller/WorkLeaveController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/work/WorkLeaveController.java @@ -1,4 +1,4 @@ -package com.ruoyi.work.controller; +package com.ruoyi.web.controller.work; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; diff --git a/ruoyi-api/ruoyi-flowable-api/src/main/java/com/ruoyi/flowable/api/domain/WfBusinessProcess.java b/ruoyi-api/ruoyi-flowable-api/src/main/java/com/ruoyi/flowable/api/domain/WfBusinessProcess.java index e03183b..d7c8e2b 100644 --- a/ruoyi-api/ruoyi-flowable-api/src/main/java/com/ruoyi/flowable/api/domain/WfBusinessProcess.java +++ b/ruoyi-api/ruoyi-flowable-api/src/main/java/com/ruoyi/flowable/api/domain/WfBusinessProcess.java @@ -2,6 +2,9 @@ package com.ruoyi.flowable.api.domain; import com.ruoyi.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; /** * 业务流程对象 wf_business_process @@ -9,6 +12,9 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author fengcheng * @date 2024-07-15 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class WfBusinessProcess extends BaseEntity { private static final long serialVersionUID = 1L; @@ -21,37 +27,4 @@ public class WfBusinessProcess extends BaseEntity /** 业务流程类型 */ private String businessProcessType; - - public String getBusinessId() { - return businessId; - } - - public void setBusinessId(String businessId) { - this.businessId = businessId; - } - - public String getProcessId() { - return processId; - } - - public void setProcessId(String processId) { - this.processId = processId; - } - - public String getBusinessProcessType() { - return businessProcessType; - } - - public void setBusinessProcessType(String businessProcessType) { - this.businessProcessType = businessProcessType; - } - - @Override - public String toString() { - return "WfBusinessProcess{" + - "businessId='" + businessId + '\'' + - ", processId='" + processId + '\'' + - ", businessProcessType='" + businessProcessType + '\'' + - '}'; - } } diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/ActReModel.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/ActReModel.java index f70e728..7429a81 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/ActReModel.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/ActReModel.java @@ -1,8 +1,10 @@ package com.ruoyi.flowable.domain; import com.ruoyi.flowable.base.BaseEntity; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import java.util.Date; @@ -12,6 +14,8 @@ import java.util.Date; * @author fengcheng */ @Data +@NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class ActReModel extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/Deploy.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/Deploy.java index 181620b..7fd73fa 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/Deploy.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/Deploy.java @@ -1,8 +1,10 @@ package com.ruoyi.flowable.domain; import com.ruoyi.flowable.base.BaseEntity; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; /** * 部署对象 deploy @@ -10,6 +12,8 @@ import lombok.EqualsAndHashCode; * @author fengcheng */ @Data +@NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class Deploy extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfCategory.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfCategory.java index 2fec68e..c94d11c 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfCategory.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfCategory.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.flowable.base.BaseEntity; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; /** * 流程分类对象 wf_category @@ -14,6 +16,8 @@ import lombok.EqualsAndHashCode; * @date 2022-01-15 */ @Data +@NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName("wf_category") public class WfCategory extends BaseEntity { diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfCopy.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfCopy.java index 568471f..ec85fbc 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfCopy.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfCopy.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.flowable.base.BaseEntity; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; /** * 流程抄送对象 wf_copy @@ -14,6 +16,8 @@ import lombok.EqualsAndHashCode; * @date 2022-05-19 */ @Data +@NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName("wf_copy") public class WfCopy extends BaseEntity { diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfDeployForm.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfDeployForm.java index b943a11..05bec53 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfDeployForm.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfDeployForm.java @@ -3,7 +3,9 @@ package com.ruoyi.flowable.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; /** * 流程实例关联表单对象 sys_instance_form @@ -12,6 +14,8 @@ import lombok.Data; * @createTime 2022/3/7 22:07 */ @Data +@NoArgsConstructor +@AllArgsConstructor @TableName("wf_deploy_form") public class WfDeployForm { private static final long serialVersionUID = 1L; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfFlowMenu.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfFlowMenu.java index 77c4bb9..1af6186 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfFlowMenu.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfFlowMenu.java @@ -3,8 +3,10 @@ package com.ruoyi.flowable.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.Excel; import com.ruoyi.flowable.base.BaseEntity; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; /** * 流程菜单对象 wf_flow_menu @@ -12,6 +14,8 @@ import lombok.EqualsAndHashCode; * @author fengcheng */ @Data +@NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName("wf_flow_menu" ) public class WfFlowMenu extends BaseEntity { diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfForm.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfForm.java index 538d75a..2c2564b 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfForm.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfForm.java @@ -3,8 +3,10 @@ package com.ruoyi.flowable.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.flowable.base.BaseEntity; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; /** * 流程表单对象 wf_form @@ -13,6 +15,8 @@ import lombok.EqualsAndHashCode; * @createTime 2022/3/7 22:07 */ @Data +@NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName("wf_form") public class WfForm extends BaseEntity { diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfIcon.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfIcon.java index d613a64..5812ab9 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfIcon.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfIcon.java @@ -1,9 +1,9 @@ package com.ruoyi.flowable.domain; -import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; /** * 流程图标对象 wf_icon @@ -11,42 +11,19 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author fengcheng * @date 2024-07-09 */ -public class WfIcon extends BaseEntity -{ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class WfIcon extends BaseEntity { private static final long serialVersionUID = 1L; - /** 流程部署id */ - @Excel(name = "流程部署id") + /** + * 流程部署id + */ private String deploymentId; - /** 流程图标路径 */ - @Excel(name = "流程图标路径") + /** + * 流程图标路径 + */ private String icon; - - public void setDeploymentId(String deploymentId) - { - this.deploymentId = deploymentId; - } - - public String getDeploymentId() - { - return deploymentId; - } - public void setIcon(String icon) - { - this.icon = icon; - } - - public String getIcon() - { - return icon; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("deploymentId", getDeploymentId()) - .append("icon", getIcon()) - .toString(); - } } diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelAssociationTemplate.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelAssociationTemplate.java index 7dfabe2..a8f17d3 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelAssociationTemplate.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelAssociationTemplate.java @@ -1,9 +1,9 @@ package com.ruoyi.flowable.domain; -import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; /** * 模型关联模板对象 wf_model_association_template @@ -11,42 +11,19 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author fengcheng * @date 2024-07-23 */ -public class WfModelAssociationTemplate extends BaseEntity -{ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class WfModelAssociationTemplate extends BaseEntity { private static final long serialVersionUID = 1L; - /** 模型模板id */ - @Excel(name = "模型模板id") + /** + * 模型模板id + */ private String modelTemplateId; - /** 模型ID */ - @Excel(name = "模型ID") + /** + * 模型ID + */ private String modelId; - - public void setModelTemplateId(String modelTemplateId) - { - this.modelTemplateId = modelTemplateId; - } - - public String getModelTemplateId() - { - return modelTemplateId; - } - public void setModelId(String modelId) - { - this.modelId = modelId; - } - - public String getModelId() - { - return modelId; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("modelTemplateId", getModelTemplateId()) - .append("modelId", getModelId()) - .toString(); - } } diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelPermission.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelPermission.java index f20f017..92b4f7c 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelPermission.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelPermission.java @@ -2,6 +2,9 @@ package com.ruoyi.flowable.domain; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,6 +14,9 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author fengcheng * @date 2024-07-10 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class WfModelPermission extends BaseEntity { private static final long serialVersionUID = 1L; @@ -19,77 +25,14 @@ public class WfModelPermission extends BaseEntity private String modelPermissionId; /** 流程模型ID */ - @Excel(name = "流程模型ID") private String modelId; /** 权限id */ - @Excel(name = "权限id") private Long permissionId; /** 名称 */ - @Excel(name = "名称") private String name; /** 权限类型(1=人员权限,2=部门权限) */ - @Excel(name = "权限类型(1=人员权限,2=部门权限)") private String type; - - public void setModelPermissionId(String modelPermissionId) - { - this.modelPermissionId = modelPermissionId; - } - - public String getModelPermissionId() - { - return modelPermissionId; - } - public void setModelId(String modelId) - { - this.modelId = modelId; - } - - public String getModelId() - { - return modelId; - } - public void setPermissionId(Long permissionId) - { - this.permissionId = permissionId; - } - - public Long getPermissionId() - { - return permissionId; - } - public void setName(String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - public void setType(String type) - { - this.type = type; - } - - public String getType() - { - return type; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("modelPermissionId", getModelPermissionId()) - .append("modelId", getModelId()) - .append("permissionId", getPermissionId()) - .append("name", getName()) - .append("type", getType()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .toString(); - } } diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelProcdef.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelProcdef.java index 5d35de9..4dee040 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelProcdef.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelProcdef.java @@ -1,6 +1,9 @@ package com.ruoyi.flowable.domain; import com.ruoyi.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; /** * 模型部署对象 wf_model_procdef @@ -8,6 +11,9 @@ import com.ruoyi.common.core.domain.BaseEntity; * @author fengcheng * @date 2024-07-11 */ +@Data +@NoArgsConstructor +@AllArgsConstructor public class WfModelProcdef extends BaseEntity { private static final long serialVersionUID = 1L; @@ -32,59 +38,5 @@ public class WfModelProcdef extends BaseEntity * 表单查看路由 */ private String formViewPath; - - public void setModelId(String modelId) - { - this.modelId = modelId; - } - - public String getModelId() - { - return modelId; - } - public void setProcdefId(String procdefId) - { - this.procdefId = procdefId; - } - - public String getProcdefId() - { - return procdefId; - } - - public String getFormType() { - return formType; - } - - public void setFormType(String formType) { - this.formType = formType; - } - - public String getFormCreatePath() { - return formCreatePath; - } - - public void setFormCreatePath(String formCreatePath) { - this.formCreatePath = formCreatePath; - } - - public String getFormViewPath() { - return formViewPath; - } - - public void setFormViewPath(String formViewPath) { - this.formViewPath = formViewPath; - } - - @Override - public String toString() { - return "WfModelProcdef{" + - "modelId='" + modelId + '\'' + - ", procdefId='" + procdefId + '\'' + - ", formType='" + formType + '\'' + - ", formCreatePath='" + formCreatePath + '\'' + - ", formViewPath='" + formViewPath + '\'' + - '}'; - } } diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelTemplate.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelTemplate.java index 0da826b..66039d5 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelTemplate.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/domain/WfModelTemplate.java @@ -3,8 +3,10 @@ package com.ruoyi.flowable.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; /** * 模型模板对象 wf_model_template @@ -13,6 +15,8 @@ import lombok.EqualsAndHashCode; * @date 2024-07-17 */ @Data +@NoArgsConstructor +@AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName("wf_model_template") public class WfModelTemplate extends BaseEntity { diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/page/PageQuery.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/page/PageQuery.java index e9530fe..df9ce01 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/page/PageQuery.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/page/PageQuery.java @@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.sql.SqlUtil; import com.ruoyi.flowable.utils.StringUtils; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.ArrayList; @@ -20,6 +22,8 @@ import java.util.List; */ @Data +@NoArgsConstructor +@AllArgsConstructor public class PageQuery implements Serializable { private static final long serialVersionUID = 1L; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/page/TableDataInfo.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/page/TableDataInfo.java index 320db40..403a8f4 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/page/TableDataInfo.java +++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/page/TableDataInfo.java @@ -2,6 +2,7 @@ package com.ruoyi.flowable.page; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -16,6 +17,7 @@ import java.util.List; @Data @NoArgsConstructor +@AllArgsConstructor public class TableDataInfo implements Serializable { private static final long serialVersionUID = 1L;