From 2023de973e6adb490bba962b1d830fd8e4be9418 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:22:30 +0800
Subject: [PATCH] update 适配 新序列化注解
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java | 102 +++++++++++++++++++++++---------------------------
1 files changed, 47 insertions(+), 55 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 d082aa9..9f565d8 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,91 +1,83 @@
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 jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
+import lombok.EqualsAndHashCode;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.io.Serial;
/**
* 閮ㄩ棬琛� sys_dept
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
@TableName("sys_dept")
-public class SysDept
-{
+public class SysDept extends TreeEntity<SysDept> {
+
+ @Serial
private static final long serialVersionUID = 1L;
- /** 閮ㄩ棬ID */
- @TableId(value = "dept_id",type = IdType.AUTO)
+ /**
+ * 閮ㄩ棬ID
+ */
+ @TableId(value = "dept_id")
private Long deptId;
- /** 鐖堕儴闂↖D */
- private Long parentId;
-
- /** 绁栫骇鍒楄〃 */
- private String ancestors;
-
- /** 閮ㄩ棬鍚嶇О */
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
@NotBlank(message = "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 30, message = "閮ㄩ棬鍚嶇О闀垮害涓嶈兘瓒呰繃30涓瓧绗�")
private String deptName;
- /** 鏄剧ず椤哄簭 */
- @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private String orderNum;
+ /**
+ * 鏄剧ず椤哄簭
+ */
+ @NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
+ private Integer orderNum;
- /** 璐熻矗浜� */
+ /**
+ * 璐熻矗浜�
+ */
private String leader;
- /** 鑱旂郴鐢佃瘽 */
+ /**
+ * 鑱旂郴鐢佃瘽
+ */
@Size(min = 0, max = 11, message = "鑱旂郴鐢佃瘽闀垮害涓嶈兘瓒呰繃11涓瓧绗�")
private String phone;
- /** 閭 */
+ /**
+ * 閭
+ */
@Email(message = "閭鏍煎紡涓嶆纭�")
@Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
private String email;
- /** 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤 */
+ /**
+ * 閮ㄩ棬鐘舵��:0姝ｅ父,1鍋滅敤
+ */
private String status;
- /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
+ /**
+ * 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛�
+ */
@TableLogic
private String delFlag;
- /** 鐖堕儴闂ㄥ悕绉� */
- private String parentName;
-
- /** 鍒涘缓鑰� */
- private String createBy;
-
- /** 鍒涘缓鏃堕棿 */
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /** 鏇存柊鑰� */
- 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>();
+ /**
+ * 绁栫骇鍒楄〃
+ */
+ private String ancestors;
}
--
Gitblit v1.9.3