Merge branch '20220922' into 'master'

refactor: 条件过滤设备信息

See merge request huang/thingsboard3.3.2!134

@@ -358,13 +358,27 @@ public class YtDeviceController extends BaseController {
 
 
   @GetMapping("/list/{deviceType}")
   @GetMapping("/list/{deviceType}")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{})")
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{})")
-  @ApiOperation("获取该组织的所有设备")
+  @ApiOperation("获取特定设备类型的所有设备")
   public List<DeviceDTO> getGatewayDevices(
   public List<DeviceDTO> getGatewayDevices(
-      @ApiParam(value = "组织ID") @RequestParam("organizationId") String organizationId,
-      @ApiParam(value = "设备类型") @PathVariable("deviceType") DeviceTypeEnum deviceType)
-      throws ThingsboardException {
+
+          @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 deviceService.findDevicesByDeviceTypeAndOrganizationId(
+            deviceType, getCurrentUser().getCurrentTenantId(), organizationId,deviceLabel);
+  }
+
+  @GetMapping("/list")
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
+  @ApiOperation("获取满足条件的所有设备")
+  public List<DeviceDTO> getDevices(
+          @ApiParam(value = "设备类型") @RequestParam(value="deviceType", required = false) DeviceTypeEnum deviceType,
+          @ApiParam(value = "组织ID") @RequestParam(value="organizationId", required = false) String organizationId,
+          @ApiParam(value = "设备标签") @RequestParam(value="deviceLabel", required = false) String deviceLabel)
+          throws ThingsboardException {
     return deviceService.findDevicesByDeviceTypeAndOrganizationId(
     return deviceService.findDevicesByDeviceTypeAndOrganizationId(
-        deviceType, getCurrentUser().getCurrentTenantId(), organizationId);
+            deviceType, getCurrentUser().getCurrentTenantId(), organizationId,deviceLabel);
   }
   }
 
 
   @GetMapping("/list/master/{organizationId}")
   @GetMapping("/list/master/{organizationId}")

@@ -243,12 +243,16 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
 
 
   @Override
   @Override
   public List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
   public List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
-      DeviceTypeEnum deviceType, String tenantId, String organizationId) {
+      DeviceTypeEnum deviceType, String tenantId, String organizationId,String deviceLabel) {
     List<String> orgIds = organizationAllIds(tenantId, organizationId);
     List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    if(orgIds.isEmpty()){
+      throw new YtDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
+    }
     return ReflectUtils.sourceToTarget(
     return ReflectUtils.sourceToTarget(
         baseMapper.selectList(
         baseMapper.selectList(
             new LambdaQueryWrapper<YtDevice>()
             new LambdaQueryWrapper<YtDevice>()
-                .eq(YtDevice::getDeviceType, deviceType)
+                    .eq(deviceType != null,YtDevice::getDeviceType, deviceType)
+                    .eq(deviceLabel != null,YtDevice::getLabel, deviceLabel)
                 .in(YtDevice::getOrganizationId, orgIds)),
                 .in(YtDevice::getOrganizationId, orgIds)),
         DeviceDTO.class);
         DeviceDTO.class);
   }
   }
@@ -339,7 +343,9 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
   @NotNull
   @NotNull
   private List<String> organizationAllIds(String tenantId, String organizationId) {
   private List<String> organizationAllIds(String tenantId, String organizationId) {
     List<String> organizationIds = new ArrayList<>();
     List<String> organizationIds = new ArrayList<>();
-    organizationIds.add(organizationId);
+    if(!StringUtils.isEmpty(organizationId)){
+      organizationIds.add(organizationId);
+    }
     // 查询该组织的所有子类
     // 查询该组织的所有子类
     List<OrganizationDTO> organizationDTOS =
     List<OrganizationDTO> organizationDTOS =
         ytOrganizationMapper.findOrganizationTreeList(tenantId, organizationIds);
         ytOrganizationMapper.findOrganizationTreeList(tenantId, organizationIds);

@@ -49,7 +49,7 @@ public interface YtDeviceService extends BaseService<YtDevice> {
      * @return 设备列表
      * @return 设备列表
      */
      */
     List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
     List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
-            DeviceTypeEnum deviceType, String tenantId, String organizationId);
+            DeviceTypeEnum deviceType, String tenantId, String organizationId,String deviceLabel);
 
 
     /**
     /**
      * 通过设备ID和租户ID判断该设备是否存在
      * 通过设备ID和租户ID判断该设备是否存在