refactor(DEFECT-1062): 设备事件验证设备有效性

@@ -593,8 +593,6 @@ public class DefaultTransportService implements TransportService {
         DeviceId deviceId = new DeviceId(new UUID(sessionInfo.getDeviceIdMSB(), sessionInfo.getDeviceIdLSB()));
         metaData.putValue("deviceName", sessionInfo.getDeviceName());
         metaData.putValue("deviceType", sessionInfo.getDeviceType());
-        UUID deviceProfileId = new UUID(sessionInfo.getDeviceProfileIdMSB(),sessionInfo.getDeviceProfileIdLSB());
-        metaData.putValue("device_profile_id", deviceProfileId.toString());
         metaData.putValue("deviceId",eventInfo[0]);
         metaData.putValue("event_identifier", eventInfo[1]);
         sendToRuleEngine(tenantId, deviceId, customerId, sessionInfo, json, metaData, SessionMsgType.POST_EVENT_REQUEST,

@@ -20,6 +20,7 @@ import org.thingsboard.rule.engine.api.*;
 import org.thingsboard.rule.engine.api.util.TbNodeUtils;
 import org.thingsboard.rule.engine.telemetry.TelemetryNodeCallback;
 import org.thingsboard.server.common.data.DeviceProfile;
+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;
@@ -66,11 +67,15 @@ public class TkMsgEventNode implements TbNode {
             ctx.tellFailure(msg, new IllegalArgumentException("Unsupported msg type: " + msg.getType()));
             return;
         }
-        String deviceProfileId = msg.getMetaData().getValue(DEVICE_DEVICE_PROFILE_ID_PROPERTY);
-        TenantId tenantId = ctx.getTenantId();
-        DeviceProfileId profileId = new DeviceProfileId(UUID.fromString(deviceProfileId));
-        DeviceProfile profile = cache.get(tenantId,profileId);
+        String deviceIdStr = msg.getMetaData().getValue("deviceId");
+        DeviceId deviceId = DeviceId.fromString(deviceIdStr);
         String eventIdentifier = msg.getMetaData().getValue(EVENT_IDENTIFIER_COLUMN);
+        TenantId tenantId = ctx.getTenantId();
+        DeviceProfile profile = cache.get(tenantId,deviceId);
+        if(profile == null){
+            ctx.tellFailure(msg,new TbNodeException(String.format("设备【%s】不存在。", deviceIdStr)));
+            return;
+        }
         List<TkThingsModel> eventList =profile.getProfileData().getThingsModel().stream()
                 .filter(f -> f.getIdentifier().equals(eventIdentifier) && FunctionTypeEnum.events.equals(f.getFunctionType()))
                 .collect(Collectors.toList());
@@ -90,7 +95,7 @@ public class TkMsgEventNode implements TbNode {
         long ts = System.currentTimeMillis();
         String src = msg.getData();
         ctx.getTelemetryService().saveAndNotify(
-                tenantId,profileId,
+                tenantId,profile.getId(),
                 msg.getOriginator(),
                 entryList,
                 src,ts,