Merge branch '20220913' into 'master_dev'

refactor: 调整组织结构下所有组织的接口实现

See merge request yunteng/thingskit!231

 package org.thingsboard.server.controller.yunteng;
 
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import java.util.*;
+import java.util.concurrent.ConcurrentMap;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -25,10 +29,10 @@ import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertConfigDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertConfigReqDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertReqDTO;
-import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
@@ -38,11 +42,6 @@ import org.thingsboard.server.dao.yunteng.service.TkRuleChainService;
 import org.thingsboard.server.service.rule.TbRuleChainService;
 import org.thingsboard.server.service.security.permission.Operation;
 
-import java.util.*;
-import java.util.concurrent.ConcurrentMap;
-
-import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
-
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("api/yt/convert")
@@ -52,10 +51,13 @@ public class TkConvertDataToController extends BaseController {
   private final TkRuleChainService tkRuleChainService;
   private final ConvertConfigService convertConfigService;
   private final SceneLinkageService sceneLinkageService;
+
   @Value("${actors.rule.chain.debug_mode_rate_limits_per_tenant.enabled}")
   private boolean debugPerTenantEnabled;
+
   @Autowired(required = false)
   private ActorSystemContext actorContext;
+
   @Autowired private TbRuleChainService tbRuleChainService;
 
   @GetMapping(params = {PAGE_SIZE, PAGE})
@@ -79,7 +81,7 @@ public class TkConvertDataToController extends BaseController {
     queryMap.put("nodeType", nodeType);
     queryMap.put("name", name);
     queryMap.put("status", status);
-    checkTimeAndPut(queryMap,startTime,endTime);
+    checkTimeAndPut(queryMap, startTime, endTime);
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
@@ -90,7 +92,7 @@ public class TkConvertDataToController extends BaseController {
   @ApiOperation("获取详情")
   public ResponseEntity<ConvertConfigDTO> findConvertConfigDTOById(@PathVariable("id") String id)
       throws ThingsboardException {
-    if(StringUtils.isEmpty(id)){
+    if (StringUtils.isEmpty(id)) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     return ResponseEntity.ok(
@@ -230,6 +232,7 @@ public class TkConvertDataToController extends BaseController {
     Map<String, Map<String, String>> origConfig = new HashMap<>();
     Map<String, String> fields = new HashMap<>();
     fields.put("deviceProfileId", "deviceProfileId");
+    fields.put("tenantId", "tenantId");
     origConfig.put("fieldsMapping", fields);
     origNode.setConfiguration(JacksonUtil.valueToTree(origConfig));
     ruleNodes.add(origNode);
@@ -261,9 +264,12 @@ public class TkConvertDataToController extends BaseController {
         ruleChainService.loadRuleChainMetaData(getTenantId(), ruleChain.getId());
     // 3. SETUP CONNECTION AND ADD OR DELETE RULE NODE
     if (status == FastIotConstants.MagicNumber.ZERO) {
-      needSaveRuleNode = convertConfigService.deleteRuleNode(nodes, ruleChainMetaData, nodeType,getCurrentUser().getCurrentTenantId());
+      needSaveRuleNode =
+          convertConfigService.deleteRuleNode(
+              nodes, ruleChainMetaData, nodeType, getCurrentUser().getCurrentTenantId());
     } else {
-      convertConfigService.addRuleNode(nodes, ruleChainMetaData, nodeType,getCurrentUser().getCurrentTenantId());
+      convertConfigService.addRuleNode(
+          nodes, ruleChainMetaData, nodeType, getCurrentUser().getCurrentTenantId());
       needSaveRuleNode = true;
     }
     // 4. SAVE METADATA

@@ -445,6 +445,12 @@ caffeine:
     taskCenterInfos:
       timeToLiveInMinutes: "${CACHE_SPECS_TASK_CENTER_TTL:1440}"
       maxSize: "${CACHE_SPECS_TASK_CENTER_MAX_SIZE:10000}"
+    organization:
+      timeToLiveInMinutes: "${CACHE_SPECS_ORG_TTL:1440}"
+      maxSize: "${CACHE_SPECS_ORG_MAX_SIZE:10000}"
+    sceneReact:
+      timeToLiveInMinutes: "${CACHE_SPECS_SCENE_TTL:1440}"
+      maxSize: "${CACHE_SPECS_SCENE_MAX_SIZE:10000}"
 redis:
   # standalone or cluster
   connection:
@@ -1217,4 +1223,4 @@ logging:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 frp:
   server:
-    address: ${FRP_SERVER_ADDRESS:http://127.0.0.1}
\ No newline at end of file
+    address: ${FRP_SERVER_ADDRESS:http://127.0.0.1}

@@ -30,6 +30,8 @@ public interface FastIotConstants {
     String TASK_CENTER_EXECUTE_TIME = "taskCenterExecuteTime";
     String TASK_CENTER_DEVICE_EXECUTE_TIME = "taskCenterDeviceExecuteTime";
     String TASK_IMMEDIATE_EXECUTE = "taskImmediateExecute";
+    String ORGANIZATION = "organization";
+    String SCENE_REACT = "sceneReact";
   }
 
   interface TBCacheConfig {
@@ -175,6 +177,13 @@ public interface FastIotConstants {
     /**RPC单项双向*/
     public static String ONEWAY = "oneway";
   }
+  class Scene{
+
+    /**触发器*/
+    public static String CONDITION_TRIGGER = "trigger";
+    /**执行条件*/
+    public static String CONDITION_CONDITION = "condition";
+  }
   class Alarm{
 
     /**遥测指标标识符*/

@@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.common.util.JacksonUtil;
@@ -32,10 +33,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.device.DeviceProfileDao;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
-import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.ConvertConfigService;
-import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
-import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
+import org.thingsboard.server.dao.yunteng.service.*;
 
 import java.time.LocalDateTime;
 import java.util.*;
@@ -50,7 +48,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   private final DeviceProfileDao deviceProfileDao;
   private final TkDeviceProfileMapper tkProfileMapper;
 
-  private final OrganizationMapper tkOrganizationMapper;
+  private final TkOrganizationService organizationService;
   private final SceneLinkageMapper sceneLinkageMapper;
   private final TriggerMapper triggerMapper;
   private final DoConditionMapper conditionMapper;
@@ -133,8 +131,8 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     TenantId id = TenantId.fromUUID(UUID.fromString(deviceTenantId));
     DeviceProfile deviceProfile =
         deviceProfileDao.findById(id, UUID.fromString(deviceDTO.getProfileId()));
-    TkOrganizationEntity organization =
-        tkOrganizationMapper.selectById(deviceDTO.getOrganizationId());
+    OrganizationDTO organization =
+            organizationService.findOrganizationById(deviceTenantId,deviceDTO.getOrganizationId());
     if (null == deviceProfile || null == organization) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     } else if (!organization.getTenantId().equals(deviceTenantId)) {
@@ -274,7 +272,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
       String organizationId,
       String deviceLabel,
       String deviceProfileId) {
-    List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
     if (orgIds.isEmpty()) {
       throw new TkDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
     }
@@ -294,7 +292,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   @Override
   public List<DeviceDTO> findDevicesByTransportTypeAndOrganizationId(
       String tenantId, String organizationId, DeviceTransportType transportType) {
-    List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
     if (orgIds.isEmpty()) {
       throw new TkDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
     }
@@ -380,7 +378,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     String convertConfigId =
         Optional.ofNullable(queryMap.get("convertConfigId")).map(Object::toString).orElse(null);
     if (!StringUtils.isEmpty(organizationId)) {
-      List<String> queryOrganizationIds = organizationAllIds(tenantId, organizationId);
+      List<String> queryOrganizationIds = organizationService.organizationAllIds(tenantId, organizationId);
       queryMap.put("organizationIds", queryOrganizationIds);
     }
     // 用于数据流转已选,待选过滤============开始
@@ -415,28 +413,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     return new TkPageData<>(records, deviceIPage.getTotal());
   }
 
-  /**
-   * 组织结构下的所有组织ID
-   *
-   * @param tenantId 租户ID
-   * @param organizationId 组织ID
-   */
-  @NotNull
-  private List<String> organizationAllIds(String tenantId, String organizationId) {
-    List<String> organizationIds = new ArrayList<>();
-    if (StringUtils.isEmpty(organizationId)) {
-      return organizationIds;
-    }
-    if (!StringUtils.isEmpty(organizationId)) {
-      organizationIds.add(organizationId);
-    }
-    // 查询该组织的所有子类
-    List<OrganizationDTO> organizationDTOS =
-        tkOrganizationMapper.findOrganizationTreeList(tenantId, organizationIds);
-    List<String> queryOrganizationIds = new ArrayList<>();
-    organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
-    return queryOrganizationIds;
-  }
+
 
   @Override
   public TkPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap) {
@@ -555,14 +532,14 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   @Override
   public List<SelectItemDTO> findMasterDevices(
       String tenantId, String customerId, String organizationId, String deviceProfileId) {
-    List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
     return baseMapper.masterDevices(customerId, tenantId, orgIds, deviceProfileId);
   }
 
   @Override
   public List<SelectItemDTO> findSlaveDevices(
       String masterId, String tenantId, String customerId, String organizationId) {
-    List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
     return baseMapper.slaveDevices(customerId, tenantId, orgIds, masterId);
   }
 
@@ -574,7 +551,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   @Override
   public List<String> findDeviceKeys(
       String tenantId, String customerId, String organizationId, List<String> deviceIds) {
-    List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
     return baseMapper.findDeviceKeys(tenantId, customerId, orgIds, deviceIds);
   }
 
@@ -685,10 +662,10 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     }
     return baseMapper.findDeviceInfo(tenantId, tbDeviceId);
   }
-
+  @Cacheable(cacheNames = FastIotConstants.CacheConfigKey.SCENE_REACT, key = "{#tenantId, #organizationId, #projectId}")
   @Override
   public List<String> rpcDevices(String tenantId, String organizationId, String projectId) {
-    List<String> orgIds = organizationAllIds(tenantId, organizationId);
+    List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
 
     List<TkDeviceEntity> organizationDevices =
         baseMapper.selectList(

@@ -6,15 +6,22 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cache.annotation.Caching;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tree.TreeUtils;
+import org.thingsboard.server.dao.cache.EntitiesCacheManager;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -23,6 +30,8 @@ import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static org.thingsboard.server.common.data.CacheConstants.DEVICE_CACHE;
+
 @Service
 @RequiredArgsConstructor
 public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationMapper, TkOrganizationEntity>
@@ -34,6 +43,9 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
   private final SceneLinkageMapper sceneMapper;
   private final AlarmContactMapper contactMapper;
 
+  @Caching(evict= {
+          @CacheEvict(cacheNames = FastIotConstants.CacheConfigKey.ORGANIZATION, key = "{#tenantId, #organizationDTO.id}")
+  })
   @Override
   @Transactional
   public OrganizationDTO saveOrganization(
@@ -148,7 +160,9 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
             .lambda()
             .in(TkUserOrganizationMappingEntity::getOrganizationId, organizationIds));
   }
-
+  @Caching(evict= {
+          @CacheEvict(cacheNames = FastIotConstants.CacheConfigKey.ORGANIZATION, key = "{#tenantId, #organizationDTO.id}")
+  })
   @Override
   @Transactional
   public OrganizationDTO updateOrganization(
@@ -339,4 +353,30 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
     }
     return organization.getDTO(OrganizationDTO.class);
   }
+
+
+  /**
+   * 组织结构下的所有组织ID
+   *
+   * @param tenantId 租户ID
+   * @param organizationId 组织ID
+   */
+  @Cacheable(cacheNames = FastIotConstants.CacheConfigKey.ORGANIZATION, key = "{#tenantId, #organizationId}")
+  @Override
+  public List<String> organizationAllIds(String tenantId, String organizationId) {
+    List<String> organizationIds = new ArrayList<>();
+    if (StringUtils.isEmpty(organizationId)) {
+      return organizationIds;
+    }
+    if (!StringUtils.isEmpty(organizationId)) {
+      organizationIds.add(organizationId);
+    }
+    // 查询该组织的所有子类
+    List<OrganizationDTO> organizationDTOS =
+            baseMapper.findOrganizationTreeList(tenantId, organizationIds);
+    List<String> queryOrganizationIds = new ArrayList<>();
+    organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
+    return queryOrganizationIds;
+  }
+
 }

@@ -21,4 +21,12 @@ public interface TkOrganizationService extends BaseService<TkOrganizationEntity>
   void unBindUserToOrganization(Set<String> userIds);
 
   OrganizationDTO findOrganizationById(String id,String tenantId);
+
+  /**
+   * 组织结构下的所有组织ID
+   *
+   * @param tenantId 租户ID
+   * @param organizationId 组织ID
+   */
+  List<String> organizationAllIds(String tenantId, String organizationId);
 }

@@ -16,6 +16,7 @@ package org.thingsboard.rule.engine.yunteng.scene;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.*;
@@ -58,6 +59,7 @@ public class TbSceneReactNode implements TbNode {
   public void onMsg(TbContext ctx, TbMsg msg) {
     String deviceId = msg.getOriginator().getId().toString();
     String tbProfileId = msg.getMetaData().getValue("deviceProfileId");
+    String tenantId = msg.getMetaData().getValue("tenantId");
     String projectId = config.getProfile().get(tbProfileId);
     boolean deviceHas = config.getScenes().containsKey(deviceId);
     boolean profileHas = config.getProject().containsKey(projectId);
@@ -73,7 +75,7 @@ public class TbSceneReactNode implements TbNode {
                 ReactState react = getOrCreateReactState(ctx, config, t.getScenId());
                 if (react != null) {
                   try {
-                    react.process(ctx, msg,t.getRuleId(), deviceId);
+                    react.process(ctx, msg, t.getRuleId(), deviceId);
                   } catch (Exception e) {
                     ctx.tellFailure(msg, e);
                   }
@@ -85,14 +87,24 @@ public class TbSceneReactNode implements TbNode {
       projectScence.stream()
           .forEach(
               t -> {
-                ReactState react = getOrCreateReactState(ctx, config, t.getScenId());
-                if (react != null) {
-                  try {
-                    react.process(ctx, msg,t.getRuleId(), deviceId);
-                  } catch (Exception e) {
-                    ctx.tellFailure(msg, e);
-                  }
-                }
+                String scenId = t.getScenId();
+                List<String> orgDevices =
+                    ctx.getTkDeviceService()
+                        .rpcDevices(tenantId, config.getOrgs().get(scenId), projectId);
+                Optional.ofNullable(orgDevices)
+                    .ifPresent(
+                        f -> {
+                          if (f.contains(deviceId)) {
+                            ReactState react = getOrCreateReactState(ctx, config, scenId);
+                            if (react != null) {
+                              try {
+                                react.process(ctx, msg, t.getRuleId(), deviceId);
+                              } catch (Exception e) {
+                                ctx.tellFailure(msg, e);
+                              }
+                            }
+                          }
+                        });
               });
     }
   }

@@ -13,13 +13,17 @@ public class TbSceneReactNodeConfig implements NodeConfiguration<TbSceneReactNod
 
   /** 【TB设备配置ID,TK产品ID】产品信息 */
   private Map<String, String> profile;
-  /** 【TK产品ID,场景】哪些产品会触发场景联动 */
+
+  /** 【TK产品ID,场景】哪些产品会触发场景联动，包含产品的每一个触发器 */
   private Map<String, List<RuleFilterDTO>> project;
-  /** 【TB设备ID,场景】哪些设备会触发场景联动 */
+
+  /** 【TB设备ID,场景】哪些设备会触发场景联动，包含设备的每一个触发器 */
   private Map<String, List<RuleFilterDTO>> scenes;
+
   /** 【TK场景ID,场景名称】场景联动信息 */
   private Map<String, String> names;
-  /** 【TK场景ID,组织ID】场景联动所属组织信息 */
+
+  /** 【TK场景ID,场景联动的根组织ID】场景联动所属组织信息 */
   private Map<String, String> orgs;
 
   @Override