Merge branch 'master_dev' of git.yunteng.com:yunteng/thingskit into master_dev

@@ -161,4 +161,11 @@ public interface FastIotConstants {
     /** 租户下的用户 */
     public static final int IS_CUSTOMER_USER = 3;
   }
+  class Rpc{
+
+    /**RPC方法名*/
+    public static String METHOD_NAME = "method";
+    /**RPC参数*/
+    public static String PARAMS_NAME = "params";
+  }
 }

@@ -28,8 +28,6 @@ import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.*;
 
 import java.util.*;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /** @Description 场景联动业务实现层 @Author cxy @Date 2021/11/25 11:22 */
@@ -69,6 +67,19 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
       sceneLinkage.copyToDTO(sceneLinkageDTO);
     }
 
+    updateScene(sceneLinkageDTO, tenantId, customerId, sceneLinkage);
+
+    return sceneLinkageDTO;
+  }
+
+  /**
+   * 更新场景联动附加信息，触发器、执行条件、动作
+   * @param sceneLinkageDTO  场景联动表单数据
+   * @param tenantId     租户ID
+   * @param customerId 客户ID
+   * @param sceneLinkage 场景联动主表实体
+   */
+  private void updateScene(SceneLinkageDTO sceneLinkageDTO, String tenantId, String customerId, TkSceneLinkageEntity sceneLinkage) {
     String organizationId = sceneLinkage.getOrganizationId();
     List<DeviceDTO> organizationDevices = findDeviceList(organizationId, tenantId, customerId,new ArrayList<>());
 
@@ -80,8 +91,6 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
     updateTrigger(sceneLinkageDTO, tbDeviceIds);
     updateDoCondition(sceneLinkageDTO, tbDeviceIds);
     updateDoAction(sceneLinkageDTO, tbDeviceIds);
-
-    return sceneLinkageDTO;
   }
 
   /**
@@ -135,17 +144,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
     if (!sceneLinkage.getCreator().equals(currentUserId)) {
       throw new TkDataValidationException("你不是此场景的创建者");
     }
-    String organizationId = sceneLinkage.getOrganizationId();
-    List<DeviceDTO> organizationDevices = findDeviceList(organizationId, tenantId, customerId,new ArrayList<>());
-
-    List<String> tbDeviceIds = new ArrayList<>();
-    for (DeviceDTO item : organizationDevices) {
-      tbDeviceIds.add(item.getTbDeviceId());
-    }
-
-    updateTrigger(sceneLinkageDTO, tbDeviceIds);
-    updateDoCondition(sceneLinkageDTO, tbDeviceIds);
-    updateDoAction(sceneLinkageDTO, tbDeviceIds);
+    updateScene(sceneLinkageDTO, tenantId, customerId, sceneLinkage);
 
     sceneLinkageDTO.copyToEntity(sceneLinkage);
     sceneLinkage.setTenantId(tenantId);
@@ -183,7 +182,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
     }
 
     // 先删除触发器
-    int result = triggerMapper.delete(
+    triggerMapper.delete(
         new QueryWrapper<TkTriggerEntity>()
             .lambda()
             .eq(
@@ -220,18 +219,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
           continue;
         }
         List<String> deviceIds = action.getDeviceId();
-        if (ScopeEnum.PART.equals(action.getEntityType())) {
-          if (deviceIds == null || deviceIds.isEmpty()) {
-            throw new TkDataValidationException(ErrorMessage.DEVICE_LOSED.getMessage());
-          } else {
-            for (String item : deviceIds) {
-              if (!tbDeviceIds.contains(item)) {
-                throw new TkDataValidationException(
-                    ErrorMessage.ORGANIZATION_DEVICE_NOT_MATCHED_IN_ACTION.getMessage());
-              }
-            }
-          }
-        }
+        validateRpcDevice(tbDeviceIds, deviceIds, action.getEntityType());
       }
     }
 
@@ -251,13 +239,19 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
                     doActionDTO.setTenantId(sceneLinkageDTO.getTenantId());
                     doActionDTO.setSceneLinkageId(sceneLinkageDTO.getId());
                     if (ActionTypeEnum.DEVICE_OUT.equals(doActionDTO.getOutTarget())) {
-                      ObjectNode doContext = JacksonUtil.newObjectNode();
-                      doContext.put("method", "methodThingskit");
-                      doContext.put("params", doActionDTO.getDoContext());
+                      JsonNode inputContext = doActionDTO.getDoContext().get(FastIotConstants.Rpc.PARAMS_NAME);
+                      ObjectNode outputContext = JacksonUtil.newObjectNode();
+                      outputContext.put(FastIotConstants.Rpc.METHOD_NAME, "methodThingskit");
+                      if(inputContext.isTextual()){
+                        outputContext.put(FastIotConstants.Rpc.PARAMS_NAME,inputContext.asText());
+                      }else{
+                        outputContext.set(FastIotConstants.Rpc.PARAMS_NAME, inputContext);
+                      }
+
                       ObjectNode addtionalInfo = JacksonUtil.newObjectNode();
                       addtionalInfo.put(ModelConstants.TablePropertyMapping.COMMAND_TYPE, doActionDTO.getCommandType());
-                      doContext.put(DataConstants.ADDITIONAL_INFO, addtionalInfo);
-                      doActionDTO.setDoContext(doContext);
+                      outputContext.set(DataConstants.ADDITIONAL_INFO, addtionalInfo);
+                      doActionDTO.setDoContext(outputContext);
                     }
                     return doActionDTO.getEntity(TkDoActionEntity.class);
                   })
@@ -267,6 +261,27 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
   }
 
   /**
+   * 验证设备输出的目标设备是否合法有效
+   * @param tbDeviceIds  场景联动所属组织的全部设备ID
+   * @param deviceIds    场景联动选择的设备ID
+   * @param entityType   设备输出类型
+   */
+  private void validateRpcDevice(List<String> tbDeviceIds, List<String> deviceIds, ScopeEnum entityType) {
+    if (ScopeEnum.PART.equals(entityType)) {
+      if (deviceIds == null || deviceIds.isEmpty()) {
+        throw new TkDataValidationException(ErrorMessage.DEVICE_LOSED.getMessage());
+      } else {
+        for (String item : deviceIds) {
+          if (!tbDeviceIds.contains(item)) {
+            throw new TkDataValidationException(
+                ErrorMessage.ORGANIZATION_DEVICE_NOT_MATCHED_IN_ACTION.getMessage());
+          }
+        }
+      }
+    }
+  }
+
+  /**
    * 修改执行动作
    *
    * @param sceneLinkageDTO 场景联动信息
@@ -280,18 +295,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
           continue;
         }
         List<String> deviceIds = condition.getEntityId();
-        if (ScopeEnum.PART.equals(condition.getEntityType())) {
-          if (deviceIds == null || deviceIds.isEmpty()) {
-            throw new TkDataValidationException(ErrorMessage.DEVICE_LOSED.getMessage());
-          } else {
-            for (String item : deviceIds) {
-              if (!tbDeviceIds.contains(item)) {
-                throw new TkDataValidationException(
-                    ErrorMessage.ORGANIZATION_DEVICE_NOT_MATCHED_IN_ACTION.getMessage());
-              }
-            }
-          }
-        }
+        validateRpcDevice(tbDeviceIds, deviceIds, condition.getEntityType());
       }
     }
 
@@ -392,7 +396,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
     // 查询该组织的所有子类
     List<String> orgIds =
         organizationMapper.findOrganizationTreeList(tenantId, organizationFilter).stream()
-            .map(organization -> organization.getId())
+            .map(BaseDTO::getId)
             .collect(Collectors.toList());
     // 拿到当前组织ids所包含的设备集合
     if (orgIds.isEmpty()) {
@@ -439,7 +443,6 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
    * @param tenantId 租户主键
    * @param customerId 客户主键
    * @param state 是否禁用场景联动，true标识禁用，false标识启用。
-   * @return
    */
   @Override
   public JsonNode getRuleNodeConfig(
@@ -471,7 +474,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
       sceneOrg.put(currentSceneId, self.getOrganizationId());
     }
 
