From 7d885c1d4c86f40927af50e6e7bfa13aac0c2180 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 21 十二月 2023 21:47:15 +0800
Subject: [PATCH] 1、common模块优化代码，Command命令中增加RTU命令结果返回webRul; 2、通信中间件增加了接收http下发RTU命令和内部命令的Controler； 3、RTU模拟器和控制器增加了上报完数据是否关闭TCP连接的控制。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaUser.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 bb7bf2a..ed531ba 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
@@ -55,6 +55,12 @@
@Schema(description = "瀹炰綋id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
public Long id;
+
+ @Schema(description = "鎵�灞炵墖鍖篒D", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ @TableField(value = "blockId")
+ public Long blockId ;
+
/**
* 鐢ㄦ埛濮撳悕
*/
@@ -87,6 +93,7 @@
/**
* 鏄惁瓒呯骇绠＄悊鍛� 1:鏄�,0:鍚�
*/
+ @Schema(hidden = true)
@TableField(value = "supperAdmin")
@JSONField(serialize = false)
public Byte supperAdmin;
@@ -105,21 +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;//姝ょ鏂瑰紡鍙橀噺涓嶅瓨搴擄紝 涔熶笉鍙備笌搴忓垪鍖栦簡
/**
- * 鐢ㄦ埛鎵�灞炶鑹睮d
+ * 鎵�灞炵墖鍖哄悕绉�
*/
+ @Schema(description = "鎵�灞炵墖鍖哄悕绉帮紝鐢ㄤ簬鏄剧ず锛岃〃鍗曚笉鐢ㄥ～鍐�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@TableField(exist = false)
- public String[] roleIds ;
+ public String blockName ;
}
\ No newline at end of file
--
Gitblit v1.8.0