Merge branch 'fix/teambition/2024-10-25' into 'master_dev'

perf:获取满足条件的所有设备 接口 isExcludeEdge参数默认为fase

See merge request yunteng/thingskit!456

@@ -385,23 +385,20 @@ public class TkDeviceController extends BaseController {
   @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
   @PreAuthorize("hasAnyAuthority('TENANT_ADMIN','CUSTOMER_USER')")
   @ApiOperation("获取满足条件的所有设备")
   @ApiOperation("获取满足条件的所有设备")
   public List<DeviceDTO> getDevices(
   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,
-      @ApiParam(value = "设备配置ID") @RequestParam(value = "deviceProfileId", required = false)
-          String deviceProfileId,
-      @ApiParam(value = "传输协议类型") @RequestParam(value = "transportType", required = false)
-      TransportTypeEnum transportType,
-      @ApiParam(value = "是否场景联动调用,是true") @RequestParam(value = "isSceneLinkage", required = false)
-              Boolean isSceneLinkage,
-      @ApiParam(value = "是否边缘分配设备调用,是true") @RequestParam(value = "isEdgeDistribution", required = false)
-              Boolean isEdgeDistribution,
-      @ApiParam(value = "edgeId") @RequestParam(value = "edgeId", required = false)
-              String edgeId)
+      @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,
+      @ApiParam(value = "设备配置ID") @RequestParam(value = "deviceProfileId", required = false) String deviceProfileId,
+      @ApiParam(value = "传输协议类型") @RequestParam(value = "transportType", required = false) TransportTypeEnum transportType,
+      @ApiParam(value = "是否场景联动调用,是true") @RequestParam(value = "isSceneLinkage", required = false)  Boolean isSceneLinkage,
+      @ApiParam(value = "是否边缘分配设备调用,是true") @RequestParam(value = "isEdgeDistribution", required = false) Boolean isEdgeDistribution,
+      @ApiParam(value = "edgeId") @RequestParam(value = "edgeId", required = false) String edgeId,
+      @ApiParam(value = "排除边端设备是true") @RequestParam(value = "isExcludeEdge", required = false) Boolean isExcludeEdge
+  )
       throws ThingsboardException {
       throws ThingsboardException {
+    if(isExcludeEdge==null){
+      isExcludeEdge=false;
+    }
     return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
     return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
         deviceType,
         deviceType,
         getCurrentUser().getTenantId().getId(),
         getCurrentUser().getTenantId().getId(),
@@ -411,7 +408,9 @@ public class TkDeviceController extends BaseController {
         transportType,
         transportType,
         isSceneLinkage,
         isSceneLinkage,
         isEdgeDistribution,
         isEdgeDistribution,
-        StringUtils.isEmpty(edgeId)?null:UUID.fromString(edgeId));
+        StringUtils.isEmpty(edgeId)?null:UUID.fromString(edgeId),
+            isExcludeEdge
+    );
     }
     }
 
 
 
 

@@ -327,7 +327,8 @@ public class TkDeviceServiceImpl extends AbstractTbBaseService<DeviceMapper, TkD
             TransportTypeEnum transportTypeEnum,
             TransportTypeEnum transportTypeEnum,
             Boolean  isSceneLinkage,
             Boolean  isSceneLinkage,
             Boolean isEdgeDistribution,
             Boolean isEdgeDistribution,
