Merge branch '20230224' into 'master'

fix: 事件问题修复

See merge request yunteng/thingskit!162

@@ -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,

@@ -30,7 +30,7 @@ public interface EventKvRepository extends PagingAndSortingRepository<TkEventKvE
 
     @Query("SELECT a FROM TkEventKvEntity a  WHERE a.id.entityId = :entityId "
             + "AND (:eventType IS NULL OR a.id.eventType = :eventType) "
-            + "AND (:eventIdentifier IS NULL OR a.id.eventIdentifier = :eventIdentifier) "
+            + "AND (a.id.eventIdentifier  LIKE concat('%',:eventIdentifier,'%')) "
             + "AND (:startTime IS NULL OR a.id.eventTime >= :startTime) "
             + "AND (:endTime IS NULL OR a.id.eventTime <= :endTime ) " )
     Page<TkEventKvEntity> findEvents(@Param("entityId") UUID entityId,

@@ -108,7 +108,7 @@ public class JpaEventDao extends JpaAbstractDaoListeningExecutorService implemen
     @Override
     public PageData<TkEventKvDto> findEvents(EntityId entityId,String eventIdentifier,  DeviceEventTypeEnum eventType, TimePageLink pageLink) {
 
-        return DaoUtil.toPageData(eventKvRepository.findEvents(entityId.getId(),eventType,eventIdentifier,pageLink.getStartTime(),pageLink.getEndTime(),DaoUtil.toPageable(pageLink)));
+        return DaoUtil.toPageData(eventKvRepository.findEvents(entityId.getId(),eventType,eventIdentifier==null?"":eventIdentifier,pageLink.getStartTime(),pageLink.getEndTime(),DaoUtil.toPageable(pageLink)));
     }
 
 

@@ -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());
@@ -80,6 +85,7 @@ public class TkMsgEventNode implements TbNode {
             item.setEventIdentifier(i.getIdentifier());
             item.setEventType(i.getEventType());
             item.setEventName(i.getFunctionName());
+            entryList.add(item);
         });
         if(eventList.isEmpty()){
             ctx.tellFailure(msg,new TbNodeException(String.format("产品物模型中未申明,上报的事件类型【%s】。", eventIdentifier)));
@@ -89,8 +95,8 @@ public class TkMsgEventNode implements TbNode {
         long ts = System.currentTimeMillis();
         String src = msg.getData();
         ctx.getTelemetryService().saveAndNotify(
-                tenantId,profileId,
-                msg.getOriginator(),
+                tenantId,profile.getId(),
+                deviceId,
                 entryList,
                 src,ts,
                 new TelemetryNodeCallback(ctx, msg)