From 26d63d120e517624be6fcf70ae9620c3582a91dd Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 18 六月 2024 17:35:06 +0800
Subject: [PATCH] 2024-06-18 朱宝民 优化开关阀逻辑
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 65 insertions(+), 8 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 407df37..a5bdf48 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,36 +2,47 @@
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.NotEmpty;
import lombok.*;
+import org.hibernate.validator.constraints.Length;
import java.util.List;
/**
+ * 鐢ㄦ埛瀹炰綋
+ *
* TableName(value = 鈥渁鈥�, autoResultMap = true)
* autoResultMap鍙傛暟涓簍rue鏃讹紝琛ㄦ槑涓埆瀛楁鍦ㄦ煡璇㈠鐞嗙殑鏃跺�欒嚜鍔ㄨ浆鎹负瀵硅薄锛�
* 鍙�傚悎璁剧疆浜員ypeHandler銆乯dbcTyped鐨勬儏鍐点�俛utoResultMap 鑷姩鏄犲皠锛�
* 閫氬父閰嶅悎 @TableField() 涓�璧蜂娇鐢紝纭畾鏄犲皠瑙勮寖鎬с��
* 2023-10-24缁忓疄楠岋細
- * 绠�鍗曠殑@TableField("name")涓嶇敤鍔犱笂锛屽嵆浣垮瓨绫诲睘鎬ф槸椹煎嘲锛屾暟鎹簱瀛楁鏄笅
+ * 绠�鍗曠殑@TableField("name")涓嶇敤鍔犱笂锛屽嵆浣跨被灞炴�у悕鏄┘宄帮紝鏁版嵁搴撳瓧娈垫槸涓�
* 鍒掔嚎鎯呭喌锛屼篃涓嶇敤鍔燖TableField("name")銆�
*/
//2023-10-24涓嬮潰TableName涓嶇敤閰嶇疆琛ㄥ悕绉帮紙value="BaUser"鎴栤�渂a_user鈥濓級
-@TableName(autoResultMap = true)
+//鍙閫氳繃椹煎嘲鍛藉悕娉曞垯绫诲悕涓庤〃鍚嶅搴旇捣鏉ュ氨鍙互浜嗭紝濡傛灉涓嶈兘瀵瑰簲璧锋潵锛岄渶瑕佹寚瀹氳〃鍚嶇О
+//渚嬪@TableName(value="TestUser" autoResultMap = true)
+@TableName(value="ba_user", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
+@Schema(name = "鐢ㄦ埛瀹炰綋")
public class BaUser implements BaseEntity {
public static final long serialVersionUID = 202310100926001L;
- /*
+ /* 濡傛灉涓嶆槑纭� type绫诲瀷锛孧P灏嗚嚜鍔ㄤ负鍏惰祴鍊硷紙闆姳ID锛�
IdType:
AUTO(0), //鑷
NONE(1), //鏈缃富閿�
@@ -40,47 +51,93 @@
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 userId;
public Long id;
+
+
+ @Schema(description = "鎵�灞炵墖鍖篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableField(value = "blockId")
+ public Long blockId ;
/**
* 鐢ㄦ埛濮撳悕
*/
- public String name;
+ @Schema(description = "濮撳悕", requiredMode = Schema.RequiredMode.REQUIRED)
+ @NotEmpty(message = "濮撳悕涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
+ @Length(message = "濮撳悕涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 2, max = 25)
+ public String userName;
/**
* 鎵嬫満鍙凤紝鎵嬫満鍙风敤浜庣櫥褰曠郴缁�
*/
+ @Schema(description = "鎵嬫満鍙�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @Length(message = "鎵嬫満鍙峰繀椤粄max}浣嶆暟鎹�", min = 11, max = 11)
public String phone;
/**
* 瀵嗙爜锛屽瘑鐮佺殑MD5鍔犲瘑
*/
+ @Schema(description = "瀵嗙爜", requiredMode = Schema.RequiredMode.REQUIRED)
+ @Length(message = "瀵嗙爜蹇呴』{max}浣嶆暟鎹�", min = 6, max = 6)
public String password;
/**
* 渚涙按鏈烘瀯鏍囩
*/
+ @TableField(value = "orgTag")
+ @JSONField(serialize = false)
public String orgTag;
/**
* 鏄惁瓒呯骇绠＄悊鍛� 1:鏄�,0:鍚�
*/
+ @Schema(hidden = true)
+ @TableField(value = "supperAdmin")
+ @JSONField(serialize = false)
public Byte supperAdmin;
/**
* 鏄惁绂佺敤 0:鍚�,1:鏄�
*/
+ @Schema(description = "鏄惁绂佺敤", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Disabled disabled;
/**
* 鏄惁鍒犻櫎: 0琛ㄧず鏈垹闄� 1琛ㄧず鍒犻櫎.
*/
+ @Schema(description = "鍒犻櫎鏍囪瘑锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Deleted deleted;
+
/**
- * 鐢ㄦ埛鎵�鎷ユ湁鐨勬潈闄�
+ * 鐢ㄦ埛鎵�灞炶鑹睮d
*/
- @TableField(exist=false)
+ @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;
+
+ /**
+ * 鎵�灞炵墖鍖哄悕绉�
+ */
+ @Schema(description = "鎵�灞炵墖鍖哄悕绉帮紝鐢ㄤ簬鏄剧ず锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @TableField(exist = false)
+ public String blockName ;
}
\ No newline at end of file
--
Gitblit v1.8.0