简柏林 / thingskit · Commits

Commit 026b770c402de9010005ad06ee07c4f62b4ef5ee

Authored by 云中非
1 parent fe0efd26

refactor: RPC状态返回命令类型

Inline Side-by-side
Showing 2 changed files with 13 additions and 1 deletions
@@ -36,6 +36,7 @@ import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor; @@ -36,6 +36,7 @@ import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor;
36 import org.thingsboard.server.actors.stats.StatsPersistTick; 36 import org.thingsboard.server.actors.stats.StatsPersistTick;
37 import org.thingsboard.server.common.data.DataConstants; 37 import org.thingsboard.server.common.data.DataConstants;
38 import org.thingsboard.server.common.data.Device; 38 import org.thingsboard.server.common.data.Device;
  39 +import org.thingsboard.server.common.data.DeviceTransportType;
39 import org.thingsboard.server.common.data.StringUtils; 40 import org.thingsboard.server.common.data.StringUtils;
40 import org.thingsboard.server.common.data.edge.EdgeEvent; 41 import org.thingsboard.server.common.data.edge.EdgeEvent;
41 import org.thingsboard.server.common.data.edge.EdgeEventActionType; 42 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
@@ -245,7 +246,15 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor { @@ -245,7 +246,15 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
245 rpc.setExpirationTime(request.getExpirationTime()); 246 rpc.setExpirationTime(request.getExpirationTime());
246 rpc.setRequest(JacksonUtil.valueToTree(request)); 247 rpc.setRequest(JacksonUtil.valueToTree(request));
247 rpc.setStatus(status); 248 rpc.setStatus(status);
248 - rpc.setAdditionalInfo(JacksonUtil.toJsonNode(request.getAdditionalInfo())); 249 +
  250 + //Thingskit function
  251 + JsonNode old = JacksonUtil.toJsonNode(request.getAdditionalInfo());
  252 + ObjectNode additional = old.isEmpty() ?mapper.createObjectNode():(ObjectNode)old;
  253 + if(!additional.has("cmdType")){
  254 + additional.put("cmdType", DeviceTransportType.MQTT.name());
  255 + }
  256 + rpc.setAdditionalInfo(additional);
  257 +
249 return systemContext.getTbRpcService().save(tenantId, rpc); 258 return systemContext.getTbRpcService().save(tenantId, rpc);
250 } 259 }
251 260
@@ -155,6 +155,7 @@ public class JsonConverter { @@ -155,6 +155,7 @@ public class JsonConverter {
155 } 155 }
156 156
157 public static JsonElement toJson(TransportProtos.ToDeviceRpcRequestMsg msg, boolean includeRequestId) { 157 public static JsonElement toJson(TransportProtos.ToDeviceRpcRequestMsg msg, boolean includeRequestId) {
  158 + //Thingskit function
158 JsonObject result = null; 159 JsonObject result = null;
159 if("methodThingskit".equals(msg.getMethodName())){ 160 if("methodThingskit".equals(msg.getMethodName())){
160 result= JSON_PARSER.parse(msg.getParams()).getAsJsonObject(); 161 result= JSON_PARSER.parse(msg.getParams()).getAsJsonObject();
@@ -163,6 +164,8 @@ public class JsonConverter { @@ -163,6 +164,8 @@ public class JsonConverter {
163 result.addProperty("method", msg.getMethodName()); 164 result.addProperty("method", msg.getMethodName());
164 result.add("params", JSON_PARSER.parse(msg.getParams())); 165 result.add("params", JSON_PARSER.parse(msg.getParams()));
165 } 166 }
  167 +
  168 +
166 if (includeRequestId) { 169 if (includeRequestId) {
167 result.addProperty("id", msg.getRequestId()); 170 result.addProperty("id", msg.getRequestId());
168 } 171 }