简柏林 / thingskit · Commits

Commit 4ec6a13c931950ac5b14f1aaa770d827ef32449c

Authored by 芯火源
1 parent 71f2a7c0

refactor: 设备事件上报时，用物模型验证事件是否有效

Inline Side-by-side
Showing 1 changed file with 5 additions and 0 deletions
... ... @@ -23,6 +23,7 @@ import org.thingsboard.server.common.data.DeviceProfile;
23 23 import org.thingsboard.server.common.data.id.DeviceProfileId;
24 24 import org.thingsboard.server.common.data.id.TenantId;
25 25 import org.thingsboard.server.common.data.plugin.ComponentType;
  26 +import org.thingsboard.server.common.data.yunteng.core.exception.ThingsKitException;
26 27 import org.thingsboard.server.common.data.yunteng.dto.TkEventKvEntry;
27 28 import org.thingsboard.server.common.data.yunteng.dto.TkThingsModel;
28 29 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
... ... @@ -80,6 +81,10 @@ public class TkMsgEventNode implements TbNode {
80 81 item.setEventType(i.getEventType());
81 82 item.setEventName(i.getFunctionName());
82 83 });
  84 + if(eventList.isEmpty()){
  85 + ctx.tellFailure(msg,new TbNodeException(String.format("产品物模型中未申明,上报的事件类型【%s】。", eventIdentifier)));
  86 + return;
  87 + }
83 88 ////TODO: 验证事件类型、事件标识符和数据建是否与产品物模型中的事件匹配
84 89 long ts = System.currentTimeMillis();
85 90 String src = msg.getData();
... ...