From ca732f4322b320add274403a9d2ffa175d78089f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Wed, 13 Mar 2024 17:06:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80pom.xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xhx/common/pdu/device/DevicePdu.java      | 24 +++++++++++++++++++
 sample-form-manager/db/add.sql                |  5 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DevicePdu.java b/common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DevicePdu.java
index 01fc936..cf51f1d 100644
--- a/common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DevicePdu.java
+++ b/common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DevicePdu.java
@@ -86,10 +86,34 @@ public class DevicePdu extends BaseEntityLong {
     */
     private Integer source;
 
+    /**
+     * 璁惧鐢熶骇鍘傚晢ID
+     */
+    private Long deviceFirmId;
+    /**
+     * 璁惧鐢熶骇鍘傚晢鍚嶇О
+     */
+    private String deviceFirmname;
+    /**
+     * 璁惧璁块棶ip
+     */
+    private String ip;
+    /**
+     * 绔彛
+     */
+    private String port;
     /**
      * 鍚敤鐘舵€� (0.鍋滄锛�1.鍚敤)
      */
     private Integer enabled;
+    /**
+     * 鏈€杩戜笂绾挎椂闂�
+     */
+    private Date onlineTime;
+    /**
+     * 鏈€杩戠绾挎椂闂�
+     */
+    private Date offlineTime;
 
 public void initAttrValue(){
 
diff --git a/sample-form-manager/db/add.sql b/sample-form-manager/db/add.sql
index 9288c2c..f402d9a 100644
--- a/sample-form-manager/db/add.sql
+++ b/sample-form-manager/db/add.sql
@@ -64,4 +64,7 @@ ALTER TABLE mortals_xhx_device
     ADD COLUMN `deviceInBuilding` tinyint(4)      COMMENT '鎵€灞炴ゼ鏍�';
 
 ALTER TABLE mortals_xhx_device
-    ADD COLUMN `deviceInFloor` tinyint(4)      COMMENT '鎵€灞炴ゼ灞�';
\ No newline at end of file
+    ADD COLUMN `deviceInFloor` tinyint(4)      COMMENT '鎵€灞炴ゼ灞�';
+
+ALTER TABLE mortals_xhx_device
+    ADD COLUMN `resolution`   varchar(64)      COMMENT '鍒嗚鲸鐜�';
-- 
2.24.3