From 7ee6e3feeda334e40da912f0e31898e08b59de46 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 04 八月 2023 17:28:48 +0800
Subject: [PATCH] 修复雷达引导相机为null的bug

---
 ard-work/src/main/java/com/ruoyi/device/external/domain/ArdEquipExternal.java |  214 ++++++++++++++++++++++++----------------------------
 1 files changed, 99 insertions(+), 115 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/external/domain/ArdEquipExternal.java b/ard-work/src/main/java/com/ruoyi/device/external/domain/ArdEquipExternal.java
index 24f385a..d4ef464 100644
--- a/ard-work/src/main/java/com/ruoyi/device/external/domain/ArdEquipExternal.java
+++ b/ard-work/src/main/java/com/ruoyi/device/external/domain/ArdEquipExternal.java
@@ -6,10 +6,10 @@
 import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
- * external瀵硅薄 ard_equip_external
- * 
- * @author zj
- * @date 2023-03-13
+ * 澶栬仈璁惧绠＄悊瀵硅薄 ard_equip_external
+ *
+ * @author ard
+ * @date 2023-07-07
  */
 public class ArdEquipExternal extends BaseEntity
 {
@@ -30,194 +30,178 @@
     @Excel(name = "鍘傚晢")
     private String factory;
 
-    /** 鎶ヨ鍖哄煙 */
-    @Excel(name = "鎶ヨ鍖哄煙")
-    private String region;
-
     /** ip */
     @Excel(name = "ip")
     private String ip;
 
-    /** 瀹夎楂樺害 */
-    @Excel(name = "瀹夎楂樺害")
-    private String altitude;
+    /** 绔彛 */
+    @Excel(name = "绔彛")
+    private Integer port;
 
     /** 鐢ㄦ埛鍚� */
-    @Excel(name = "鐢ㄦ埛鍚�")
     private String username;
 
     /** 瀵嗙爜 */
-    @Excel(name = "瀵嗙爜")
     private String password;
+
+    /** 缁忓害 */
+    @Excel(name = "缁忓害")
+    private Double longitude;
+
+    /** 绾害 */
+    @Excel(name = "绾害")
+    private Double latitude;
+
+    /** 瀹夎楂樺害 */
+    @Excel(name = "瀹夎楂樺害")
+    private Double altitude;
 
     /** 閮ㄩ棬id */
     @Excel(name = "閮ㄩ棬id")
-    private String deptId;
+    private Integer deptId;
 
     /** 鐢ㄦ埛id */
     @Excel(name = "鐢ㄦ埛id")
     private String userId;
 
-    /** 绔彛 */
-    @Excel(name = "绔彛")
-    private String port;
-
-    /** 缁忓害 */
-    @Excel(name = "缁忓害")
-    private String longitude;
-
-    /** 绾害 */
-    @Excel(name = "绾害")
-    private String latitude;
-
-    public void setId(String id) 
+    public void setId(String id)
     {
         this.id = id;
     }
 
-    public String getId() 
+    public String getId()
     {
         return id;
     }
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
-    public void setType(String type) 
+    public void setType(String type)
     {
         this.type = type;
     }
 
-    public String getType() 
+    public String getType()
     {
         return type;
     }
-    public void setFactory(String factory) 
+    public void setFactory(String factory)
     {
         this.factory = factory;
     }
 
-    public String getFactory() 
+    public String getFactory()
     {
         return factory;
     }
-    public void setRegion(String region) 
-    {
-        this.region = region;
-    }
-
-    public String getRegion() 
-    {
-        return region;
-    }
-    public void setIp(String ip) 
+    public void setIp(String ip)
     {
         this.ip = ip;
     }
 
-    public String getIp() 
+    public String getIp()
     {
         return ip;
     }
-    public void setAltitude(String altitude) 
-    {
-        this.altitude = altitude;
-    }
-
-    public String getAltitude() 
-    {
-        return altitude;
-    }
-    public void setUsername(String username) 
-    {
-        this.username = username;
-    }
-
-    public String getUsername() 
-    {
-        return username;
-    }
-    public void setPassword(String password) 
-    {
-        this.password = password;
-    }
-
-    public String getPassword() 
-    {
-        return password;
-    }
-    public void setDeptId(String deptId) 
-    {
-        this.deptId = deptId;
-    }
-
-    public String getDeptId() 
-    {
-        return deptId;
-    }
-    public void setUserId(String userId) 
-    {
-        this.userId = userId;
-    }
-
-    public String getUserId() 
-    {
-        return userId;
-    }
-    public void setPort(String port) 
+    public void setPort(Integer port)
     {
         this.port = port;
     }
 
-    public String getPort() 
+    public Integer getPort()
     {
         return port;
     }
-    public void setLongitude(String longitude) 
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+    public void setPassword(String password)
+    {
+        this.password = password;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+    public void setLongitude(Double longitude)
     {
         this.longitude = longitude;
     }
 
-    public String getLongitude() 
+    public Double getLongitude()
     {
         return longitude;
     }
-    public void setLatitude(String latitude) 
+    public void setLatitude(Double latitude)
     {
         this.latitude = latitude;
     }
 
-    public String getLatitude() 
+    public Double getLatitude()
     {
         return latitude;
+    }
+    public void setAltitude(Double altitude)
+    {
+        this.altitude = altitude;
+    }
+
+    public Double getAltitude()
+    {
+        return altitude;
+    }
+    public void setDeptId(Integer deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Integer getDeptId()
+    {
+        return deptId;
+    }
+    public void setUserId(String userId)
+    {
+        this.userId = userId;
+    }
+
+    public String getUserId()
+    {
+        return userId;
     }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("updateTime", getUpdateTime())
-            .append("name", getName())
-            .append("type", getType())
-            .append("factory", getFactory())
-            .append("region", getRegion())
-            .append("ip", getIp())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("altitude", getAltitude())
-            .append("username", getUsername())
-            .append("password", getPassword())
-            .append("deptId", getDeptId())
-            .append("userId", getUserId())
-            .append("port", getPort())
-            .append("longitude", getLongitude())
-            .append("latitude", getLatitude())
-            .toString();
+                .append("id", getId())
+                .append("name", getName())
+                .append("type", getType())
+                .append("factory", getFactory())
+                .append("ip", getIp())
+                .append("port", getPort())
+                .append("username", getUsername())
+                .append("password", getPassword())
+                .append("longitude", getLongitude())
+                .append("latitude", getLatitude())
+                .append("altitude", getAltitude())
+                .append("deptId", getDeptId())
+                .append("userId", getUserId())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .toString();
     }
 }

--
Gitblit v1.9.3