设备添加楼层与楼栋

fill-manager/db/add.sql

@@ -36,4 +36,13 @@ ALTER TABLE mortals_xhx_device
 ALTER TABLE mortals_xhx_device
     ADD COLUMN `onlineTime` datetime DEFAULT NULL COMMENT '最近上线时间' AFTER enabled;
 ALTER TABLE mortals_xhx_device
-    ADD COLUMN `offlineTime` datetime DEFAULT NULL COMMENT '最近离线时间' AFTER onlineTime;
+    ADD COLUMN `offlineTime` datetime DEFAULT NULL COMMENT '最近离线时间' AFTER onlineTime;
\ No newline at end of file
+
+-- ----------------------------
+2024-01-15
+-- ----------------------------
+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

fill-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java

@@ -2,6 +2,9 @@ package com.mortals.xhx.module.device.model;
 import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
+import java.math.BigDecimal;
+import cn.hutool.core.date.DateUtil;
+import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
@@ -11,7 +14,7 @@ import lombok.Data;
  * 设备实体对象
  *
  * @author zxfei
- * @date 2023-06-21
+ * @date 2024-01-15
  */
 @Data
 public class DeviceEntity extends DeviceVo {
@@ -45,6 +48,26 @@ public class DeviceEntity extends DeviceVo {
      * 站点名称
      */
     private String siteName;
+    /**
+     * 设备生产厂商ID
+     */
+    private Long deviceFirmId;
+    /**
+     * 设备生产厂商名称
+     */
+    private String deviceFirmname;
+    /**
+     * 设备访问ip
+     */
+    private String ip;
+    /**
+     * 端口
+     */
+    private String port;
+    /**
+     * 启用状态 (0.停止，1.启用)
+     */
+    private Integer enabled;
     /**
      * 产品编码
      */
@@ -82,29 +105,17 @@ public class DeviceEntity extends DeviceVo {
      */
     private String deviceRemark;
     /**
-     * 设备来源(0.旧设备，1.新设备)
+     * 所属机构
      */
-    private Integer source;
+    private String belong;
     /**
-     * 设备生产厂商ID
+     * 所属楼栋
      */
-    private Long deviceFirmId;
+    private Integer deviceInBuilding;
     /**
-     * 设备生产厂商名称
+     * 所属楼层
      */
-    private String deviceFirmname;
-    /**
-     * 设备访问ip
-     */
-    private String ip;
-    /**
-     * 端口
-     */
-    private String port;
-    /**
-     * 启用状态 (0.停止，1.启用)
-     */
-    private Integer enabled;
+    private Integer deviceInFloor;
     /**
      * 最近上线时间
      */
@@ -113,6 +124,10 @@ public class DeviceEntity extends DeviceVo {
      * 最近离线时间
      */
     private Date offlineTime;
+    /**
+     * 设备来源(0.旧设备，1.新设备)
+     */
+    private Integer source;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -130,53 +145,32 @@ public class DeviceEntity extends DeviceVo {
     }
 
     public void initAttrValue(){
-
-        this.deviceId = -1L;
-
+        this.deviceId = null;
         this.deviceName = "";
-
         this.deviceCode = "";
-
         this.deviceMac = "";
-
-        this.siteId = -1L;
-
+        this.siteId = null;
         this.siteCode = "";
-
         this.siteName = "";
-
+        this.deviceFirmId = null;
+        this.deviceFirmname = "";
+        this.ip = "";
+        this.port = "";
+        this.enabled = 0;
         this.productCode = "";
-
         this.productName = "";
-
         this.deviceSrc = 2;
-
         this.lon = "";
-
         this.lati = "";
-
         this.leadingOfficial = "";
-
         this.leadingOfficialTelephone = "";
-
         this.deviceStatus = 0;
-
         this.deviceRemark = "";
-
+        this.belong = "";
+        this.deviceInBuilding = 0;
+        this.deviceInFloor = 0;
+        this.onlineTime = new Date();
+        this.offlineTime = new Date();
         this.source = 1;
-
-        this.deviceFirmId = -1L;
-
-        this.deviceFirmname = "";
-
-        this.ip = "";
-
-        this.port = "";
-
-        this.enabled = 0;
-
-        this.onlineTime = null;
-
-        this.offlineTime = null;
     }
 }
\ No newline at end of file