Merge branch 'master_dev' into 'fix_rule_chain'

Master dev

See merge request yunteng/thingskit!429

@@ -383,15 +383,23 @@ public class TkDeviceController extends BaseController {
       @ApiParam(value = "传输协议类型") @RequestParam(value = "transportType", required = false)
       @ApiParam(value = "传输协议类型") @RequestParam(value = "transportType", required = false)
       TransportTypeEnum transportType,
       TransportTypeEnum transportType,
       @ApiParam(value = "是否场景联动调用,是true") @RequestParam(value = "isSceneLinkage", required = false)
       @ApiParam(value = "是否场景联动调用,是true") @RequestParam(value = "isSceneLinkage", required = false)
-              Boolean isSceneLinkage)
+              Boolean isSceneLinkage,
+      @ApiParam(value = "是否边缘分配设备调用,是true") @RequestParam(value = "isEdgeDistribution", required = false)
+              Boolean isEdgeDistribution,
+      @ApiParam(value = "edgeId") @RequestParam(value = "edgeId", required = false)
+              String edgeId)
       throws ThingsboardException {
       throws ThingsboardException {
     return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
     return tkdeviceService.findDevicesByDeviceTypeAndOrganizationId(
         deviceType,
         deviceType,
         getCurrentUser().getTenantId().getId(),
         getCurrentUser().getTenantId().getId(),
         organizationId,
         organizationId,
         deviceLabel,
         deviceLabel,
-            StringUtils.isEmpty(deviceProfileId)?null:UUID.fromString(deviceProfileId),transportType,isSceneLinkage);
-  }
+        StringUtils.isEmpty(deviceProfileId)?null:UUID.fromString(deviceProfileId),
+        transportType,
+        isSceneLinkage,
+        isEdgeDistribution,
+        StringUtils.isEmpty(edgeId)?null:UUID.fromString(edgeId));
+    }
 
 
 
 
   @PostMapping("/getListByDeviceProfileIds")
   @PostMapping("/getListByDeviceProfileIds")

@@ -324,15 +324,17 @@ public class TkDeviceServiceImpl extends AbstractTbBaseService<DeviceMapper, TkD
             String deviceLabel,
             String deviceLabel,
             UUID deviceProfileId,
             UUID deviceProfileId,
             TransportTypeEnum transportTypeEnum,
             TransportTypeEnum transportTypeEnum,
-            Boolean  isSceneLinkage) {
+            Boolean  isSceneLinkage,
+            Boolean isEdgeDistribution,
+            UUID edgeId) {
         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(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
             throw new TkDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
         }
         }
 
 
         List<TkDeviceEntity> listEntity = baseMapper.findDevicesByDeviceTypeAndOrganizationId(orgIds,
         List<TkDeviceEntity> listEntity = baseMapper.findDevicesByDeviceTypeAndOrganizationId(orgIds,
-                deviceType == null ? null : deviceType.name()
-                , deviceLabel, deviceProfileId, transportTypeEnum,isSceneLinkage);
+                deviceType == null ? null : deviceType.name(),
+                deviceLabel, deviceProfileId, transportTypeEnum,isSceneLinkage,isEdgeDistribution,edgeId);
         return  listEntity.stream().map(entity -> {
         return  listEntity.stream().map(entity -> {
                     return CopyUtils.copyAndReturn(entity, new DeviceDTO());
                     return CopyUtils.copyAndReturn(entity, new DeviceDTO());
                 }
                 }

@@ -61,7 +61,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);
+              null,null,null,null,false,false,null);
       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;

@@ -216,7 +216,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);
+              null,null,null,false,false,null);
       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);

@@ -111,7 +111,8 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
             String organizationId  = dto.getOrganizationId();
             String organizationId  = dto.getOrganizationId();
             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, TransportTypeEnum.GBT28181,false);
+                    null, UUID.fromString(dto.getTenantId()),organizationId,null,
+                    null, TransportTypeEnum.GBT28181,false,false,null);
             if(deviceDTOS.isEmpty()){
             if(deviceDTOS.isEmpty()){
                 return dto;
                 return dto;
             }
             }

