设备导入字段调整

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

@@ -25,7 +25,7 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 设备编码,SN码等，默认为MAC地址
      */
-    @Excel(name = "设备编码")
+    @Excel(name = "设备编码,SN码等，默认为MAC地址")
     private String deviceCode;
     /**
      * 设备的MAC地址
@@ -130,6 +130,7 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 设备图片
      */
+    @Excel(name = "设备图片")
     private String devicePhotoPath;
     /**
      * 设备访问ip
@@ -183,6 +184,7 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 设备SN码
      */
+    @Excel(name = "设备SN码")
     private String deviceSN;
     /**
      * 设备版本
@@ -191,7 +193,6 @@ public class DeviceEntity extends DeviceVo {
     /**
      * 产品编码
      */
-    @Excel(name = "产品类型")
     private String productCode;
     /**
      * 大厅Id
@@ -214,6 +215,18 @@ public class DeviceEntity extends DeviceVo {
      * 是否显示小程序二维码(0.否，1.是)
      */
     private Integer showWechatQrCode;
+    /**
+     * 所属机构
+     */
+    private String orgName;
+    /**
+     * 设备分辨率
+     */
+    private String resolution;
+    /**
+     * 设备分辨率值
+     */
+    private String resolutionValue;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -231,98 +244,55 @@ public class DeviceEntity extends DeviceVo {
     }
 
     public void initAttrValue(){
-
         this.deviceName = "";
-
         this.deviceCode = "";
-
         this.deviceMac = "";
-
         this.siteId = null;
-
         this.siteCode = "";
-
         this.siteName = "";
-
         this.platformId = null;
-
         this.platformName = "";
-
         this.productId = null;
-
         this.productName = "";
-
         this.skinId = null;
-
         this.skinName = "";
-
         this.homeUrl = "";
-
         this.deviceFirmId = null;
-
         this.deviceFirmname = "";
-
         this.deviceSrc = 2;
-
         this.deviceDataSourceWay = 0;
-
         this.lon = "";
-
         this.lati = "";
-
-        this.deviceInBuilding = null;
-
-        this.deviceInFloor = null;
-
-        this.defectsLiabilityPeriod = null;
-
+        this.deviceInBuilding = 0;
+        this.deviceInFloor = 0;
+        this.defectsLiabilityPeriod = new Date();
         this.leadingOfficial = "";
-
         this.leadingOfficialTelephone = "";
-
         this.isReceiveMess = 0;
-
         this.devicePhotoPath = "";
-
         this.ip = "";
-
         this.centernum = "";
-
         this.port = "";
-
         this.deviceTopic = "";
-
         this.deviceStatus = 0;
-
         this.enabled = 0;
-
         this.deviceAuthCode = "";
-
         this.deviceRemark = "";
-
-        this.onlineTime = null;
-
-        this.offlineTime = null;
-
+        this.onlineTime = new Date();
+        this.offlineTime = new Date();
         this.deleted = 0;
-
         this.source = 1;
-
         this.deviceSN = "";
-
         this.deviceVersion = "";
-
         this.productCode = "";
-
         this.hallId = null;
-
         this.hallName = "";
-
         this.showSms = 1;
-
         this.showPrint = 1;
-
         this.showWechatQrCode = 1;
+        this.orgName = "";
+        this.resolution = "";
+        this.resolutionValue = "";
     }
 
 }