Merge branch 'ljl1216' into 'master'

fix: 设备相关

See merge request huang/thingsboard3.3.2!16

@@ -73,4 +73,5 @@ public class DeviceDTO extends TenantDTO {
   /** 告警状态：0：正常 1：告警 */
   /** 告警状态：0：正常 1：告警 */
   @ApiModelProperty(value="告警状态:0正常,1告警")
   @ApiModelProperty(value="告警状态:0正常,1告警")
   private Integer alarmStatus;
   private Integer alarmStatus;
+  private String description;
 }
 }

@@ -31,7 +31,7 @@ public class DeviceProfileDTO extends TenantDTO {
     @NotEmpty(message = "传输协议不能为空或者空字符串", groups = AddGroup.class)
     @NotEmpty(message = "传输协议不能为空或者空字符串", groups = AddGroup.class)
     @ApiModelProperty(value = "传输协议", required = true)
     @ApiModelProperty(value = "传输协议", required = true)
     @NotEmpty(message = "传输协议不能为空或者二空字符串")
     @NotEmpty(message = "传输协议不能为空或者二空字符串")
-    private DeviceTransportType transportType;
+    private String transportType;
     /**
     /**
      * TB的设备配置文件
      * TB的设备配置文件
      */
      */
@@ -58,7 +58,7 @@ public class DeviceProfileDTO extends TenantDTO {
         setCreateTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneOffset.UTC));
         setCreateTime(LocalDateTime.ofInstant(Instant.ofEpochMilli(time), ZoneOffset.UTC));
         this.name = name;
         this.name = name;
         this.description = description;
         this.description = description;
-        this.transportType = transportType;
+        this.transportType = transportType.name();
         this.defaultRuleChainId = Optional.ofNullable(defaultRuleChainId).map(chainId -> chainId.toString()).orElse(null);
         this.defaultRuleChainId = Optional.ofNullable(defaultRuleChainId).map(chainId -> chainId.toString()).orElse(null);
     }
     }
 
 
@@ -68,7 +68,7 @@ public class DeviceProfileDTO extends TenantDTO {
         this.name = name;
         this.name = name;
         this.description = description;
         this.description = description;
         this.convertJs = convertJs;
         this.convertJs = convertJs;
-        this.transportType = transportType;
+        this.transportType = transportType.name();
         this.defaultRuleChainId = defaultRuleChainId.toString();
         this.defaultRuleChainId = defaultRuleChainId.toString();
         this.profileData = profileData;
         this.profileData = profileData;
     }
     }

@@ -38,4 +38,5 @@ public class YtDevice extends TenantBaseEntity {
   private String organizationId;
   private String organizationId;
   /** 告警状态：0：正常 1：告警 */
   /** 告警状态：0：正常 1：告警 */
   private Integer alarmStatus;
   private Integer alarmStatus;
+  private String description;
 }
 }

@@ -241,12 +241,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
   @Override
   @Override
   public Optional<DeviceDTO> getDevice(String tenantId,String id) {
   public Optional<DeviceDTO> getDevice(String tenantId,String id) {
     return Optional.ofNullable(
     return Optional.ofNullable(
-            baseMapper.selectOne(
-                new QueryWrapper<YtDevice>()
-                    .lambda()
-                    .eq(YtDevice::getTenantId, tenantId)
-                    .eq(YtDevice::getId, id)))
-        .map(device -> device.getDTO(DeviceDTO.class));
+            baseMapper.selectDetail(tenantId,id));
   }
   }
 
 
   @Override
   @Override

@@ -15,4 +15,6 @@ public interface DeviceMapper extends BaseMapper<YtDevice> {
 
 
     IPage<DeviceDTO> getDevicePage(
     IPage<DeviceDTO> getDevicePage(
             IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
             IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
+
+    DeviceDTO selectDetail(@Param("tenantId") String tenantId,@Param("id") String id);
 }
 }

@@ -21,22 +21,26 @@
         <result property="updateTime" column="update_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="creator" column="creator"/>
         <result property="creator" column="creator"/>
         <result property="updater" column="updater"/>
         <result property="updater" column="updater"/>
+        <result property="description" column="description"/>
         <result property="organizationId" column="organization_id"/>
         <result property="organizationId" column="organization_id"/>
         <association property="deviceProfile" javaType="org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO">
         <association property="deviceProfile" javaType="org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO">
             <result property="name" column="profile_name"/>
             <result property="name" column="profile_name"/>
+            <result property="transportType" column="transport_type"/>
         </association>
         </association>
         <association property="organizationDTO" javaType="org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO">
         <association property="organizationDTO" javaType="org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO">
             <result property="name" column="organization_name"/>
             <result property="name" column="organization_name"/>
         </association>
         </association>
     </resultMap>
     </resultMap>
     <sql id="columns">
     <sql id="columns">
-        ifd.id,ifd.name,ifd.device_info,ifd.profile_id,ifd.active_time,ifd.device_token,ifd.tenant_id
+        ifd.id,ifd.name,ifd.device_info,ifd.profile_id,ifd.active_time,ifd.device_token,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,
         ,ifd.tb_device_id,ifd.label,ifd.last_connect_time,ifd.device_type,ifd.device_state,ifd.create_time,ifd.update_time,ifd.creator,
         ifd.updater,ifd.organization_id,ifd,alarm_status
         ifd.updater,ifd.organization_id,ifd,alarm_status
+        ,ifdp.name AS profile_name,ifdp.transport_type
+        ,io.name AS organization_name
     </sql>
     </sql>
     <select id="getDevicePage" resultMap="deviceMap">
     <select id="getDevicePage" resultMap="deviceMap">
         SELECT
         SELECT
-        <include refid="columns"/>,ifdp.name AS profile_name,io.name AS organization_name
+        <include refid="columns"/>
         FROM iotfs_device ifd
         FROM iotfs_device ifd
         LEFT JOIN device_profile ifdp ON ifd.profile_id = CAST (ifdp.id AS VARCHAR)
         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_organization io ON io.id = ifd.organization_id
@@ -67,4 +71,22 @@
             </if>
             </if>
         </where>
         </where>
     </select>
     </select>
+
+
+    <select id="selectDetail" resultMap="deviceMap">
+        SELECT
+        <include refid="columns"/>
+        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
+        <where>
+            <if test="tenantId !=null and tenantId !=''">
+                AND ifd.tenant_id = #{tenantId}
+            </if>
+            <if test="id !=null and id !=''">
+                AND ifd.id = #{id}
+            </if>
+
+        </where>
+    </select>
 </mapper>
 </mapper>