@@ -162,7 +162,9 @@ public interface DeviceMapper extends BaseMapper<TkDeviceEntity> {
           @Param("deviceLabel") String deviceLabel,
           @Param("deviceLabel") String deviceLabel,
           @Param("deviceProfileId") UUID deviceProfileId,
           @Param("deviceProfileId") UUID deviceProfileId,
           @Param("transportType")TransportTypeEnum transportType,
           @Param("transportType")TransportTypeEnum transportType,
-          @Param("isSceneLinkage")Boolean  isSceneLinkage) ;
+          @Param("isSceneLinkage")Boolean  isSceneLinkage,
+          @Param("isEdgeDistribution")Boolean isEdgeDistribution,
+          @Param("edgeId")UUID edgeId) ;
 
 
 
 
   List<DeviceDTO> findDevicesByProfileIdAndOrganizationId(
   List<DeviceDTO> findDevicesByProfileIdAndOrganizationId(

@@ -67,6 +67,9 @@ public interface TkDeviceService extends TbBaseService<TkDeviceEntity> {
    *
    *
    * @param deviceType 设备类型
    * @param deviceType 设备类型
    * @param organizationId 组织ID
    * @param organizationId 组织ID
+   * @param isSceneLinkage 是否场景联动调用 用于过滤边缘设备
+   * @param isEdgeDistribution 是否分配边缘调用  用于过滤场景联动已使用设备
+   * @param edgeId 是否分配边缘调用  用于过滤已分配给此边端的设备
    * @return 设备列表
    * @return 设备列表
    */
    */
   List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
   List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
@@ -76,7 +79,9 @@ public interface TkDeviceService extends TbBaseService<TkDeviceEntity> {
           String deviceLabel,
           String deviceLabel,
           UUID deviceProfileId,
           UUID deviceProfileId,
           TransportTypeEnum transportTypeEnum,
           TransportTypeEnum transportTypeEnum,
-          Boolean  isSceneLinkage);
+          Boolean  isSceneLinkage,
+          Boolean isEdgeDistribution,
+          UUID edgeId);
 
 
 
 
   List<DeviceDTO> findDevicesByOrganizationIds(
   List<DeviceDTO> findDevicesByOrganizationIds(

@@ -568,14 +568,35 @@
         FROM device ifd
         FROM device ifd
         left join device_profile dev on ifd.device_profile_id = dev.id
         left join device_profile dev on ifd.device_profile_id = dev.id
         <if test="isSceneLinkage == true">
         <if test="isSceneLinkage == true">
-<!--            此设备是边端创建或者已经分配给边端-->
+        <!--此设备是边端创建或者已经分配给边端-->
             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">
+            LEFT JOIN relation re on re.to_id = ifd.id
+            and re.from_id =#{edgeId}
+            and re.from_type = 'EDGE'
+            and re.relation_type_group = 'EDGE'
+            and re.relation_type = 'Contains'
+        </if>
+        <if test="isEdgeDistribution == true">
+            <!--此设备是否已被场景联动使用-->
+            LEFT JOIN tk_do_action action on  action.device_id LIKE CONCAT('%',ifd.id ,'%')
+            LEFT JOIN tk_do_condition cond on  cond.entity_id LIKE CONCAT('%',ifd.id ,'%')
+            LEFT JOIN tk_trigger trigger on  trigger.entity_id LIKE CONCAT('%',ifd.id ,'%')
+        </if>
         where
         where
         1=1
         1=1
         <if test="isSceneLinkage == true">
         <if test="isSceneLinkage == true">
             and re.to_id is null
             and re.to_id is null
         </if>
         </if>
+        <if test="edgeId != null">
+            and re.from_id is null
+        </if>
+        <if test="isEdgeDistribution == true">
+            and action.device_id is null
+            and cond.entity_id is null
+            and trigger.entity_id is null
+        </if>
         <if test="deviceType !=null and deviceType !=''">
         <if test="deviceType !=null and deviceType !=''">
             AND ifd.device_type = #{deviceType}
             AND ifd.device_type = #{deviceType}
         </if>
         </if>