Merge branch '20220319' into 'master'

fix: 场景联动不存在激活时500异常

See merge request huang/thingsboard3.3.2!70

@@ -56,6 +56,7 @@ public enum ErrorMessage {
   STORE_FILE_FAILED(400037,"文件存储失败"),
   STORE_FILE_FAILED(400037,"文件存储失败"),
   NOT_BELONG_CURRENT_TENANT(400038,"不属于当前租户"),
   NOT_BELONG_CURRENT_TENANT(400038,"不属于当前租户"),
   DEVICE_LOSED(400039,"设备相关参数丢失"),
   DEVICE_LOSED(400039,"设备相关参数丢失"),
+  SCENE_REACT_NOT_EXTIED(400040,"场景联动不存在"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private final int code;
   private String message;
   private String message;

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 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.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
@@ -366,6 +367,9 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
             sceneInform.put(item.getId(), item.getName());
             sceneInform.put(item.getId(), item.getName());
         }
         }
         SceneLinkage self = baseMapper.selectById(currentSceneId);
         SceneLinkage self = baseMapper.selectById(currentSceneId);
+        if (self == null) {
+            throw new YtDataValidationException(ErrorMessage.SCENE_REACT_NOT_EXTIED.getMessage());
+        }
         if (state == FastIotConstants.StateValue.DISABLE) {
         if (state == FastIotConstants.StateValue.DISABLE) {
             enableIds.remove(currentSceneId);
             enableIds.remove(currentSceneId);
             sceneInform.remove(currentSceneId);
             sceneInform.remove(currentSceneId);
@@ -394,33 +398,18 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
             String scenId = trigger.getSceneLinkageId();
             String scenId = trigger.getSceneLinkageId();
             List<String> devices = trigger.getEntityId();
             List<String> devices = trigger.getEntityId();
             if (ScopeEnum.ALL.equals(trigger.getEntityType()) && currentSceneId.equals(scenId)) {
             if (ScopeEnum.ALL.equals(trigger.getEntityType()) && currentSceneId.equals(scenId)) {
-                trigger.setEntityId(allDevices);
-                triggerMapper.updateById(trigger);
                 devices = allDevices;
                 devices = allDevices;
             }
             }
             deviceSceneMap(matchedDevices, devices, scenId);
             deviceSceneMap(matchedDevices, devices, scenId);
         });
         });
 
 
-        List<DoCondition> conditions = doConditionMapper.selectList(new QueryWrapper<DoCondition>().lambda().eq(DoCondition::getSceneLinkageId, currentSceneId).eq(DoCondition::getEntityType, ScopeEnum.ALL));
-        conditions.forEach(item -> {
-            if (currentSceneId.equals(item.getSceneLinkageId())) {
-                item.setEntityId(allDevices);
-                doConditionMapper.updateById(item);
-            }
-        });
-
-        List<DoAction> actions = doActionMapper.selectList(new QueryWrapper<DoAction>().lambda().eq(DoAction::getSceneLinkageId, currentSceneId).eq(DoAction::getEntityType, ScopeEnum.ALL));
-        actions.forEach(item -> {
-            if (currentSceneId.equals(item.getSceneLinkageId())) {
-                item.setDeviceId(allDevices);
-                doActionMapper.updateById(item);
-            }
-        });
 
 
         if (matchedDevices.isEmpty()) {
         if (matchedDevices.isEmpty()) {
             return null;
             return null;
         }
         }
 
 
+        freshEntityIds(currentSceneId, allDevices, triggers);
+
         Map<String, Map> engineConfig = new HashMap<>();
         Map<String, Map> engineConfig = new HashMap<>();
         engineConfig.put("scenes", matchedDevices);
         engineConfig.put("scenes", matchedDevices);
         engineConfig.put("names", sceneInform);
         engineConfig.put("names", sceneInform);
@@ -430,6 +419,39 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
     }
     }
 
 
     /**
     /**
+     * 异步刷新场景联动的设备ID
+     *
+     * @param sceneId
+     * @param allDevices
+     * @param triggers
+     */
+    @Async
+    public void freshEntityIds(String sceneId, List<String> allDevices, List<Trigger> triggers) {
+        triggers.forEach(trigger -> {
+            if (ScopeEnum.ALL.equals(trigger.getEntityType()) && sceneId.equals(trigger.getSceneLinkageId())) {
+                trigger.setEntityId(allDevices);
+                triggerMapper.updateById(trigger);
+            }
+        });
+
+        List<DoCondition> conditions = doConditionMapper.selectList(new QueryWrapper<DoCondition>().lambda().eq(DoCondition::getSceneLinkageId, sceneId).eq(DoCondition::getEntityType, ScopeEnum.ALL));
+        conditions.forEach(item -> {
+            if (sceneId.equals(item.getSceneLinkageId())) {
+                item.setEntityId(allDevices);
+                doConditionMapper.updateById(item);
+            }
+        });
+
+        List<DoAction> actions = doActionMapper.selectList(new QueryWrapper<DoAction>().lambda().eq(DoAction::getSceneLinkageId, sceneId).eq(DoAction::getEntityType, ScopeEnum.ALL));
+        actions.forEach(item -> {
+            if (sceneId.equals(item.getSceneLinkageId())) {
+                item.setDeviceId(allDevices);
+                doActionMapper.updateById(item);
+            }
+        });
+    }
+
+    /**
      * 设备与场景联动的映射集合
      * 设备与场景联动的映射集合
      *
      *
      * @param resultMap 缓存设备和场景联动映射结果的集合
      * @param resultMap 缓存设备和场景联动映射结果的集合