From 210570c0056c46c35bdd349a2fac558441f86f3b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 30 三月 2023 17:36:09 +0800
Subject: [PATCH] update 优化 !pr317 代码结构

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java |   42 +++++++++++++++++++++++++-----------------
 1 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java
index c4f8504..c2a3309 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java
@@ -1,33 +1,37 @@
 package com.ruoyi.system.domain.bo;
 
 import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.xss.Xss;
+import com.ruoyi.common.mybatis.core.domain.BaseEntity;
+import com.ruoyi.common.sensitive.annotation.Sensitive;
+import com.ruoyi.common.sensitive.core.SensitiveStrategy;
+import com.ruoyi.system.domain.SysUser;
+import io.github.linpeilie.annotations.AutoMapper;
+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.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import lombok.NoArgsConstructor;
 
 import java.util.Date;
-
-import com.ruoyi.common.mybatis.core.domain.BaseEntity;
-import lombok.NoArgsConstructor;
 
 /**
  * 鐢ㄦ埛淇℃伅涓氬姟瀵硅薄 sys_user
  *
- * @author ruoyi
- * @date 2023-02-01
+ * @author Michelle.Chung
  */
 
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysUser.class, reverseConvertGenerate = false)
 public class SysUserBo extends BaseEntity {
 
     /**
      * 鐢ㄦ埛ID
      */
-    @NotNull(message = "鐢ㄦ埛ID涓嶈兘涓虹┖", groups = { EditGroup.class })
     private Long userId;
 
     /**
@@ -38,12 +42,16 @@
     /**
      * 鐢ㄦ埛璐﹀彿
      */
-    @NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖", groups = { AddGroup.class, EditGroup.class })
+    @Xss(message = "鐢ㄦ埛璐﹀彿涓嶈兘鍖呭惈鑴氭湰瀛楃")
+    @NotBlank(message = "鐢ㄦ埛璐﹀彿涓嶈兘涓虹┖")
+    @Size(min = 0, max = 30, message = "鐢ㄦ埛璐﹀彿闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
     private String userName;
 
     /**
      * 鐢ㄦ埛鏄电О
      */
+    @Xss(message = "鐢ㄦ埛鏄电О涓嶈兘鍖呭惈鑴氭湰瀛楃")
+    @Size(min = 0, max = 30, message = "鐢ㄦ埛鏄电О闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
     private String nickName;
 
     /**
@@ -54,11 +62,15 @@
     /**
      * 鐢ㄦ埛閭
      */
+    @Sensitive(strategy = SensitiveStrategy.EMAIL)
+    @Email(message = "閭鏍煎紡涓嶆纭�")
+    @Size(min = 0, max = 50, message = "閭闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
     private String email;
 
     /**
      * 鎵嬫満鍙风爜
      */
+    @Sensitive(strategy = SensitiveStrategy.PHONE)
     private String phonenumber;
 
     /**
@@ -69,7 +81,7 @@
     /**
      * 澶村儚鍦板潃
      */
-    private String avatar;
+    private Long avatar;
 
     /**
      * 瀵嗙爜
@@ -92,11 +104,6 @@
     private Date loginDate;
 
     /**
-     * 鍒涘缓閮ㄩ棬
-     */
-    private Long createDept;
-
-    /**
      * 澶囨敞
      */
     private String remark;
@@ -104,6 +111,7 @@
     /**
      * 瑙掕壊缁�
      */
+    @Size(min = 1, message = "鐢ㄦ埛瑙掕壊涓嶈兘涓虹┖")
     private Long[] roleIds;
 
     /**
@@ -120,7 +128,7 @@
         this.userId = userId;
     }
 
-    public boolean isAdmin() {
+    public boolean isSuperAdmin() {
         return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
     }
 

--
Gitblit v1.9.3