fix: delete getGatewayDevices and add query params deviceProfileId for getDevices API

@@ -336,20 +336,6 @@ public class TkDeviceController extends BaseController {
     sendDeleteNotificationMsg(getTenantId(), deviceId, relatedEdgeIds);
     sendDeleteNotificationMsg(getTenantId(), deviceId, relatedEdgeIds);
   }
   }
 
 
-  @GetMapping("/list/{deviceType}")
-  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{})")
-  @ApiOperation("获取特定设备类型的所有设备")
-  public List<DeviceDTO> getGatewayDevices(
-      @ApiParam(value = "设备类型") @PathVariable("deviceType") DeviceTypeEnum deviceType,
-      @ApiParam(value = "组织ID") @RequestParam(value = "organizationId", required = false)
-          String organizationId,
-      @ApiParam(value = "设备标签") @RequestParam(value = "deviceLabel", required = false)
-          String deviceLabel)
-      throws ThingsboardException {
-    return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
-        deviceType, getCurrentUser().getCurrentTenantId(), organizationId, deviceLabel);
-  }
-
   @GetMapping("/list")
   @GetMapping("/list")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
   @ApiOperation("获取满足条件的所有设备")
   @ApiOperation("获取满足条件的所有设备")
@@ -359,10 +345,12 @@ public class TkDeviceController extends BaseController {
       @ApiParam(value = "组织ID") @RequestParam(value = "organizationId", required = false)
       @ApiParam(value = "组织ID") @RequestParam(value = "organizationId", required = false)
           String organizationId,
           String organizationId,
       @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)
+              String deviceProfileId)
       throws ThingsboardException {
       throws ThingsboardException {
     return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
     return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
-        deviceType, getCurrentUser().getCurrentTenantId(), organizationId, deviceLabel);
+        deviceType, getCurrentUser().getCurrentTenantId(), organizationId, deviceLabel,deviceProfileId);
   }
   }
 
 
   @GetMapping("/list/master/{organizationId}")
   @GetMapping("/list/master/{organizationId}")

@@ -248,7 +248,11 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
 
   @Override
   @Override
   public List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
   public List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
-      DeviceTypeEnum deviceType, String tenantId, String organizationId, String deviceLabel) {
+      DeviceTypeEnum deviceType,
+      String tenantId,
+      String organizationId,
+      String deviceLabel,
+      String deviceProfileId) {
     List<String> orgIds = organizationAllIds(tenantId, organizationId);
     List<String> orgIds = organizationAllIds(tenantId, organizationId);
     if (orgIds.isEmpty()) {
     if (orgIds.isEmpty()) {
       throw new YtDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
       throw new YtDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
@@ -258,6 +262,10 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
             new LambdaQueryWrapper<TkDeviceEntity>()
             new LambdaQueryWrapper<TkDeviceEntity>()
                 .eq(deviceType != null, TkDeviceEntity::getDeviceType, deviceType)
                 .eq(deviceType != null, TkDeviceEntity::getDeviceType, deviceType)
                 .eq(deviceLabel != null, TkDeviceEntity::getLabel, deviceLabel)
                 .eq(deviceLabel != null, TkDeviceEntity::getLabel, deviceLabel)
+                .eq(
+                    StringUtils.isNotEmpty(deviceProfileId),
+                    TkDeviceEntity::getDeviceProfileId,
+                    deviceProfileId)
                 .in(TkDeviceEntity::getOrganizationId, orgIds)),
                 .in(TkDeviceEntity::getOrganizationId, orgIds)),
         DeviceDTO.class);
         DeviceDTO.class);
   }
   }
@@ -506,7 +514,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
         JacksonUtil.toJsonNode(
         JacksonUtil.toJsonNode(
             "{\"avatar\": \"\",\"longitude\": \"\",\"latitude\": \"\",\"address\": \"\"}"));
             "{\"avatar\": \"\",\"longitude\": \"\",\"latitude\": \"\",\"address\": \"\"}"));
 
 
-    DeviceProfileDTO profileDTO = tkProfileMapper.selectDetail(gateway.getTenantId(),tbProfileId);
+    DeviceProfileDTO profileDTO = tkProfileMapper.selectDetail(gateway.getTenantId(), tbProfileId);
     slaveDevice.setProfileId(profileDTO.getTbProfileId());
     slaveDevice.setProfileId(profileDTO.getTbProfileId());
     slaveDevice.setDeviceProfileId(profileDTO.getId());
     slaveDevice.setDeviceProfileId(profileDTO.getId());
     slaveDevice.setGatewayId(gateway.getId());
     slaveDevice.setGatewayId(gateway.getId());

@@ -29,7 +29,6 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
   /**
   /**
    * 验证表单数据有效性
    * 验证表单数据有效性
    *
    *
-   * @param ytDevice
    */
    */
   void validateFormData(String currentTenantId, DeviceDTO ytDevice);
   void validateFormData(String currentTenantId, DeviceDTO ytDevice);
 
 
@@ -50,7 +49,11 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    * @return 设备列表
    * @return 设备列表
    */
    */
   List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
   List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
-      DeviceTypeEnum deviceType, String tenantId, String organizationId, String deviceLabel);
+      DeviceTypeEnum deviceType,
+      String tenantId,
+      String organizationId,
+      String deviceLabel,
+      String deviceProfileId);
 
 
   /**
   /**
    * 通过设备ID和租户ID判断该设备是否存在
    * 通过设备ID和租户ID判断该设备是否存在
@@ -85,7 +88,6 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    *
    *
    * @param tbDeviceId TB设备主键
    * @param tbDeviceId TB设备主键
    * @param created 告警状态:0正常,1告警
    * @param created 告警状态:0正常,1告警
-   * @return
    */
    */
   boolean freshAlarmStatus(EntityId tbDeviceId, Integer created);
   boolean freshAlarmStatus(EntityId tbDeviceId, Integer created);
 
 
@@ -156,7 +158,8 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    * @param gatewayId 网关设备TB平台的ID
    * @param gatewayId 网关设备TB平台的ID
    * @return
    * @return
    */
    */
-  boolean saveSlaveDevice(String slaveId, String slaveName, String tbProfileId,String gatewayId, Long createTime);
+  boolean saveSlaveDevice(
+      String slaveId, String slaveName, String tbProfileId, String gatewayId, Long createTime);
 
 
   /**
   /**
    * 通过设备ids查询设备信息列表
    * 通过设备ids查询设备信息列表