fix: 场景联动所属设备接口兼容查看功能

@@ -102,7 +102,7 @@ public class YtSceneLinkageController extends BaseController {
 
 
 
 
 
 
-  @ApiOperation(value = "通过场景id获取所属组织的设备集合")
+  @ApiOperation(value = "组织的设备集合")
   @GetMapping("/device")
   @GetMapping("/device")
   public ResponseEntity<Map> findDeviceList(@RequestParam String organizationId)
   public ResponseEntity<Map> findDeviceList(@RequestParam String organizationId)
       throws ThingsboardException {
       throws ThingsboardException {

@@ -74,6 +74,7 @@ public class DeviceDTO extends TenantDTO {
   private Long lastOnlineTime;
   private Long lastOnlineTime;
   private Long lastOfflineTime;
   private Long lastOfflineTime;
   private String description;
   private String description;
+  private boolean enable;
 
 
   public void setDeviceState(boolean deviceState) {
   public void setDeviceState(boolean deviceState) {
     if (deviceState) {
     if (deviceState) {

@@ -5,11 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.util.concurrent.MoreExecutors;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.common.util.ThingsBoardThreadFactory;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
@@ -25,6 +29,10 @@ import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.*;
 import org.thingsboard.server.dao.yunteng.service.*;
 
 
 import java.util.*;
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
@@ -43,7 +51,6 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
     private final TriggerService triggerService;
     private final TriggerService triggerService;
     private final DoConditionService doConditionService;
     private final DoConditionService doConditionService;
     private final DoActionService doActionService;
     private final DoActionService doActionService;
-
     /**
     /**
      * 增加场景联动,触发器可以多个,执行条件可以多个,执行动作可以多个
      * 增加场景联动,触发器可以多个,执行条件可以多个,执行动作可以多个
      *
      *
@@ -339,10 +346,21 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
 
 
 
 
         List<String> customerDevices = deviceMapper.findDeviceIdsByCustomerId(customerId);
         List<String> customerDevices = deviceMapper.findDeviceIdsByCustomerId(customerId);
-        if (customerDevices == null || customerDevices.isEmpty()) {
+        if (!EntityId.NULL_UUID.toString().equals(customerId)  && (customerDevices == null || customerDevices.isEmpty())) {
             return null;
             return null;
         }
         }
-        List<DeviceDTO> result = orgDevices.stream().filter(f -> customerDevices.contains(f.getTbDeviceId())).map(device -> device.getDTO(DeviceDTO.class)).collect(Collectors.toList());
+        List<DeviceDTO> result = orgDevices.stream()
+//                .filter(f -> customerDevices.contains(f.getTbDeviceId()))
+                .map(device -> {
+                    DeviceDTO dto = device.getDTO(DeviceDTO.class);
+                    if(customerDevices != null && !customerDevices.isEmpty() && customerDevices.contains(device.getTbDeviceId())){
+                        dto.setEnable(true);
+                    }else{
+                        dto.setEnable(false);
+                    }
+                    return dto;
+                })
+                .collect(Collectors.toList());
 
 
 
 
         return result;
         return result;
@@ -408,7 +426,9 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
             return null;
             return null;
         }
         }
 
 
-        freshEntityIds(currentSceneId, allDevices, triggers);
+        Executors.newScheduledThreadPool(1).schedule(()->{
+            freshEntityIds(currentSceneId, allDevices, triggers);
+        },1, TimeUnit.SECONDS);
 
 
         Map<String, Map> engineConfig = new HashMap<>();
         Map<String, Map> engineConfig = new HashMap<>();
         engineConfig.put("scenes", matchedDevices);
         engineConfig.put("scenes", matchedDevices);
@@ -425,7 +445,6 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
      * @param allDevices
      * @param allDevices
      * @param triggers
      * @param triggers
      */
      */
-    @Async
     public void freshEntityIds(String sceneId, List<String> allDevices, List<Trigger> triggers) {
     public void freshEntityIds(String sceneId, List<String> allDevices, List<Trigger> triggers) {
         triggers.forEach(trigger -> {
         triggers.forEach(trigger -> {
             if (ScopeEnum.ALL.equals(trigger.getEntityType()) && sceneId.equals(trigger.getSceneLinkageId())) {
             if (ScopeEnum.ALL.equals(trigger.getEntityType()) && sceneId.equals(trigger.getSceneLinkageId())) {