Commit d1c55bcecb5cec36b0f09c9cf0c63084d822131f
Merge branch 'master_dev' into 'master'
perf: 设备事件管理移除eventIdentifier标识 See merge request yunteng/thingskit!309
Showing
1 changed file
with
16 additions
and
0 deletions
| @@ -15,6 +15,9 @@ | @@ -15,6 +15,9 @@ | ||
| 15 | */ | 15 | */ |
| 16 | package org.thingsboard.rule.engine.yunteng.event; | 16 | package org.thingsboard.rule.engine.yunteng.event; |
| 17 | 17 | ||
| 18 | +import com.fasterxml.jackson.databind.JsonNode; | ||
| 19 | +import com.fasterxml.jackson.databind.ObjectMapper; | ||
| 20 | +import com.fasterxml.jackson.databind.node.ObjectNode; | ||
| 18 | import lombok.extern.slf4j.Slf4j; | 21 | import lombok.extern.slf4j.Slf4j; |
| 19 | import org.thingsboard.rule.engine.api.*; | 22 | import org.thingsboard.rule.engine.api.*; |
| 20 | import org.thingsboard.rule.engine.api.util.TbNodeUtils; | 23 | import org.thingsboard.rule.engine.api.util.TbNodeUtils; |
| @@ -30,6 +33,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO; | @@ -30,6 +33,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO; | ||
| 30 | import org.thingsboard.server.common.data.yunteng.dto.TkEventKvEntry; | 33 | import org.thingsboard.server.common.data.yunteng.dto.TkEventKvEntry; |
| 31 | import org.thingsboard.server.common.data.yunteng.dto.TkThingsModel; | 34 | import org.thingsboard.server.common.data.yunteng.dto.TkThingsModel; |
| 32 | import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum; | 35 | import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum; |
| 36 | +import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil; | ||
| 33 | import org.thingsboard.server.common.msg.TbMsg; | 37 | import org.thingsboard.server.common.msg.TbMsg; |
| 34 | import org.thingsboard.server.common.msg.session.SessionMsgType; | 38 | import org.thingsboard.server.common.msg.session.SessionMsgType; |
| 35 | 39 | ||
| @@ -111,6 +115,18 @@ public class TkMsgEventNode implements TbNode { | @@ -111,6 +115,18 @@ public class TkMsgEventNode implements TbNode { | ||
| 111 | ////TODO: 验证事件类型、事件标识符和数据建是否与产品物模型中的事件匹配 | 115 | ////TODO: 验证事件类型、事件标识符和数据建是否与产品物模型中的事件匹配 |
| 112 | long ts = System.currentTimeMillis(); | 116 | long ts = System.currentTimeMillis(); |
| 113 | String src = msg.getData(); | 117 | String src = msg.getData(); |
| 118 | + try { | ||
| 119 | + ObjectMapper objectMapper = new ObjectMapper(); | ||
| 120 | + JsonNode jsonNode = objectMapper.readTree(src); | ||
| 121 | + ObjectNode objectNode = (ObjectNode) jsonNode; | ||
| 122 | + String key = "eventIdentifier"; | ||
| 123 | + if(objectNode != null && objectNode.get(key) !=null){ | ||
| 124 | + objectNode.remove(key); | ||
| 125 | + src = JacksonUtil.toString(objectNode); | ||
| 126 | + } | ||
| 127 | + }catch (Exception e){ | ||
| 128 | + log.error("转换异常:"+e.getMessage()); | ||
| 129 | + } | ||
| 114 | ctx.getTelemetryService().saveAndNotify( | 130 | ctx.getTelemetryService().saveAndNotify( |
| 115 | tenantId,profile.getId(), | 131 | tenantId,profile.getId(), |
| 116 | deviceId, | 132 | deviceId, |