Merge branch '20230223' into 'master'

refactor: 设备事件上报逻辑调整

See merge request yunteng/thingskit!161

@@ -41,31 +41,13 @@ import org.thingsboard.server.common.data.edge.EdgeEventType;
 import org.thingsboard.server.common.data.edge.EdgeInfo;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.id.AlarmId;
-import org.thingsboard.server.common.data.id.AssetId;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.DashboardId;
-import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.DeviceProfileId;
-import org.thingsboard.server.common.data.id.EdgeId;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.EntityIdFactory;
-import org.thingsboard.server.common.data.id.EntityViewId;
-import org.thingsboard.server.common.data.id.OtaPackageId;
-import org.thingsboard.server.common.data.id.RpcId;
-import org.thingsboard.server.common.data.id.RuleChainId;
-import org.thingsboard.server.common.data.id.RuleNodeId;
-import org.thingsboard.server.common.data.id.TbResourceId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.id.TenantProfileId;
-import org.thingsboard.server.common.data.id.UserId;
-import org.thingsboard.server.common.data.id.WidgetTypeId;
-import org.thingsboard.server.common.data.id.WidgetsBundleId;
+import org.thingsboard.server.common.data.id.*;
 import org.thingsboard.server.common.data.page.PageDataIterableByTenantIdEntityId;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.SortOrder;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.rpc.Rpc;
@@ -74,6 +56,9 @@ import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.audit.AuditLogService;
@@ -121,12 +106,7 @@ import org.thingsboard.server.service.telemetry.TelemetrySubscriptionService;
 
 import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 import static org.thingsboard.server.controller.ControllerConstants.DEFAULT_PAGE_SIZE;
 import static org.thingsboard.server.controller.ControllerConstants.INCORRECT_TENANT_ID;
@@ -929,4 +909,45 @@ public abstract class BaseController {
         return deviceProfileData;
 
     }
+
+
+    /**
+     * 更新thingsboard的设备配置信息
+     *
+     * @param deviceProfile 设备配置
+     * @throws ThingsboardException
+     */
+    protected DeviceProfile updateTbDeviceProfile(DeviceProfile deviceProfile)
+            throws ThingsboardException {
+        boolean isFirmwareChanged = false;
+        boolean isSoftwareChanged = false;
+
+        DeviceProfile oldDeviceProfile =
+                deviceProfileService.findDeviceProfileById(getTenantId(), deviceProfile.getId());
+        if (!Objects.equals(deviceProfile.getFirmwareId(), oldDeviceProfile.getFirmwareId())) {
+            isFirmwareChanged = true;
+        }
+        if (!Objects.equals(deviceProfile.getSoftwareId(), oldDeviceProfile.getSoftwareId())) {
+            isSoftwareChanged = true;
+        }
+        if (FastIotConstants.ASSERT_DEFAULT_NAME.equals(oldDeviceProfile.getName())
+                && !Objects.equals(deviceProfile.getName(), oldDeviceProfile.getName())) {
+            throw new TkDataValidationException(ErrorMessage.ASSERT_DEFAULT_NAME_NO_CHANGED.getMessage());
+        }
+
+        DeviceProfile savedDeviceProfile =
+                checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));
+
+        tbClusterService.onDeviceProfileChange(savedDeviceProfile, null);
+        tbClusterService.broadcastEntityStateChangeEvent(
+                deviceProfile.getTenantId(), savedDeviceProfile.getId(), ComponentLifecycleEvent.UPDATED);
+
+        logEntityAction(savedDeviceProfile.getId(), savedDeviceProfile, null, ActionType.UPDATED, null);
+
+        otaPackageStateService.update(savedDeviceProfile, isFirmwareChanged, isSoftwareChanged);
+
+        sendEntityNotificationMsg(
+                getTenantId(), savedDeviceProfile.getId(), EdgeEventActionType.UPDATED);
+        return savedDeviceProfile;
+    }
 }

 package org.thingsboard.server.controller.yunteng;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -9,7 +10,10 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
@@ -18,9 +22,11 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkThingsModel;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
+import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
@@ -119,9 +125,12 @@ public class ThingsModelController extends BaseController {
     if (null == dto) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    return ResponseEntity.ok(
-        thingsModelService.changeTSLStatus(
-            deviceProfileId, tenantId, StatusEnum.ENABLE.getIndex()));
+    List<TkThingsModel> thingsModels = thingsModelService.changeTSLStatus(deviceProfileId, tenantId, StatusEnum.ENABLE.getIndex());
+    DeviceProfile tbProfile = deviceProfileService.findDeviceProfileById(getTenantId(), DeviceProfileId.fromString(dto.getTbProfileId()));
+    tbProfile.getProfileData()
+            .setThingsModel(thingsModels);
+    updateTbDeviceProfile(tbProfile);
+    return ResponseEntity.ok(true);
   }
 
   @GetMapping("/get_services/{deviceProfileId}")