-            UUID edgeId) {
+            UUID edgeId,
+            Boolean isExcludeEdge) {
         List<String> orgIds = organizationService.organizationAllIds(tenantId.toString(), organizationId);
         List<String> orgIds = organizationService.organizationAllIds(tenantId.toString(), organizationId);
         if (orgIds.isEmpty()) {
         if (orgIds.isEmpty()) {
             throw new TkDataValidationException(MessageUtils.message(ErrorMessage.ORGANIZATION_NOT_EXTIED.getI18nCode()));
             throw new TkDataValidationException(MessageUtils.message(ErrorMessage.ORGANIZATION_NOT_EXTIED.getI18nCode()));
@@ -335,7 +336,7 @@ public class TkDeviceServiceImpl extends AbstractTbBaseService<DeviceMapper, TkD
 
 
         List<TkDeviceEntity> listEntity = baseMapper.findDevicesByDeviceTypeAndOrganizationId(orgIds,
         List<TkDeviceEntity> listEntity = baseMapper.findDevicesByDeviceTypeAndOrganizationId(orgIds,
                 deviceType == null ? null : deviceType.name(),
                 deviceType == null ? null : deviceType.name(),
-                deviceLabel, deviceProfileId, transportTypeEnum,isSceneLinkage,isEdgeDistribution,edgeId);
+                deviceLabel, deviceProfileId, transportTypeEnum,isSceneLinkage,isEdgeDistribution,edgeId,isExcludeEdge);
         return  listEntity.stream().map(entity -> {
         return  listEntity.stream().map(entity -> {
                     return CopyUtils.copyAndReturn(entity, new DeviceDTO());
                     return CopyUtils.copyAndReturn(entity, new DeviceDTO());
                 }
                 }

@@ -62,7 +62,7 @@ public class TkDeviceStateLogServiceImpl
     }
     }
     if(isPtCommonTenant){
     if(isPtCommonTenant){
       List<TkDeviceEntity> devices = deviceMapper.findDevicesByDeviceTypeAndOrganizationId((List<String>) queryMap.get("orgIds"),
       List<TkDeviceEntity> devices = deviceMapper.findDevicesByDeviceTypeAndOrganizationId((List<String>) queryMap.get("orgIds"),
-              null,null,null,null,false,false,null);
+              null,null,null,null,false,false,null,false);
       List<String> finalTbDevices = new ArrayList<>();
       List<String> finalTbDevices = new ArrayList<>();
       devices.forEach(item -> finalTbDevices.add(item.getTbDeviceId().toString()));
       devices.forEach(item -> finalTbDevices.add(item.getTbDeviceId().toString()));
       deviceIds = finalTbDevices;
       deviceIds = finalTbDevices;

@@ -250,7 +250,7 @@ public class TkHomePageServiceImpl implements HomePageService {
       totalFilter.put("organizationIds",organizationIds);
       totalFilter.put("organizationIds",organizationIds);
       //查询所有设备
       //查询所有设备
       List<TkDeviceEntity> devices = deviceMapper.findDevicesByDeviceTypeAndOrganizationId(organizationIds,null,
       List<TkDeviceEntity> devices = deviceMapper.findDevicesByDeviceTypeAndOrganizationId(organizationIds,null,
-              null,null,null,false,false,null);
+              null,null,null,false,false,null,false);
       List<String> finalTbDevices = new ArrayList<>();
       List<String> finalTbDevices = new ArrayList<>();
       devices.forEach(item -> finalTbDevices.add(item.getTbDeviceId().toString()));
       devices.forEach(item -> finalTbDevices.add(item.getTbDeviceId().toString()));
       todayFilter.put("deviceIds",finalTbDevices);
       todayFilter.put("deviceIds",finalTbDevices);

@@ -113,7 +113,7 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
             List<TkVideoGbtDeviceDTO> deviceList = new ArrayList<>();
             List<TkVideoGbtDeviceDTO> deviceList = new ArrayList<>();
             List<DeviceDTO> deviceDTOS =  tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
             List<DeviceDTO> deviceDTOS =  tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
                     null, UUID.fromString(dto.getTenantId()),organizationId,null,
                     null, UUID.fromString(dto.getTenantId()),organizationId,null,
-                    null, TransportTypeEnum.GBT28181,false,false,null);
+                    null, TransportTypeEnum.GBT28181,false,false,null,true);
             if(deviceDTOS.isEmpty()){
             if(deviceDTOS.isEmpty()){
                 return dto;
                 return dto;
             }
             }

@@ -164,7 +164,8 @@ public interface DeviceMapper extends BaseMapper<TkDeviceEntity> {
           @Param("transportType")TransportTypeEnum transportType,
           @Param("transportType")TransportTypeEnum transportType,
           @Param("isSceneLinkage")Boolean  isSceneLinkage,
           @Param("isSceneLinkage")Boolean  isSceneLinkage,
           @Param("isEdgeDistribution")Boolean isEdgeDistribution,
           @Param("isEdgeDistribution")Boolean isEdgeDistribution,
-          @Param("edgeId")UUID edgeId) ;
+          @Param("edgeId")UUID edgeId,
+          @Param("isExcludeEdge")Boolean isExcludeEdge) ;
 
 
 
 
   List<DeviceDTO> findDevicesByProfileIdAndOrganizationId(
   List<DeviceDTO> findDevicesByProfileIdAndOrganizationId(

@@ -81,7 +81,7 @@ public interface TkDeviceService extends TbBaseService<TkDeviceEntity> {
           TransportTypeEnum transportTypeEnum,
           TransportTypeEnum transportTypeEnum,
           Boolean  isSceneLinkage,
           Boolean  isSceneLinkage,
           Boolean isEdgeDistribution,
           Boolean isEdgeDistribution,
-          UUID edgeId);
+          UUID edgeId,Boolean excludeEdge);
 
 
 
 
   List<DeviceDTO> findDevicesByOrganizationIds(
   List<DeviceDTO> findDevicesByOrganizationIds(

@@ -571,6 +571,7 @@
         <!--此设备是边端创建或者已经分配给边端-->
         <!--此设备是边端创建或者已经分配给边端-->
             LEFT JOIN relation re on re.to_id = ifd.id and re.from_type = 'EDGE'  and( re.relation_type = 'ManagedByEdge' or re.relation_type = 'Contains')
             LEFT JOIN relation re on re.to_id = ifd.id and re.from_type = 'EDGE'  and( re.relation_type = 'ManagedByEdge' or re.relation_type = 'Contains')
         </if>
         </if>
+
         <if test="edgeId != null">
         <if test="edgeId != null">
             LEFT JOIN relation re on re.to_id = ifd.id
             LEFT JOIN relation re on re.to_id = ifd.id
             and re.from_id =#{edgeId}
             and re.from_id =#{edgeId}
@@ -586,6 +587,9 @@
         </if>
         </if>
         where
         where
         1=1
         1=1
+        <if test="isExcludeEdge == true">
+            and ifd.id not in (SELECT dev.id from device dev inner join relation re_edge on dev.id=re_edge.to_id and re_edge.from_type = 'EDGE'  and re_edge.relation_type = 'ManagedByEdge')
+        </if>
         <if test="isSceneLinkage == true">
         <if test="isSceneLinkage == true">
             and re.to_id is null
             and re.to_id is null
         </if>
         </if>