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/BaRolePrivilege.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
index d5cbc2f..ccf3c1a 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRolePrivilege.java
@@ -1,10 +1,17 @@
 package com.dy.pipIrrGlobal.pojoBa;
 
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+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.po.BaseEntity;
 import lombok.*;
-
-@TableName(autoResultMap = true)
+/**
+ * 瑙掕壊涓庢潈闄愬叧绯诲疄浣�
+ */
+@TableName(value="ba_role_privilege", autoResultMap = true)
 @Data
 @Builder
 @ToString
@@ -14,8 +21,12 @@
 
     public static final long serialVersionUID = 202311062027001L;
 
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableField(value = "roleId")
     public Long roleId;
 
+    @JSONField(serializeUsing= ObjectWriterImplToString.class)
+    @TableField(value = "privilegeId")
     public Long privilegeId;
 
 }
\ No newline at end of file

--
Gitblit v1.8.0