@@ -114,45 +114,6 @@ public class TkDeviceScriptController extends BaseController {
     return ResponseEntity.ok(true);
   }
 
-  /**
-   * 更新thingsboard的设备配置信息
-   *
-   * @param deviceProfile 设备配置
-   * @throws ThingsboardException
-   */
-  private DeviceProfile updateTbDeviceProfile(DeviceProfile deviceProfile)
-      throws ThingsboardException {
-    boolean isFirmwareChanged = false;
-    boolean isSoftwareChanged = false;
-
-    DeviceProfile oldDeviceProfile =
-        deviceProfileService.findDeviceProfileById(getTenantId(), deviceProfile.getId());
-    if (!Objects.equals(deviceProfile.getFirmwareId(), oldDeviceProfile.getFirmwareId())) {
-      isFirmwareChanged = true;
-    }
-    if (!Objects.equals(deviceProfile.getSoftwareId(), oldDeviceProfile.getSoftwareId())) {
-      isSoftwareChanged = true;
-    }
-    if (FastIotConstants.ASSERT_DEFAULT_NAME.equals(oldDeviceProfile.getName())
-        && !Objects.equals(deviceProfile.getName(), oldDeviceProfile.getName())) {
-      throw new TkDataValidationException(ErrorMessage.ASSERT_DEFAULT_NAME_NO_CHANGED.getMessage());
-    }
-
-    DeviceProfile savedDeviceProfile =
-        checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));
-
-    tbClusterService.onDeviceProfileChange(savedDeviceProfile, null);
-    tbClusterService.broadcastEntityStateChangeEvent(
-        deviceProfile.getTenantId(), savedDeviceProfile.getId(), ComponentLifecycleEvent.UPDATED);
-
-    logEntityAction(savedDeviceProfile.getId(), savedDeviceProfile, null, ActionType.UPDATED, null);
-
-    otaPackageStateService.update(savedDeviceProfile, isFirmwareChanged, isSoftwareChanged);
-
-    sendEntityNotificationMsg(
-        getTenantId(), savedDeviceProfile.getId(), EdgeEventActionType.UPDATED);
-    return savedDeviceProfile;
-  }
 
   @GetMapping("{id}")
   @ApiOperation("详情")

@@ -32,6 +32,7 @@ import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.*;
+import org.thingsboard.server.common.data.yunteng.dto.TkEventKvEntry;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TbCallback;
@@ -235,13 +236,13 @@ public class DefaultTelemetrySubscriptionService extends AbstractSubscriptionSer
 
     //Thingskit function
     @Override
