refactor: 组织可用设备接口优化

1、租户管理员只能查看未分配客户的设备 2、客户只能查看分配给自己的。

refactor: 组织可用设备接口优化
1、租户管理员只能查看未分配客户的设备 2、客户只能查看分配给自己的。
云中非
1 parent c7235c2d
Showing 2 changed files with 136 additions and 81 deletions
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SceneLinkageServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/SceneLinkageService.java
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SceneLinkageServiceImpl.java
View file @307ffa7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SceneLinkageServiceImpl.java
View file @307ffa7
@@ -11,11 +11,13 @@ import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.id.EntityId;
 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.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
@@ -47,7 +49,6 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
     private final DoConditionService doConditionService;
     private final DoActionService doActionService;
     private final UserMapper userMapper;
-    private final UserOrganizationMappingService userOrganizationMappingService;
     /**
      * 增加场景联动,触发器可以多个,执行条件可以多个,执行动作可以多个
@@ -57,7 +58,7 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
      */
     @Override
     @Transactional
-    public SceneLinkageDTO saveSceneLinkage(SceneLinkageDTO sceneLinkageDTO, String tenantId,boolean tenantAdmin,String currentUserId) {
+    public SceneLinkageDTO saveSceneLinkage(SceneLinkageDTO sceneLinkageDTO, String tenantId,String currentUserId,String customerId) {
         sceneLinkageDTO.setTenantId(tenantId);
         // 第一步保存场景,获取场景ID
         // 场景对象
@@ -70,7 +71,7 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
         }
         String organizationId = sceneLinkage.getOrganizationId();
-        List<DeviceDTO> organizationDevices = findDeviceList(organizationId,tenantAdmin,tenantId,currentUserId);
+        List<DeviceDTO> organizationDevices = findDeviceList(organizationId,tenantId,customerId);
         List<String> tbDeviceIds = new ArrayList<>();
         for (DeviceDTO item : organizationDevices) {
@@ -126,7 +127,7 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
      */
     @Override
     @Transactional
-    public SceneLinkageDTO updateSceneLinkage(SceneLinkageDTO sceneLinkageDTO, String tenantId,boolean tenantAdmin ,String currentUserId) {
+    public SceneLinkageDTO updateSceneLinkage(SceneLinkageDTO sceneLinkageDTO, String tenantId,String currentUserId,String customerId) {
         // 获取场景
         SceneLinkage sceneLinkage = baseMapper.selectById(sceneLinkageDTO.getId());
         if (sceneLinkage == null) {
@@ -136,7 +137,7 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
             throw new YtDataValidationException("你不是此场景的创建者");
         }
         String organizationId = sceneLinkage.getOrganizationId();
-        List<DeviceDTO> organizationDevices = findDeviceList(organizationId,tenantAdmin,tenantId,currentUserId);
+        List<DeviceDTO> organizationDevices = findDeviceList(organizationId,tenantId,customerId);
         List<String> tbDeviceIds = new ArrayList<>();
         for (DeviceDTO item : organizationDevices) {
@@ -163,13 +164,23 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
         List<TriggerDTO> triggerDTOS = sceneLinkage.getTriggers();
         if (triggerDTOS != null && !triggerDTOS.isEmpty()) {
             for (TriggerDTO triggerDTO : triggerDTOS) {
-                String deviceId = triggerDTO.getEntityId();
                 if (!TriggerTypeEnum.DEVICE_TRIGGER.equals(triggerDTO.getTriggerType())) {
                     continue;
                 }
-                if (!tbDeviceIds.contains(deviceId)) {
-                    throw  new YtDataValidationException(ErrorMessage.ORGANIZATION_DEVICE_NOT_MATCHED_IN_TRIGGER.getMessage());
+                List<String> deviceIds = triggerDTO.getEntityId();
+                if(ScopeEnum.PART.equals(triggerDTO.getEntityType())){
+                    if(deviceIds ==null || deviceIds.isEmpty()){
+                        throw  new YtDataValidationException(ErrorMessage.DEVICE_LOSED.getMessage());
+                    }else{
+                        for(String item: deviceIds){
+                            if (!tbDeviceIds.contains(item)) {
+                                throw  new YtDataValidationException(ErrorMessage.ORGANIZATION_DEVICE_NOT_MATCHED_IN_TRIGGER.getMessage());
+                            }
+                        }
+                    }
                 }
+
+
             }
         } else {
             return;
@@ -203,13 +214,21 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
     private void updateDoAction(SceneLinkageDTO sceneLinkageDTO, List<String> tbDeviceIds) {
         List<DoActionDTO> actionDTOS = sceneLinkageDTO.getDoActions();
         if (actionDTOS != null && !actionDTOS.isEmpty()) {
-            for (DoActionDTO item : actionDTOS) {
-                String deviceId = item.getDeviceId();
-                if (!ActionTypeEnum.DEVICE_OUT.equals(item.getOutTarget())) {
+            for (DoActionDTO action : actionDTOS) {
+                if (!ActionTypeEnum.DEVICE_OUT.equals(action.getOutTarget())) {
                     continue;
                 }
-                if (!tbDeviceIds.contains(deviceId)) {
-                    throw  new YtDataValidationException(ErrorMessage.ORGANIZATION_DEVICE_NOT_MATCHED_IN_ACTION.getMessage());
+                List<String> deviceIds = action.getDeviceId();
+                if(ScopeEnum.PART.equals(action.getEntityType())){
+                    if(deviceIds ==null || deviceIds.isEmpty()){
+                        throw  new YtDataValidationException(ErrorMessage.DEVICE_LOSED.getMessage());
+                    }else{
+                        for(String item: deviceIds){
+                            if (!tbDeviceIds.contains(item)) {
+                                throw  new YtDataValidationException(ErrorMessage.ORGANIZATION_DEVICE_NOT_MATCHED_IN_ACTION.getMessage());
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -225,10 +244,12 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
                         .map(doActionDTO -> {
                             doActionDTO.setTenantId(sceneLinkageDTO.getTenantId());
                             doActionDTO.setSceneLinkageId(sceneLinkageDTO.getId());
-                            ObjectNode doContext = JacksonUtil.newObjectNode();
-                            doContext.put("method","methodThingskit");
-                            doContext.put("params",doActionDTO.getDoContext());
-                            doActionDTO.setDoContext(doContext);
+                            if(ActionTypeEnum.DEVICE_OUT.equals(doActionDTO.getOutTarget())){
+                                ObjectNode doContext = JacksonUtil.newObjectNode();
+                                doContext.put("method","methodThingskit");
+                                doContext.put("params",doActionDTO.getDoContext());
+                                doActionDTO.setDoContext(doContext);
+                            }
                             return doActionDTO.getEntity(DoAction.class);
                         })
                         .collect(Collectors.toList());
@@ -246,13 +267,21 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
     private void updateDoCondition(SceneLinkageDTO sceneLinkageDTO, List<String> tbDeviceIds) {
         List<DoConditionDTO> conditionDTOS = sceneLinkageDTO.getDoConditions();
         if (conditionDTOS != null && !conditionDTOS.isEmpty()) {
-            for (DoConditionDTO item : conditionDTOS) {
-                String deviceId = item.getEntityId();
-                if (!TriggerTypeEnum.DEVICE_TRIGGER.equals(item.getTriggerType())) {
+            for (DoConditionDTO condition : conditionDTOS) {
+                if (!ActionTypeEnum.DEVICE_OUT.equals(condition.getTriggerType())) {
                     continue;
                 }
-                if (!tbDeviceIds.contains(deviceId)) {
-                    throw  new YtDataValidationException(ErrorMessage.ORGANIZATION_DEVICE_NOT_MATCHED_IN_CONDITION.getMessage());
+                List<String> deviceIds = condition.getEntityId();
+                if(ScopeEnum.PART.equals(condition.getEntityType())){
+                    if(deviceIds ==null || deviceIds.isEmpty()){
+                        throw  new YtDataValidationException(ErrorMessage.DEVICE_LOSED.getMessage());
+                    }else{
+                        for(String item: deviceIds){
+                            if (!tbDeviceIds.contains(item)) {
+                                throw  new YtDataValidationException(ErrorMessage.ORGANIZATION_DEVICE_NOT_MATCHED_IN_ACTION.getMessage());
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -340,63 +369,55 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
     /**
      * @param organizationId 组织ID
-     * @param isTenantAdmin  true租户管理员 false客户
      * @param tenantId       租户ID
-     * @param currentUserId  当前用户ID
+     * @param customerId     客户ID
      * @return 设备集合
      */
     @Override
     public List<DeviceDTO> findDeviceList(
-            String organizationId, boolean isTenantAdmin, String tenantId, String currentUserId) {
-        List<String> organizationIds = new ArrayList<>();
-        organizationIds.add(organizationId);
+            String organizationId,  String tenantId, String customerId) {
+        List<String> organizationFilter = new ArrayList<>();
+        organizationFilter.add(organizationId);
         // 查询该组织的所有子类
-        List<String> ids =
-                organizationMapper.findOrganizationTreeList(tenantId, organizationIds).stream()
+        List<String> orgIds =
+                organizationMapper.findOrganizationTreeList(tenantId, organizationFilter).stream()
                         .map(organization -> organization.getId())
                         .collect(Collectors.toList());
         // 拿到当前组织ids所包含的设备集合
-        if(ids.isEmpty()){
+        if(orgIds.isEmpty()){
             throw  new YtDataValidationException(ErrorMessage.ORGANIZATION_NOT_EXTIED.getMessage());
         }
-        List<YtDevice> deviceList =
+        List<YtDevice> orgDevices =
                 deviceMapper.selectList(
-                        new QueryWrapper<YtDevice>().lambda().in(YtDevice::getOrganizationId, ids));
-        List<DeviceDTO> deviceDTOList =
-                deviceList.stream()
-                        .map(device -> device.getDTO(DeviceDTO.class))
-                        .collect(Collectors.toList());
+                        new QueryWrapper<YtDevice>().lambda().in(YtDevice::getOrganizationId, orgIds));
-        List<DeviceDTO> result = new ArrayList<>();
-        if (!isTenantAdmin) {
-            // 查找分配给客户的设备
-            List<String> list =
-                    deviceMapper.findDeviceIdsByCustomerId(userMapper.findUserCustomerIdById(currentUserId));
-            list.forEach(
-                    id -> {
-                        for (DeviceDTO dto : deviceDTOList) {
-                            if (dto.getTbDeviceId().equals(id)) {
-                                result.add(dto);
-                                break;
-                            }
-                        }
-                    });
-        } else {
-            return deviceDTOList;
+
+
+
+        List<String> customerDevices = deviceMapper.findDeviceIdsByCustomerId(customerId);
+        if(customerDevices ==null || customerDevices.isEmpty()){
+            return null;
         }
+        List<DeviceDTO> result =orgDevices.stream()
+                .filter(f -> customerDevices.contains(f.getTbDeviceId()))
+                .map(device -> device.getDTO(DeviceDTO.class))
+                .collect(Collectors.toList());
+
+
         return result;
     }
     /**
      * 场景联动节点配置信息
      *
-     * @param sceneId  场景联动主键
-     * @param tenantId 租户主键
+     * @param currentSceneId  场景联动主键
+     * @param tenantId        租户主键
+     * @param customerId      客户主键
      * @param state    是否禁用场景联动，true标识禁用，false标识启用。
      * @return
      */
     @Override
-    public JsonNode getRuleNodeConfig(String sceneId, String tenantId, Integer state) {
+    public JsonNode getRuleNodeConfig(String currentSceneId, String tenantId,String customerId, Integer state) {
         String ruleTyp = "org.thingsboard.rule.engine.filter.TbSceneReactNode";
         List<SceneLinkage> runningScenes = baseMapper.selectList(
                 new QueryWrapper<SceneLinkage>()
@@ -405,50 +426,84 @@ public class SceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageMap
                         .eq(SceneLinkage::getStatus, FastIotConstants.StateValue.ENABLE)
         );
         Set<String> enableIds = new HashSet<>();
-        enableIds.add(sceneId);
+        enableIds.add(currentSceneId);
         for (SceneLinkage item : runningScenes) {
             enableIds.add(item.getId());
         }
         if (state == FastIotConstants.StateValue.DISABLE) {
-            enableIds.remove(sceneId);
+            enableIds.remove(currentSceneId);
         }
         if(enableIds.size() <= 0){
             return null;
         }
-        List<Trigger> triggers = triggerMapper.selectList(
+
+        Map<String, List<String>> maps = new HashMap<>();
+
+        List<Trigger> partTriggers = triggerMapper.selectList(
                 new QueryWrapper<Trigger>()
                         .lambda()
                         .eq(Trigger::getTenantId, tenantId)
                         .eq(Trigger::getTriggerType, TriggerTypeEnum.DEVICE_TRIGGER)
+                        .eq(Trigger::getEntityType, ScopeEnum.PART)
                         .in(Trigger::getSceneLinkageId, enableIds)
         );
+        Set<String> exceptedSeneIds = new HashSet<>();
+        for (Trigger item : partTriggers) {
+            String scenId = item.getSceneLinkageId();
+            exceptedSeneIds.add(scenId);
+            deviceSceneMap(maps, item.getEntityId(),scenId );
+        }
-        Map<String, List<String>> devices = new HashMap<>();
-        for (Trigger item : triggers) {
-            String deviceId = item.getEntityId();
-            List<String> scenes = devices.computeIfAbsent(deviceId, k -> new ArrayList<String>());
-            String triggerScenId = item.getSceneLinkageId();
-            if (!scenes.contains(triggerScenId)) {
-                scenes.add(triggerScenId);
-            }
-            if (scenes.isEmpty()) {
-                devices.remove(deviceId);
-            } else {
-                devices.put(deviceId, scenes);
+        enableIds.removeAll(exceptedSeneIds);
+        List<SceneLinkage> allTriggers = sceneLinkageMapper.selectList(
+                new QueryWrapper<SceneLinkage>()
+                        .lambda()
+                        .eq(SceneLinkage::getTenantId, tenantId)
+                        .in(SceneLinkage::getId, enableIds)
+        );
+        for(SceneLinkage scene:allTriggers){
+            List<DeviceDTO> organizationDevices = findDeviceList(scene.getOrganizationId(),tenantId,customerId);
+            List<String> devices = new ArrayList<>();
+            for(DeviceDTO item:organizationDevices){
+                devices.add(item.getTbDeviceId());
             }
+            deviceSceneMap(maps, devices,scene.getId() );
         }
-        if (devices.isEmpty()) {
+
+
+
+        if (maps.isEmpty()) {
             return null;
         }
         Map<String, Map> engineConfig = new HashMap<>();
-        engineConfig.put("scenes", devices);
+        engineConfig.put("scenes", maps);
         return JacksonUtil.convertValue(engineConfig, JsonNode.class);
     }
+    /**
+     * 设备与场景联动的映射集合
+     * @param resultMap   缓存设备和场景联动映射结果的集合
+     * @param devices       设备主键集合
+     * @param scenId    场景联动主键
+     */
+    private void deviceSceneMap(Map<String, List<String>> resultMap, List<String> devices, String scenId) {
+        for(String deviceId: devices){
+            List<String> scenes = resultMap.computeIfAbsent(deviceId, k -> new ArrayList<String>());
+            if (!scenes.contains(scenId)) {
+                scenes.add(scenId);
+            }
+            if (scenes.isEmpty()) {
+                resultMap.remove(deviceId);
+            } else {
+                resultMap.put(deviceId, scenes);
+            }
+        }
+    }
+
     private List<String> getQueryOrganizationIds(String tenantId, List<String> organizationIds) {
         // 查询该组织的所有子类
         List<OrganizationDTO> organizationDTOS =
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/SceneLinkageService.java
View file @307ffa7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/SceneLinkageService.java
View file @307ffa7
@@ -20,11 +20,11 @@ public interface SceneLinkageService extends BaseService<SceneLinkage>{
      * 新增场景联动
      * @param sceneLinkageDTO 场景联动信息
      * @param tenantId        租户主键
-     * @param tenantAdmin     当前用户是否租户管理员
      * @param currentUserId   当前登录用户主键
+     * @param customerId     客户ID
      * @return sceneLinkageDTO
      */
-    SceneLinkageDTO saveSceneLinkage(SceneLinkageDTO sceneLinkageDTO, String tenantId,boolean tenantAdmin,String currentUserId);
+    SceneLinkageDTO saveSceneLinkage(SceneLinkageDTO sceneLinkageDTO, String tenantId,String currentUserId,String customerId);
     /**
      * 删除场景联动
@@ -37,11 +37,11 @@ public interface SceneLinkageService extends BaseService<SceneLinkage>{
      * 修改场景联动
      * @param sceneLinkageDTO 场景联动信息
      * @param tenantId        租户主键
-     * @param tenantAdmin     当前用户是否租户管理员
      * @param currentUserId   当前登录用户主键
+     * @param customerId     客户ID
      * @return
      */
-    SceneLinkageDTO updateSceneLinkage(SceneLinkageDTO sceneLinkageDTO,String tenantId,boolean tenantAdmin,String currentUserId);
+    SceneLinkageDTO updateSceneLinkage(SceneLinkageDTO sceneLinkageDTO,String tenantId,String currentUserId,String customerId);
     /**
      * 分页查询
@@ -69,20 +69,20 @@ public interface SceneLinkageService extends BaseService<SceneLinkage>{
     /**
      *  通过组织id查询设备集合
      * @param organizationId 组织ID
-     * @param isTenantAdmin  true租户管理员 false客户
-     * @param tenantId 租户ID
-     * @param currentUserId 当前用户ID
+     * @param tenantId       租户ID
+     * @param customerId     客户ID
      * @return
      */
-    List<DeviceDTO> findDeviceList(String organizationId,boolean isTenantAdmin,String tenantId,String currentUserId);
+    List<DeviceDTO> findDeviceList(String organizationId,String tenantId,String customerId);
     /**
      * 获取租户的场景联动节点配置信息
      * @param sceneId   场景联动主键
      * @param tenantId  租户主键
+     * @param customerId      客户主键
      * @param state     是否启动
      * @return
      */
-    JsonNode getRuleNodeConfig(String sceneId,String tenantId,Integer state);
+    JsonNode getRuleNodeConfig(String sceneId,String tenantId,String customerId,Integer state);
 }