fix: 存在设备别名时优先显示别名

@@ -43,6 +43,7 @@ public class DeviceDTO extends TenantDTO {
     @ApiModelProperty(value = "关联网关设备")
     private String gatewayId;
     private String gatewayName;
+    private String gatewayAlias;
 
     @ApiModelProperty(value = "设备凭证")
     private TkCredentialsDto deviceToken;

 package org.thingsboard.server.common.data.yunteng.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
 
+import java.time.LocalDateTime;
+
 @Data
 public class RelationDeviceDTO {
     private String tbDeviceId;
     private String tbDeviceName;
+    private String alias;
     private String label;
     private DeviceState deviceState;
-    private Long createdTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    private LocalDateTime createdTime;
     private Long lastOnlineTime;
 
     public void setDeviceState(boolean deviceState) {

@@ -39,6 +39,7 @@
         <result property="organizationId" column="organization_id"/>
         <result property="gatewayId" column="gateway_id"/>
         <result property="gatewayName" column="gateway_name"/>
+        <result property="gatewayAlias" column="gateway_alias"/>
         <association property="deviceProfile"
                      javaType="org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO">
             <result property="name" column="profile_name"/>
@@ -50,8 +51,9 @@
         </association>
     </resultMap>
     <resultMap id="relationDeviceMap" type="org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO">
-        <result property="tbDeviceId" column="id"/>
+        <result property="tbDeviceId" column="tb_device_id"/>
         <result property="tbDeviceName" column="name"/>
+        <result property="alias" column="alias"/>
         <result property="label" column="label"/>
         <result property="deviceState" column="status"/>
         <result property="createdTime" column="created_time"/>
@@ -71,7 +73,7 @@
     </sql>
     <sql id="detailColumns">
         <include refid="pageColumns"/>
-        ,ifd.gateway_id,idg.name gateway_name
+        ,ifd.gateway_id,idg.name gateway_name,idg.alias gateway_alias
     </sql>
     <sql id="pageColumns">
         <include refid="basicColumns"/>
@@ -209,27 +211,26 @@
     </select>
     <select id="getRelationDevicePage" resultMap="relationDeviceMap">
         SELECT
-        de.id,
+        de.tb_device_id,
         de.name,
+        de.alias,
         de.label,
-        de.created_time,
+        de.create_time as created_time,
         A.bool_v AS status,
         b.long_v AS last_online_time
         FROM
-        device de
-        LEFT JOIN relation rt ON de."id" = rt.to_id
-        LEFT JOIN attribute_kv A ON de."id" = A.entity_id
+        tk_device de
+        LEFT JOIN relation rt ON de.tb_device_id::uuid = rt.to_id
+        LEFT JOIN attribute_kv A ON de.tb_device_id::uuid = A.entity_id
         AND A.entity_type = 'DEVICE'
         AND A.attribute_key = 'active'
-        LEFT JOIN attribute_kv b ON de."id" = b.entity_id
+        LEFT JOIN attribute_kv b ON de.tb_device_id::uuid = b.entity_id
         AND b.entity_type = 'DEVICE'
         AND b.attribute_key = 'lastActivityTime'
         <where>
             rt.from_id ::TEXT = #{queryMap.fromId}
-            AND de.tenant_id ::TEXT = #{queryMap.tenantId}
-            <if test="queryMap.customerId !=null and queryMap.customerId !=''">
-                AND de.customer_id ::TEXT = #{queryMap.customerId}
-            </if>
+            AND de.tenant_id  = #{queryMap.tenantId}
+
             <if test="queryMap.name !=null and queryMap.name !=''">
                 AND de.name LIKE concat('%',#{queryMap.name}::TEXT,'%')
             </if>