-    if (enableIds.size() <= 0) {
+    if (enableIds.size() == 0) {
       return null;
     }
 
@@ -507,13 +510,13 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
     }
 
 List<TkDeviceProfileEntity> profiles = profileMapper.selectList(new LambdaQueryWrapper<TkDeviceProfileEntity>().eq(TkDeviceProfileEntity::getTenantId,tenantId));
-    Map<String, String> projectes = new HashMap<>();
-    profiles.stream().forEach(f->projectes.put(f.getTbProfileId(),f.getId()));
+    Map<String, String> projects = new HashMap<>();
+    profiles.forEach(f->projects.put(f.getTbProfileId(),f.getId()));
 
     Map<String, Map> engineConfig = new HashMap<>();
     engineConfig.put("scenes", matchedDevices);
     engineConfig.put("project", matchedProjectes);
-    engineConfig.put("profile", projectes);
+    engineConfig.put("profile", projects);
     engineConfig.put("names", sceneInform);
     engineConfig.put("orgs", sceneOrg);
 
@@ -536,11 +539,7 @@ List<TkDeviceProfileEntity> profiles = profileMapper.selectList(new LambdaQueryW
       if (!scenes.contains(scenId)) {
         scenes.add(scenId);
       }
-      if (scenes.isEmpty()) {
-        resultMap.remove(deviceId);
-      } else {
-        resultMap.put(deviceId, scenes);
-      }
+      resultMap.put(deviceId, scenes);
     }
   }
 
@@ -551,8 +550,7 @@ List<TkDeviceProfileEntity> profiles = profileMapper.selectList(new LambdaQueryW
     // 遍历组织id
     List<String> queryOrganizationIds = new ArrayList<>();
     organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
-    Set<String> set = new HashSet<>();
-    set.addAll(queryOrganizationIds);
+    Set<String> set = new HashSet<>(queryOrganizationIds);
     return new ArrayList<>(set);
   }
 }