From d4fabb188a2426c3e0a0d13074c81c7b9f54ca97 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期六, 20 一月 2024 11:00:04 +0800
Subject: [PATCH] 2024-01-20 朱宝民 用户实体类id改为userId
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
index 561b660..1cfbd29 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java
@@ -2,13 +2,14 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.mybatis.envm.Deleted;
import com.dy.common.mybatis.envm.Disabled;
import com.dy.common.po.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotEmpty;
import lombok.*;
import org.hibernate.validator.constraints.Length;
@@ -50,9 +51,15 @@
ASSIGN_UUID(4), //鍏ㄥ眬鍞竴鐨� uuid
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- @TableId(type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.INPUT)
@Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Long id;
+ public Long userId;
+
+
+ @Schema(description = "鎵�灞炵墖鍖篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableField(value = "blockId")
+ public Long blockId ;
/**
* 鐢ㄦ埛濮撳悕
@@ -60,7 +67,7 @@
@Schema(description = "濮撳悕", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "濮撳悕涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
@Length(message = "濮撳悕涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 2, max = 25)
- public String name;
+ public String userName;
/**
* 鎵嬫満鍙凤紝鎵嬫満鍙风敤浜庣櫥褰曠郴缁�
@@ -86,6 +93,7 @@
/**
* 鏄惁瓒呯骇绠＄悊鍛� 1:鏄�,0:鍚�
*/
+ @Schema(hidden = true)
@TableField(value = "supperAdmin")
@JSONField(serialize = false)
public Byte supperAdmin;
@@ -94,8 +102,6 @@
* 鏄惁绂佺敤 0:鍚�,1:鏄�
*/
@Schema(description = "鏄惁绂佺敤", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Max(message = "鏄惁绂佺敤鍙兘0鎴�1", value = 1)
- @Min(message = "鏄惁绂佺敤鍙兘0鎴�1",value = 0)
public Disabled disabled;
/**
@@ -106,15 +112,31 @@
/**
+ * 鐢ㄦ埛鎵�灞炶鑹睮d
+ */
+ @Schema(description = "鎵�褰掕鑹诧紙鎵�灞炶鑹睮D瀛楃涓叉暟缁勶級", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @TableField(exist = false)
+ public String[] roleIds ;
+
+ /**
* 鐢ㄦ埛鎵�灞炶鑹�
*/
+ @Schema(description = "鎵�褰掕鑹插垪琛紝鐢ㄤ簬鏄剧ず锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@TableField(exist = false)
public List<?> roleList ;
/**
- * 鐢ㄦ埛鎵�鎷ユ湁鐨勬潈闄�
+ * 鐢ㄦ埛鎵�鎷ユ湁鐨勬潈闄愶紝閽堝鐧诲綍搴旂敤
*/
+ @Schema(hidden = true)
@TableField(exist = false)
+ @JSONField(serialize = false)
public List<Integer> privileges;
- //public transient List<Integer> privileges;//姝ょ鏂瑰紡鍙橀噺涓嶅瓨搴擄紝 涔熶笉鍙備笌搴忓垪鍖栦簡
+
+ /**
+ * 鎵�灞炵墖鍖哄悕绉�
+ */
+ @Schema(description = "鎵�灞炵墖鍖哄悕绉帮紝鐢ㄤ簬鏄剧ず锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @TableField(exist = false)
+ public String blockName ;
}
\ No newline at end of file
--
Gitblit v1.8.0