Merge branch 'ljl0224' into 'master'

refactor: 场景联动的节点信息同步方式调整

See merge request huang/thingsboard3.3.2!48

@@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
+import org.thingsboard.server.dao.yunteng.service.SceneLinkageService;
 import org.thingsboard.server.dao.yunteng.service.YtRuleChainService;
 
 import java.util.*;
@@ -55,6 +56,7 @@ public class YtConvertDataToController extends BaseController {
   private ActorSystemContext actorContext;
 
   private final ConvertConfigService convertConfigService;
+  private final SceneLinkageService sceneLinkageService;
 
   @GetMapping(params = {PAGE_SIZE, PAGE})
   @ApiOperation("分页查询")
@@ -181,8 +183,8 @@ public class YtConvertDataToController extends BaseController {
       @Validated(UpdateGroup.class) @RequestBody ConvertReqDTO convertReqDTO)
       throws ThingsboardException {
     //TODO 通过接口获取JsonNode
-    JsonNode configuration = convertReqDTO.getConfiguration();
     int status = -1;
+    JsonNode configuration = sceneLinkageService.getRuleNodeConfig(convertReqDTO.getId(),getCurrentUser().getCurrentTenantId(),convertReqDTO.getStatus());
     boolean noValue = configuration == null;
     if (noValue && convertReqDTO.getStatus() == FastIotConstants.StateValue.DISABLE) {
       status = FastIotConstants.StateValue.DISABLE;

@@ -66,7 +66,7 @@ public final class ModelConstants {
     /** 执行条件表 */
     public static final String IOTFS_DO_CONDITION_TABLE_NAME = "iotfs_do_condition";
     /** 条件动作表 */
-    public static final String IOTFS_DO_ACTION_TABLE_NAME = "iotfs_do_action_ljl";
+    public static final String IOTFS_DO_ACTION_TABLE_NAME = "iotfs_do_action";
     /** 中国城镇区街 */
     public static final String SYS_AREA_TABLE_NAME = "sys_area";
     /** 数据流转配置表 */

@@ -22,9 +22,8 @@ public class DoAction extends TenantBaseEntity {
     @TableField(typeHandler = EnumTypeHandler.class)
     private ActionTypeEnum outTarget;
     /**
-     * 下发指令
+     * 场景联动内容
      */
-    private String command;
     private String doContext;
 
     /**

@@ -12,7 +12,7 @@ import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 
 /** @Description 执行条件实体表 @Author cxy @Date 2021/11/24 17:16 */
 @Data
-@TableName(value = ModelConstants.Table.IOTFS_DO_CONDITION_TABLE_NAME)
+@TableName(value = ModelConstants.Table.IOTFS_DO_CONDITION_TABLE_NAME,autoResultMap=true)
 @EqualsAndHashCode(callSuper = true)
 public class DoCondition extends TenantBaseEntity {
   private static final long serialVersionUID = 2827674377416477646L;

@@ -11,7 +11,7 @@ import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 
 /** @Description 触发器实体表 @Author cxy @Date 2021/11/24 17:06 */
 @Data
-@TableName(value = ModelConstants.Table.IOTFS_TRIGGER_TABLE_NAME)
+@TableName(value = ModelConstants.Table.IOTFS_TRIGGER_TABLE_NAME,autoResultMap=true)
 @EqualsAndHashCode(callSuper = true)
 public class Trigger extends TenantBaseEntity {
 

@@ -43,8 +43,6 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
   private final DoConditionService doConditionService;
   private final DoActionService doActionService;
   private final UserMapper userMapper;
-  private final ConvertConfigMapper ruleEngineMapper;
-  private final ConvertConfigService ruleEngineService;
   private final UserOrganizationMappingService userOrganizationMappingService;
   /**
    * 增加场景联动,触发器可以多个,执行条件可以多个,执行动作可以多个
@@ -169,7 +167,7 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
           continue;
         }
         if (!tbDeviceIds.contains(deviceId)) {
-          throw new DataValidationException("触发器中存在不属于场景联动所在组织的设备");
+          throw new DataValidationException("in trigger ,this device not belong this org");
         }
       }
     }else{
@@ -186,10 +184,13 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
     // 如果获取的触发器不为空,进行添加操作
     List<Trigger> triggers =
             triggerDTOS.stream()
-                    .map(triggerDTO -> triggerDTO.getEntity(Trigger.class))
+                    .map(triggerDTO -> {
+                      triggerDTO.setTenantId(sceneLinkage.getTenantId());
+                      triggerDTO.setSceneLinkageId(sceneLinkage.getId());
+                      return triggerDTO.getEntity(Trigger.class);
+                    })
                     .collect(Collectors.toList());
     triggerService.insertBatch(triggers, 1000);
-    freshRuleChain(sceneLinkage);
   }
   /**
    * 修改执行动作
@@ -206,7 +207,7 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
           continue;
         }
         if (!tbDeviceIds.contains(deviceId)) {
-          throw new DataValidationException("动作中存在不属于场景联动所在组织的设备");
+          throw new DataValidationException("in action ,this device not belong this org ");
         }
       }
     }
@@ -220,7 +221,11 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
 
     List<DoAction> collectA =
             sceneLinkageDTO.getDoActions().stream()
-                    .map(doActionDTO -> doActionDTO.getEntity(DoAction.class))
+                    .map(doActionDTO -> {
+                      doActionDTO.setTenantId(sceneLinkageDTO.getTenantId());
+                      doActionDTO.setSceneLinkageId(sceneLinkageDTO.getId());
+                      return doActionDTO.getEntity(DoAction.class);
+                    })
                     .collect(Collectors.toList());
     doActionService.insertBatch(collectA, 1000);
 
@@ -243,7 +248,7 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
           continue;
         }
         if (!tbDeviceIds.contains(deviceId)) {
-          throw new DataValidationException("执行条件中存在不属于场景联动所在组织的设备");
+          throw new DataValidationException("in condition ,this device not belong this org");
         }
       }
     }
@@ -257,7 +262,12 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
     // 4.批量新增执行条件
     List<DoCondition> collectC =
             sceneLinkageDTO.getDoConditions().stream()
-                    .map(doConditionDTO -> doConditionDTO.getEntity(DoCondition.class))
+                    .map(doConditionDTO -> {
+
+                      doConditionDTO.setTenantId(sceneLinkageDTO.getTenantId());
+                      doConditionDTO.setSceneLinkageId(sceneLinkageDTO.getId());
+                      return doConditionDTO.getEntity(DoCondition.class);}
+                    )
                     .collect(Collectors.toList());
     doConditionService.insertBatch(collectC, 1000);
   }
@@ -367,55 +377,61 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
   }
 
   /**
-   *
-   * @param scene      场景联动信息
+   * 场景联动节点配置信息
+   * @param sceneId     场景联动主键
+   * @param tenantId    租户主键
+   * @param state    是否禁用场景联动，true标识禁用，false标识启用。
    * @return
    */
-  private boolean freshRuleChain(SceneLinkageDTO scene){
+  @Override
+  public JsonNode getRuleNodeConfig(String sceneId,String tenantId,Integer state){
     String ruleTyp = "org.thingsboard.rule.engine.filter.TbSceneReactNode";
-    ConvertConfig rule = ruleEngineMapper.selectOne(
-            new QueryWrapper<ConvertConfig>()
+    List<SceneLinkage> runningScenes = baseMapper.selectList(
+            new QueryWrapper<SceneLinkage>()
                     .lambda()
-                    .eq(ConvertConfig::getTenantId,scene.getTenantId())
-                    .eq(ConvertConfig::getType,ruleTyp)
+                    .eq(SceneLinkage::getTenantId,tenantId)
+                    .eq(SceneLinkage::getStatus,FastIotConstants.StateValue.ENABLE)
     );
-    ConvertConfigDTO ruleEngine = new ConvertConfigDTO();
-    Map<String,List<String>> devices;
-    if(rule == null){
-      devices = new HashMap<>();
-      ruleEngine.setName(scene.getName());
-    }else{
-      devices = JacksonUtil.convertValue(rule.getConfiguration(),new TypeReference<Map<String,Map<String, List<String>>>>(){}).get("scenes");
-      ruleEngine.setId(rule.getId());
+    Set<String> enableIds = new HashSet<>();
+    enableIds.add(sceneId);
+    for(SceneLinkage item : runningScenes){
+      enableIds.add(item.getId());
     }
-    List<String> scenes;
-    for(TriggerDTO item:scene.getTriggers()){
+    if(state == FastIotConstants.StateValue.DISABLE ){
+      enableIds.remove(sceneId);
+    }
+
+    List<Trigger> triggers =triggerMapper.selectList(
+            new QueryWrapper<Trigger>()
+                    .lambda()
+                    .eq(Trigger::getTenantId,tenantId)
+                    .eq(Trigger::getTriggerType,TriggerTypeEnum.DEVICE_TRIGGER)
+                    .in(Trigger::getSceneLinkageId,enableIds)
+    );
+
+    Map<String,List<String>> devices = new HashMap<>();
+    for(Trigger item: triggers){
       String deviceId = item.getEntityId();
-      if(devices.containsKey(deviceId)){
-        scenes = devices.get(deviceId);
-      }else{
-        scenes = new ArrayList<>();
+      List<String> scenes = devices.computeIfAbsent(deviceId,k -> new ArrayList<String>());
+      String scenId = item.getSceneLinkageId();
+      if(!scenes.contains(scenId)){
+        scenes.add(sceneId);
       }
-
-      if(!scenes.contains(scene.getId())){
-        scenes.add(scene.getId());
+      if(scenes.isEmpty()){
+        devices.remove(deviceId);
+      }else{
+        devices.put(deviceId,scenes);
       }
-      devices.put(deviceId,scenes);
-
+    }
+    if(devices.isEmpty()){
+      return null;
     }
 
     Map<String,Map> engineConfig = new HashMap<>();
     engineConfig.put("scenes",devices);
 
 
-
-    ruleEngine.setTenantId(scene.getTenantId());
-    ruleEngine.setNodeType(FastIotConstants.SCENE_REACT);
-    ruleEngine.setType(ruleTyp);
-    ruleEngine.setConfiguration(JacksonUtil.convertValue(engineConfig, JsonNode.class));
-
-    ruleEngineService.createOrUpdate(ruleEngine);
-    return false;
+    return JacksonUtil.convertValue(engineConfig, JsonNode.class);
   }
   private List<String> getQueryOrganizationIds(String tenantId,List<String> organizationIds){
     // 查询该组织的所有子类

 package org.thingsboard.server.dao.yunteng.service;
+import com.fasterxml.jackson.databind.JsonNode;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SceneLinkageDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
@@ -68,4 +69,13 @@ public interface SceneLinkageService extends BaseService<SceneLinkage>{
      */
     List<DeviceDTO> findDeviceList(String organizationId,boolean isTenantAdmin,String tenantId,String currentUserId);
 
+    /**
+     * 获取租户的场景联动节点配置信息
+     * @param sceneId   场景联动主键
+     * @param tenantId  租户主键
+     * @param state     是否启动
+     * @return
+     */
+    JsonNode getRuleNodeConfig(String sceneId,String tenantId,Integer state);
+
 }