fix: 关联网关的传感器没有网关信息

@@ -74,7 +74,7 @@ public class YtDeviceController extends BaseController {
     }
     DeviceDTO newDeviceDTO = null;
     boolean isIncludeRelation = false;
-    String gateWayDeviceId = deviceDTO.getGateWayDeviceId();
+    String gateWayDeviceId = deviceDTO.getGatewayId();
     DeviceDTO gateWayDevice = null;
     if (StringUtils.isNotEmpty(gateWayDeviceId)) {
       gateWayDevice =

@@ -38,7 +38,8 @@ public class DeviceDTO extends TenantDTO {
   private String profileId;
 
   @ApiModelProperty(value = "关联网关设备")
-  private String gateWayDeviceId;
+  private String gatewayId;
+  private String gatewayName;
 
   @ApiModelProperty(value = "设备凭证")
   private YtCredentialsDto deviceToken;

@@ -24,6 +24,7 @@ public class YtDevice extends TenantBaseEntity {
   private JsonNode deviceInfo;
   private String profileId;
   private String tbDeviceId;
+  private String gatewayId;
   private String deviceTypeId;
   private String label;
   @TableField(typeHandler = EnumTypeHandler.class)

@@ -25,6 +25,8 @@
         <result property="description" column="description"/>
         <result property="customerId" column="customer_id"/>
         <result property="organizationId" column="organization_id"/>
+        <result property="gatewayId" column="gateway_id"/>
+        <result property="gatewayName" column="gateway_name"/>
         <association property="deviceProfile" javaType="org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO">
             <result property="name" column="profile_name"/>
             <result property="transportType" column="transport_type"/>
@@ -41,6 +43,7 @@
         <result property="createdTime" column="created_time"/>
         <result property="lastOnlineTime" column="last_online_time"/>
     </resultMap>
+
     <sql id="basicColumns">
         ifd.id,ifd.name,ifd.device_info,ifd.profile_id,ifd.active_time,ifd.tenant_id,ifd.description
         ,ifd.tb_device_id,ifd.label,ifd.last_connect_time,ifd.device_type,ifd.device_state,ifd.create_time,ifd.update_time,ifd.creator,
@@ -48,6 +51,7 @@
     </sql>
     <sql id="detailColumns">
         <include refid="basicColumns"/>
+        ,ifd.gateway_id,idg.name gateway_name
         ,ifdp.name AS profile_name,ifdp.transport_type
         ,io.name AS organization_name
     </sql>
@@ -109,6 +113,7 @@
         FROM iotfs_device ifd
         LEFT JOIN device_profile ifdp ON ifd.profile_id = CAST (ifdp.id AS VARCHAR)
         LEFT JOIN iotfs_organization io ON io.id = ifd.organization_id
+        LEFT JOIN iotfs_device idg ON idg.id = ifd.gateway_id
         <where>
             <if test="tenantId !=null and tenantId !=''">
                 AND ifd.tenant_id = #{tenantId}