From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 253 ++++++++++++++------------------------------------
1 files changed, 72 insertions(+), 181 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index c9238e2..17ff660 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -1,202 +1,93 @@
package com.ruoyi.common.core.domain.entity;
-import java.util.ArrayList;
-import java.util.List;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.TreeEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.domain.BaseEntity;
/**
* 閮ㄩ棬琛� sys_dept
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
-public class SysDept extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
- /** 閮ㄩ棬ID */
- private Long deptId;
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("sys_dept")
+@ApiModel("閮ㄩ棬涓氬姟瀵硅薄")
+public class SysDept extends TreeEntity {
+ private static final long serialVersionUID = 1L;
- /** 鐖堕儴闂↖D */
- private Long parentId;
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty(value = "閮ㄩ棬id")
+ @TableId(value = "dept_id")
+ private Long deptId;
- /** 绁栫骇鍒楄〃 */
- private String ancestors;
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+ @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
+ @Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
+ private String deptName;
- /** 閮ㄩ棬鍚嶇О */
- private String deptName;
+ /**
+ * 鏄剧ず椤哄簭
+ */
+ @ApiModelProperty(value = "鏄剧ず椤哄簭")
+ @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private String orderNum;
- /** 鏄剧ず椤哄簭 */
- private String orderNum;
+ /**
+ * 璐熻矗浜�
+ */
+ @ApiModelProperty(value = "璐熻矗浜�")
+ private String leader;
- /** 璐熻矗浜� */
- private String leader;
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ @Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
+ private String phone;
- /** 鑱旂郴鐢佃瘽 */
- private String phone;
+ /**
+ * 閭
+ */
+ @ApiModelProperty(value = "閭")
+ @Email(message = "閭鏍煎紡涓嶆纭�")
+ @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
+ private String email;
- /** 閭 */
- private String email;
+ /**
+ * 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤
+ */
+ @ApiModelProperty(value = "閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤")
+ private String status;
- /** 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤 */
- private String status;
+ /**
+ * 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
+ @TableLogic
+ private String delFlag;
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- private String delFlag;
+ /**
+ * 绁栫骇鍒楄〃
+ */
+ @ApiModelProperty(value = "绁栫骇鍒楄〃")
+ private String ancestors;
- /** 鐖堕儴闂ㄥ悕绉� */
- private String parentName;
-
- /** 瀛愰儴闂� */
- private List<SysDept> children = new ArrayList<SysDept>();
-
- public Long getDeptId()
- {
- return deptId;
- }
-
- public void setDeptId(Long deptId)
- {
- this.deptId = deptId;
- }
-
- public Long getParentId()
- {
- return parentId;
- }
-
- public void setParentId(Long parentId)
- {
- this.parentId = parentId;
- }
-
- public String getAncestors()
- {
- return ancestors;
- }
-
- public void setAncestors(String ancestors)
- {
- this.ancestors = ancestors;
- }
-
- @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- public String getDeptName()
- {
- return deptName;
- }
-
- public void setDeptName(String deptName)
- {
- this.deptName = deptName;
- }
-
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- public String getOrderNum()
- {
- return orderNum;
- }
-
- public void setOrderNum(String orderNum)
- {
- this.orderNum = orderNum;
- }
-
- public String getLeader()
- {
- return leader;
- }
-
- public void setLeader(String leader)
- {
- this.leader = leader;
- }
-
- @Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
- public String getPhone()
- {
- return phone;
- }
-
- public void setPhone(String phone)
- {
- this.phone = phone;
- }
-
- @Email(message = "閭鏍煎紡涓嶆纭�")
- @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- public String getEmail()
- {
- return email;
- }
-
- public void setEmail(String email)
- {
- this.email = email;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getDelFlag()
- {
- return delFlag;
- }
-
- public void setDelFlag(String delFlag)
- {
- this.delFlag = delFlag;
- }
-
- public String getParentName()
- {
- return parentName;
- }
-
- public void setParentName(String parentName)
- {
- this.parentName = parentName;
- }
-
- public List<SysDept> getChildren()
- {
- return children;
- }
-
- public void setChildren(List<SysDept> children)
- {
- this.children = children;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("deptId", getDeptId())
- .append("parentId", getParentId())
- .append("ancestors", getAncestors())
- .append("deptName", getDeptName())
- .append("orderNum", getOrderNum())
- .append("leader", getLeader())
- .append("phone", getPhone())
- .append("email", getEmail())
- .append("status", getStatus())
- .append("delFlag", getDelFlag())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
- }
}
--
Gitblit v1.9.3