perf: 查询设备列表，增加设备传输协议过滤

@@ -33,10 +33,7 @@ import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.*;
-import org.thingsboard.server.common.data.yunteng.enums.DataTypeEnum;
-import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
-import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
-import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.*;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.controller.BaseController;
@@ -383,14 +380,16 @@ public class TkDeviceController extends BaseController {
       @ApiParam(value = "设备标签") @RequestParam(value = "deviceLabel", required = false)
       @ApiParam(value = "设备标签") @RequestParam(value = "deviceLabel", required = false)
           String deviceLabel,
           String deviceLabel,
       @ApiParam(value = "设备配置ID") @RequestParam(value = "deviceProfileId", required = false)
       @ApiParam(value = "设备配置ID") @RequestParam(value = "deviceProfileId", required = false)
-          String deviceProfileId)
+          String deviceProfileId,
+      @ApiParam(value = "传输协议类型") @RequestParam(value = "transportType", required = false)
+      TransportTypeEnum transportType)
       throws ThingsboardException {
       throws ThingsboardException {
     return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
     return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
         deviceType,
         deviceType,
         getCurrentUser().getCurrentTenantId(),
         getCurrentUser().getCurrentTenantId(),
         organizationId,
         organizationId,
         deviceLabel,
         deviceLabel,
-        deviceProfileId);
+        deviceProfileId,transportType);
   }
   }
 
 
 
 

@@ -348,14 +348,15 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
       String tenantId,
       String tenantId,
       String organizationId,
       String organizationId,
       String deviceLabel,
       String deviceLabel,
-      String deviceProfileId) {
+      String deviceProfileId,
+      TransportTypeEnum transportTypeEnum) {
     List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
     List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
     if (orgIds.isEmpty()) {
     if (orgIds.isEmpty()) {
       throw new TkDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
       throw new TkDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
     }
     }
     return baseMapper.findDevicesByDeviceTypeAndOrganizationId(orgIds,
     return baseMapper.findDevicesByDeviceTypeAndOrganizationId(orgIds,
             deviceType==null?null:deviceType.name()
             deviceType==null?null:deviceType.name()
-            ,deviceLabel,deviceProfileId);
+            ,deviceLabel,deviceProfileId,transportTypeEnum);
   }
   }
 
 
   @Override
   @Override

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.*;
+import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceEntity;
 
 
 import java.util.List;
 import java.util.List;
@@ -152,5 +153,6 @@ public interface DeviceMapper extends BaseMapper<TkDeviceEntity> {
           @Param("orgIds")List<String> orgIds,
           @Param("orgIds")List<String> orgIds,
           @Param("deviceType") String deviceType,
           @Param("deviceType") String deviceType,
           @Param("deviceLabel") String deviceLabel,
           @Param("deviceLabel") String deviceLabel,
-          @Param("deviceProfileId") String deviceProfileId);
+          @Param("deviceProfileId") String deviceProfileId,
+          @Param("transportType")TransportTypeEnum transportType) ;
 }
 }

@@ -9,6 +9,7 @@ import org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DataTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DataTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDeviceEntity;
 
 
@@ -62,11 +63,12 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    * @return 设备列表
    * @return 设备列表
    */
    */
   List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
   List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
-      DeviceTypeEnum deviceType,
-      String tenantId,
-      String organizationId,
-      String deviceLabel,
-      String deviceProfileId);
+          DeviceTypeEnum deviceType,
+          String tenantId,
+          String organizationId,
+          String deviceLabel,
+          String deviceProfileId,
+          TransportTypeEnum transportTypeEnum);
 
 
 
 
   List<DeviceDTO> findDevicesByOrganizationIds(
   List<DeviceDTO> findDevicesByOrganizationIds(

@@ -499,6 +499,9 @@
         <if test="deviceProfileId !=null and deviceProfileId !=''">
         <if test="deviceProfileId !=null and deviceProfileId !=''">
             AND ifd.device_profile_id = #{deviceProfileId}
             AND ifd.device_profile_id = #{deviceProfileId}
         </if>
         </if>
+        <if test="transportType !=null">
+            AND dev.transport_type = #{transportType}
+        </if>
         and ifd.organization_id in
         and ifd.organization_id in
         <foreach collection="orgIds" item="orgId" open="(" separator="," close=")">
         <foreach collection="orgIds" item="orgId" open="(" separator="," close=")">
             #{orgId}
             #{orgId}