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 | 138 ++++++++++++++++++++++------------------------
1 files changed, 66 insertions(+), 72 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 72240bc..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,99 +1,93 @@
package com.ruoyi.common.core.domain.entity;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
+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.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.*;
/**
* 閮ㄩ棬琛� sys_dept
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_dept")
-public class SysDept implements Serializable
-{
- private static final long serialVersionUID = 1L;
+@ApiModel("閮ㄩ棬涓氬姟瀵硅薄")
+public class SysDept extends TreeEntity {
+ private static final long serialVersionUID = 1L;
- /** 閮ㄩ棬ID */
- @TableId(value = "dept_id",type = IdType.AUTO)
- private Long deptId;
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty(value = "閮ㄩ棬id")
+ @TableId(value = "dept_id")
+ private Long deptId;
- /** 鐖堕儴闂↖D */
- private Long parentId;
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+ @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
+ @Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
+ private String deptName;
- /** 绁栫骇鍒楄〃 */
- private String ancestors;
+ /**
+ * 鏄剧ず椤哄簭
+ */
+ @ApiModelProperty(value = "鏄剧ず椤哄簭")
+ @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private String orderNum;
- /** 閮ㄩ棬鍚嶇О */
- @NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
- private String deptName;
+ /**
+ * 璐熻矗浜�
+ */
+ @ApiModelProperty(value = "璐熻矗浜�")
+ private String leader;
- /** 鏄剧ず椤哄簭 */
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private String orderNum;
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ @Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
+ private String phone;
- /** 璐熻矗浜� */
- private String leader;
+ /**
+ * 閭
+ */
+ @ApiModelProperty(value = "閭")
+ @Email(message = "閭鏍煎紡涓嶆纭�")
+ @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
+ private String email;
- /** 鑱旂郴鐢佃瘽 */
- @Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
- private String phone;
+ /**
+ * 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤
+ */
+ @ApiModelProperty(value = "閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤")
+ private String status;
- /** 閭 */
- @Email(message = "閭鏍煎紡涓嶆纭�")
- @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
- private String email;
+ /**
+ * 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�")
+ @TableLogic
+ private String delFlag;
- /** 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤 */
- private String status;
-
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
- @TableLogic
- private String delFlag;
-
- /** 鐖堕儴闂ㄥ悕绉� */
- @TableField(exist = false)
- private String parentName;
-
- /** 鍒涘缓鑰� */
- @TableField(fill = FieldFill.INSERT)
- private String createBy;
-
- /** 鍒涘缓鏃堕棿 */
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /** 鏇存柊鑰� */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private String updateBy;
-
- /** 鏇存柊鏃堕棿 */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /** 瀛愰儴闂� */
- @TableField(exist = false)
- private List<SysDept> children = new ArrayList<SysDept>();
-
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
+ /**
+ * 绁栫骇鍒楄〃
+ */
+ @ApiModelProperty(value = "绁栫骇鍒楄〃")
+ private String ancestors;
}
--
Gitblit v1.9.3