From 0be32a3805e1430b82b5bded8bd23946e274fa84 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 06 十一月 2024 14:27:35 +0800
Subject: [PATCH] 优化虚拟卡占用逻辑，占用时写入取水口编号，解除占用时清空虚拟卡编号；工单使用的4个表
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 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 73270a4..98733f8 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
@@ -51,8 +51,9 @@
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;
@@ -67,7 +68,7 @@
@Schema(description = "濮撳悕", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "濮撳悕涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
@Length(message = "濮撳悕涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 2, max = 25)
- public String name;
+ public String userName;
/**
* 鎵嬫満鍙凤紝鎵嬫満鍙风敤浜庣櫥褰曠郴缁�
@@ -80,7 +81,7 @@
* 瀵嗙爜锛屽瘑鐮佺殑MD5鍔犲瘑
*/
@Schema(description = "瀵嗙爜", requiredMode = Schema.RequiredMode.REQUIRED)
- @Length(message = "瀵嗙爜蹇呴』{max}浣嶆暟鎹�", min = 6, max = 6)
+ @Length(message = "瀵嗙爜蹇呴』{max}浣嶆暟鎹�", min = 5, max = 20)
public String password;
/**
@@ -93,6 +94,7 @@
/**
* 鏄惁瓒呯骇绠＄悊鍛� 1:鏄�,0:鍚�
*/
+ @Schema(hidden = true)
@TableField(value = "supperAdmin")
@JSONField(serialize = false)
public Byte supperAdmin;
@@ -111,29 +113,32 @@
/**
- * 鐢ㄦ埛鎵�灞炶鑹�
- */
- @TableField(exist = false)
- public List<?> roleList ;
-
- /**
- * 鐢ㄦ埛鎵�鎷ユ湁鐨勬潈闄�
- */
- @TableField(exist = false)
- public List<Integer> privileges;
- //public transient List<Integer> privileges;//姝ょ鏂瑰紡鍙橀噺涓嶅瓨搴擄紝 涔熶笉鍙備笌搴忓垪鍖栦簡
-
- /**
* 鐢ㄦ埛鎵�灞炶鑹睮d
*/
- @Schema(hidden = true)
+ @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)
+ @Schema(description = "鎵�灞炵墖鍖哄悕绉帮紝鐢ㄤ簬鏄剧ず锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@TableField(exist = false)
public String blockName ;
}
\ No newline at end of file
--
Gitblit v1.8.0