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/pojoDemo/DemoUser.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoUser.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoUser.java
index 8df3d60..83860ea 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoUser.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoDemo/DemoUser.java
@@ -3,6 +3,7 @@
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.mybatis.envm.Deleted;
@@ -10,7 +11,7 @@
import com.dy.common.po.BaseEntity;
import lombok.*;
-@TableName(autoResultMap = true)
+@TableName(value="demo_user", autoResultMap = true)
@Data
@Builder
@ToString
@@ -28,13 +29,15 @@
public String password ;
+ public Disabled disabled ;
+
+ public Deleted deleted ;
+
+ @TableField(exist = false)
public DemoAddress address ;
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long roleId ;
- public Disabled disabled ;
-
- public Deleted deleted ;
}
--
Gitblit v1.8.0