Merge branch 'master_dev' into 'master'

fix: 场景联动事件触发,选择全部时未触发

See merge request yunteng/thingskit!297

@@ -808,13 +808,13 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   }
 
   @Override
-  public String getTbDeviceIdByDeviceNameAndGateWayId(String tenantId, String name,String gateWayId) {
+  public DeviceDTO getDeviceByDeviceNameOrIdAndGateWayId(String tenantId, String nameOrTbDeviceId, String gateWayId) {
     TkDeviceEntity entity =
             baseMapper.selectOne(new LambdaQueryWrapper<TkDeviceEntity>()
                     .eq(TkDeviceEntity::getTenantId, tenantId)
-                    .eq(TkDeviceEntity::getName, name)
-                    .eq(TkDeviceEntity::getGatewayId,gateWayId));
-    return Optional.ofNullable(entity).map(obj->obj.getTbDeviceId()).orElse(null);
+                    .eq(TkDeviceEntity::getGatewayId,gateWayId)
+                    .eq(TkDeviceEntity::getName, nameOrTbDeviceId).or().eq(TkDeviceEntity::getTbDeviceId,nameOrTbDeviceId));
+    return Optional.ofNullable(entity).map(obj->obj.getDTO(DeviceDTO.class)).orElse(null);
   }
   @Override
   @Transactional

@@ -244,13 +244,13 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
   boolean updateDeviceStateByTbDeviceId(String tenantId, String tbDeviceId, DeviceState deviceState);
 
   /**
-   * 根据租户ID和设备名称查询该设备的TBDeviceId
+   * 根据租户ID和设备名称或设备ID查询该设备的信息
    * @param tenantId 租户ID
-   * @param name 设备名称
+   * @param nameOrTbDeviceId 设备名称或TBDeviceId
    * @param gateWayId Tb网关ID
    * @return TBDeviceId
    */
-  String getTbDeviceIdByDeviceNameAndGateWayId(String tenantId, String name,String gateWayId);
+  DeviceDTO getDeviceByDeviceNameOrIdAndGateWayId(String tenantId, String nameOrTbDeviceId, String gateWayId);
 
   /**
    * 修改设备的产品ID（profileId）

@@ -22,9 +22,11 @@ import org.thingsboard.rule.engine.telemetry.TelemetryNodeCallback;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TkEventKvEntry;
 import org.thingsboard.server.common.data.yunteng.dto.TkThingsModel;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
@@ -33,6 +35,7 @@ import org.thingsboard.server.common.msg.session.SessionMsgType;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 
@@ -68,12 +71,19 @@ public class TkMsgEventNode implements TbNode {
         String deviceIdStr = msg.getMetaData().getValue("deviceId");
         TenantId tenantId = ctx.getTenantId();
         if(selfData.equals(FastIotConstants.NO)){
-            String tbDeviceId = ctx.getTkDeviceService()
-                    .getTbDeviceIdByDeviceNameAndGateWayId(tenantId.toString(),deviceIdStr,
+            DeviceDTO device = ctx.getTkDeviceService()
+                    .getDeviceByDeviceNameOrIdAndGateWayId(tenantId.toString(),deviceIdStr,
                             msg.getOriginator().toString());
-            if(StringUtils.isNotEmpty(tbDeviceId)){
-                deviceIdStr = tbDeviceId;
+            //设备为null代表使用的设备ID,作为topic进行的上报
+            if(null !=device && StringUtils.isNotEmpty(device.getTbDeviceId())){
+                deviceIdStr = device.getTbDeviceId();
                 msg.getMetaData().putValue("deviceId",deviceIdStr);
+                msg.getMetaData().putValue("deviceName",device.getName());
+                DeviceProfile deviceProfile = ctx.getDeviceProfileCache().get(tenantId,new DeviceProfileId(UUID.fromString(device.getProfileId())));
+                if(null != deviceProfile){
+                    msg.getMetaData().putValue("deviceProfileId",deviceProfile.getId().toString());
+                    msg.getMetaData().putValue("deviceType",deviceProfile.getName());
+                }
             }
         }
         DeviceId deviceId = DeviceId.fromString(deviceIdStr);

@@ -17,6 +17,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.*;
@@ -24,7 +25,9 @@ import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 import org.thingsboard.rule.engine.filter.TbCheckAlarmStatusNodeConfig;
 import org.thingsboard.rule.engine.profile.SnapshotUpdate;
 import org.thingsboard.rule.engine.yunteng.utils.TriggerRuleState;
+import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.device.profile.AlarmConditionKeyType;
+import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.data.yunteng.dto.scene.RuleFilterDTO;
 import org.thingsboard.server.common.msg.TbMsg;
@@ -60,6 +63,10 @@ public class TbSceneReactNode implements TbNode {
     String deviceId;
     if(msg.getType().equals("POST_EVENT_REQUEST")){
       deviceId = msg.getMetaData().getData().get("deviceId");
+      DeviceProfile cache = ctx.getDeviceProfileCache().get(ctx.getTenantId(),new DeviceId(UUID.fromString(deviceId)));
+      if(null != cache){
+        msg.getMetaData().putValue("deviceProfileId",cache.getId().toString());
+      }
     }else{
       deviceId = msg.getOriginator().getId().toString();
     }