-    public void saveAndNotify(TenantId tenantId, DeviceProfileId profileId, EntityId entityId, String eventId, DeviceEventTypeEnum eventType, String eventData, Long eventTime, FutureCallback<Void> callback) {
+    public void saveAndNotify(TenantId tenantId, DeviceProfileId profileId, EntityId entityId, List<TkEventKvEntry> events, String eventData, Long eventTime, FutureCallback<Void> callback) {
         checkInternalEntity(entityId);
-        saveAndNotifyInternal(tenantId,profileId, entityId,  eventId,eventType, eventData,eventTime, callback);
+        saveAndNotifyInternal(tenantId,profileId, entityId,  events, eventData,eventTime, callback);
     }
     @Override
-    public void saveAndNotifyInternal(TenantId tenantId,DeviceProfileId profileId, EntityId entityId,String eventId, DeviceEventTypeEnum eventType, String eventData,Long eventTime, FutureCallback<Void> callback) {
-        ListenableFuture<List<Void>> saveFuture = eventsService.save(tenantId,profileId, entityId,eventId,eventType, eventData,eventTime);
+    public void saveAndNotifyInternal(TenantId tenantId,DeviceProfileId profileId, EntityId entityId,List<TkEventKvEntry> events, String eventData,Long eventTime, FutureCallback<Void> callback) {
+        ListenableFuture<List<Void>> saveFuture = eventsService.save(tenantId,profileId, entityId,events, eventData,eventTime);
         addVoidCallback(saveFuture, callback);
 //        addWsCallback(saveFuture, success -> onAttributesUpdate(tenantId, entityId, scope, attributes, notifyDevice));
     }

@@ -39,7 +39,7 @@ public interface InternalTelemetryService extends RuleEngineTelemetryService {
     void saveAndNotifyInternal(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback);
 
     //Thingskit function
-    void saveAndNotifyInternal(TenantId tenantId, DeviceProfileId profileId, EntityId entityId, String eventId, DeviceEventTypeEnum eventType, String eventData,Long eventTime, FutureCallback<Void> callback);
+    void saveAndNotifyInternal(TenantId tenantId, DeviceProfileId profileId, EntityId entityId, List<TkEventKvEntry> eventKvEntry, String eventData, Long eventTime, FutureCallback<Void> callback);
 
     void saveLatestAndNotifyInternal(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Void> callback);
 

@@ -22,6 +22,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.yunteng.dto.TkEventKvDto;
+import org.thingsboard.server.common.data.yunteng.dto.TkEventKvEntry;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
 
 import java.util.List;
@@ -31,7 +32,7 @@ import java.util.List;
  */
 public interface TkEventsService {
     PageData<TkEventKvDto> findEvents(EntityId entityId,String eventIdentifier,  DeviceEventTypeEnum eventType, TimePageLink pageLink);
-    ListenableFuture<List<Void>> save(TenantId tenantId, DeviceProfileId profileId,EntityId entityId, String eventId, DeviceEventTypeEnum eventType, String eventData,Long eventTime);
+    ListenableFuture<List<Void>> save(TenantId tenantId, DeviceProfileId profileId, EntityId entityId, List<TkEventKvEntry> eventKvEntry, String eventData, Long eventTime);
 
 
 

@@ -18,6 +18,7 @@ package org.thingsboard.server.common.data.device.profile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.dto.TkThingsModel;
 
 import javax.validation.Valid;
 import java.io.Serializable;
@@ -38,4 +39,9 @@ public class DeviceProfileData implements Serializable {
     @ApiModelProperty(position = 4, value = "JSON array of alarm rules configuration per device profile")
     private List<DeviceProfileAlarm> alarms;
 
+    //Thingskit function
+    @Valid
+    @ApiModelProperty(position = 5, value = "JSON object of has published things model configuration")
+    private List<TkThingsModel> thingsModel;
+
 }

-/**
- * Copyright © 2016-2022 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.thingsboard.server.common.data.yunteng.dto;
 
-import org.thingsboard.server.common.data.kv.KvEntry;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
+
+import java.io.Serializable;
 
 /**
  * @author Andrew Shvayka
  */
-public interface TkEventKvEntry extends KvEntry {
+@Data
+public class TkEventKvEntry implements Serializable {
+
 
-    long getEventTime();
+    private DeviceEventTypeEnum eventType;
+    private  String eventName;
+    private String eventIdentifier;
 
 }

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class TkThingsModel implements Serializable {
+
+  private FunctionTypeEnum functionType;
+
+
+  private String functionName;
+
+
+  private String identifier;
+
+
+  private CallTypeEnum callType;
+
+  private String accessMode;
+
+
+  private DeviceEventTypeEnum eventType;
+
+
+  private JsonNode functionJson;
+
+
+  private Integer status;
+
+
+  private String deviceProfileId;
+
+  private String remark;
+}

@@ -582,7 +582,7 @@ public class DefaultTransportService implements TransportService {
             throw new TkDataValidationException(ErrorMessage.INVALID_TOPIC.getMessage());
         }
         String[] eventInfo = topicInfo[1].split("/");
-        if(null == eventInfo || eventInfo.length !=3){
+        if(null == eventInfo || eventInfo.length !=2){
             throw new TkDataValidationException(ErrorMessage.INVALID_TOPIC.getMessage());
         }
         reportActivityInternal(sessionInfo);
@@ -593,7 +593,7 @@ 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.getDeviceProfileIdMSB());
+        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]);

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
@@ -195,8 +196,16 @@ public class ThingsModelServiceImpl
 
   @Override
   @Transactional
-  public boolean changeTSLStatus(String deviceProfileId, String tenantId, Integer status) {
-    return baseMapper.changeTSLStatus(deviceProfileId, tenantId, status);
+  public List<TkThingsModel> changeTSLStatus(String deviceProfileId, String tenantId, Integer status) {
+    boolean result = baseMapper.changeTSLStatus(deviceProfileId, tenantId, status);
+    if(result){
+      List<TkThingsModelEntity> entityList = baseMapper.selectList(new LambdaQueryWrapper<TkThingsModelEntity>().eq(TkThingsModelEntity::getDeviceProfileId,deviceProfileId));
+      if (entityList.isEmpty()) {
+        return null;
+      }
+      return entityList.stream().map(en -> en.getDTO(TkThingsModel.class)).collect(Collectors.toList());
+    }
+    return null;
   }
 
   private boolean checkIdentifier(

@@ -25,10 +25,13 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.yunteng.dto.TkEventKvDto;
+import org.thingsboard.server.common.data.yunteng.dto.TkEventKvEntry;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
+import org.thingsboard.server.dao.attributes.AttributeUtils;
 import org.thingsboard.server.dao.yunteng.event.TkEventsService;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static org.thingsboard.server.dao.yunteng.jpa.dao.event.EventUtils.validate;
 
@@ -53,10 +56,10 @@ public class BaseEventsService implements TkEventsService {
     }
 
     @Override
-    public ListenableFuture<List<Void>> save(TenantId tenantId,DeviceProfileId profileId, EntityId entityId, String eventId, DeviceEventTypeEnum eventType,  String eventData,Long eventTime) {
-        validate(entityId, eventId,eventType);
-
-        ListenableFuture<Void> saveFutures = eventsDao.save(tenantId, profileId,entityId, eventType,eventId, eventData,eventTime);
+    public ListenableFuture<List<Void>> save(TenantId tenantId, DeviceProfileId profileId, EntityId entityId, List<TkEventKvEntry> events, String eventData, Long eventTime) {
+        validate(entityId);
+        events.forEach(event -> validate(event));
+        List<ListenableFuture<Void>> saveFutures = events.stream().map(event -> eventsDao.save(tenantId, profileId,entityId, event,eventData,eventTime)).collect(Collectors.toList());
         return Futures.allAsList(saveFutures);
     }
 

@@ -44,11 +44,8 @@ public class EventUtils {
     public static void validate(TkEventKvEntry kvEntry) {
         if (kvEntry == null) {
             throw new IncorrectParameterException("Key value entry can't be null");
-        } else if (kvEntry.getDataType() == null) {
-            throw new IncorrectParameterException("Incorrect kvEntry. Data type can't be null");
-        } else {
-            Validator.validateString(kvEntry.getKey(), "Incorrect kvEntry. Key can't be empty");
-            Validator.validatePositiveNumber(kvEntry.getEventTime(), "Incorrect last update ts. Ts should be positive");
+        } else if (kvEntry.getEventType() == null) {
+            throw new IncorrectParameterException("Incorrect event type. event type can't be null");
         }
     }
 }

@@ -22,8 +22,11 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.yunteng.dto.TkEventKvDto;
+import org.thingsboard.server.common.data.yunteng.dto.TkEventKvEntry;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
 
+import java.util.List;
+
 /**
  * @author Andrew Shvayka
  */
@@ -31,6 +34,6 @@ public interface EventsDao {
 
     PageData<TkEventKvDto> findEvents(EntityId entityId,String eventIdentifier,  DeviceEventTypeEnum eventType, TimePageLink pageLink);
 
-    ListenableFuture<Void> save(TenantId tenantId, DeviceProfileId profileId,EntityId entityId, DeviceEventTypeEnum attributeType,String eventIdentifier, String eventData,Long eventTime);
+    ListenableFuture<Void> save(TenantId tenantId, DeviceProfileId profileId, EntityId entityId, TkEventKvEntry eventKvEntry, String eventData, Long eventTime);
 
 }

@@ -26,6 +26,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
 import org.thingsboard.server.common.data.yunteng.dto.TkEventKvDto;
+import org.thingsboard.server.common.data.yunteng.dto.TkEventKvEntry;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
 import org.thingsboard.server.common.stats.StatsFactory;
 import org.thingsboard.server.dao.DaoUtil;
@@ -40,6 +41,7 @@ import org.thingsboard.server.dao.yunteng.jpa.entity.events.TkEventKvEntity;
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import java.util.Comparator;
+import java.util.List;
 import java.util.function.Function;
 
 @Component
@@ -111,10 +113,10 @@ public class JpaEventDao extends JpaAbstractDaoListeningExecutorService implemen
 
 
     @Override
-    public ListenableFuture<Void> save(TenantId tenantId, DeviceProfileId profileId,EntityId entityId,DeviceEventTypeEnum eventType, String eventIdentifier, String eventData,Long eventTime) {
+    public ListenableFuture<Void> save(TenantId tenantId, DeviceProfileId profileId, EntityId entityId,TkEventKvEntry eventKvEntry,  String eventData, Long eventTime) {
         TkEventKvEntity entity = new TkEventKvEntity();
-        entity.setId(new TkEventKvCompositeKey(eventType, entityId.getId(), eventIdentifier, eventTime));
-        entity.setEventName("test");
+        entity.setId(new TkEventKvCompositeKey(eventKvEntry.getEventType(), entityId.getId(), eventKvEntry.getEventIdentifier(), eventTime));
+        entity.setEventName(eventKvEntry.getEventName());
         entity.setDeviceProfileId(profileId.getId());
         entity.setEventValue(eventData);
         return addToQueue(entity);

@@ -3,8 +3,10 @@ package org.thingsboard.server.dao.yunteng.service;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
+import org.thingsboard.server.common.data.yunteng.dto.TkThingsModel;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
+import org.thingsboard.server.dao.yunteng.entities.TkThingsModelEntity;
 
 import java.util.List;
 import java.util.Map;
@@ -26,5 +28,5 @@ public interface ThingsModelService {
 
   JsonNode getTingsModelTSL(FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId);
 
-  boolean changeTSLStatus(String deviceProfileId, String tenantId, Integer status);
+  List<TkThingsModel> changeTSLStatus(String deviceProfileId, String tenantId, Integer status);
 }

@@ -45,7 +45,7 @@ public interface RuleEngineTelemetryService {
     void saveAndNotify(TenantId tenantId, EntityId entityId, String scope, List<AttributeKvEntry> attributes, boolean notifyDevice, FutureCallback<Void> callback);
 
     //Thingskit function
-    void saveAndNotify(TenantId tenantId, DeviceProfileId profileId, EntityId entityId, String eventId, DeviceEventTypeEnum eventType, String eventData,Long eventTime, FutureCallback<Void> callback);
+    void saveAndNotify(TenantId tenantId, DeviceProfileId profileId, EntityId entityId, List<TkEventKvEntry> eventKvEntry, String eventData, Long eventTime, FutureCallback<Void> callback);
 
     void saveLatestAndNotify(TenantId tenantId, EntityId entityId, List<TsKvEntry> ts, FutureCallback<Void> callback);
 

@@ -19,15 +19,24 @@ import lombok.extern.slf4j.Slf4j;
 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.DeviceProfileId;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentType;
-import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
+import org.thingsboard.server.common.data.yunteng.core.exception.ThingsKitException;
+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;
 import org.thingsboard.server.common.msg.TbMsg;
 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;
 
-import static org.thingsboard.server.dao.model.ModelConstants.*;
+import static org.thingsboard.server.dao.model.ModelConstants.DEVICE_DEVICE_PROFILE_ID_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.EVENT_IDENTIFIER_COLUMN;
 
 @Slf4j
 @RuleNode(
@@ -57,17 +66,32 @@ public class TkMsgEventNode implements TbNode {
             ctx.tellFailure(msg, new IllegalArgumentException("Unsupported msg type: " + msg.getType()));
             return;
         }
-        String eventIdentifier = msg.getMetaData().getValue(EVENT_IDENTIFIER_COLUMN);
         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 eventIdentifier = msg.getMetaData().getValue(EVENT_IDENTIFIER_COLUMN);
+        List<TkThingsModel> eventList =profile.getProfileData().getThingsModel().stream()
+                .filter(f -> f.getIdentifier().equals(eventIdentifier) && FunctionTypeEnum.events.equals(f.getFunctionType()))
+                .collect(Collectors.toList());
+        List<TkEventKvEntry> entryList = new ArrayList<>();
+        eventList.stream().forEach(i ->{
+            TkEventKvEntry item = new TkEventKvEntry();
+            item.setEventIdentifier(i.getIdentifier());
+            item.setEventType(i.getEventType());
+            item.setEventName(i.getFunctionName());
+        });
+        if(eventList.isEmpty()){
+            ctx.tellFailure(msg,new TbNodeException(String.format("产品物模型中未申明,上报的事件类型【%s】。", eventIdentifier)));
+            return;
+        }
         ////TODO: 验证事件类型、事件标识符和数据建是否与产品物模型中的事件匹配
         long ts = System.currentTimeMillis();
         String src = msg.getData();
-        DeviceEventTypeEnum eventType = DeviceEventTypeEnum.valueOf(msg.getMetaData().getValue(EVENT_TYPE_COLUMN));
         ctx.getTelemetryService().saveAndNotify(
-                ctx.getTenantId(),new DeviceProfileId(UUID.fromString(deviceProfileId)),
+                tenantId,profileId,
                 msg.getOriginator(),
-                eventIdentifier,
-                eventType,
+                entryList,
                 src,ts,
                 new TelemetryNodeCallback(ctx, msg)
         );