Merge branch '20220426' into 'master'

20220426

See merge request huang/thingsboard3.3.2!86

@@ -36,6 +36,7 @@ import org.thingsboard.server.actors.shared.AbstractContextAwareMsgProcessor;
 import org.thingsboard.server.actors.stats.StatsPersistTick;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.edge.EdgeEvent;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
@@ -245,7 +246,15 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         rpc.setExpirationTime(request.getExpirationTime());
         rpc.setRequest(JacksonUtil.valueToTree(request));
         rpc.setStatus(status);
-        rpc.setAdditionalInfo(JacksonUtil.toJsonNode(request.getAdditionalInfo()));
+
+        //Thingskit function
+        JsonNode old = JacksonUtil.toJsonNode(request.getAdditionalInfo());
+        ObjectNode additional = old.isEmpty() ?mapper.createObjectNode():(ObjectNode)old;
+        if(!additional.has("cmdType")){
+            additional.put("cmdType", DeviceTransportType.MQTT.name());
+        }
+        rpc.setAdditionalInfo(additional);
+
         return systemContext.getTbRpcService().save(tenantId, rpc);
     }
 

 package org.thingsboard.server.common.data.yunteng.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.TenantProfile;
-import org.thingsboard.server.common.data.rpc.RpcStatus;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
-import org.thingsboard.server.common.data.yunteng.enums.LoginMethodEnum;
-import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
-
-import javax.validation.constraints.NotEmpty;
-import java.time.LocalDateTime;
+import org.thingsboard.server.common.data.yunteng.enums.YtRpcStatus;
 
 /**
  * @author Administrator
@@ -54,9 +44,12 @@ public class YtRpcRecordDTO  {
     @ApiModelProperty(value = "RPC扩展信息")
     private JsonNode additionalInfo;
     @ApiModelProperty(value = "RPC状态")
-    private RpcStatus status;
-
+    private YtRpcStatus status;
 
 
+    private String statusName;
 
+    public String getStatusName() {
+        return YtRpcStatus.getLabel(status.name());
+    }
 }

+/**
+ * Copyright © 2016-2021 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.enums;
+
+public enum YtRpcStatus {
+    QUEUED("队列中"), SENT("已发送"), DELIVERED("处理中"), SUCCESSFUL("成功"), TIMEOUT("超时"), EXPIRED("过期"), FAILED("失败");
+
+    String label;
+    YtRpcStatus(String label){
+        this.label= label;
+    }
+    public static String getLabel(String name){
+        for(YtRpcStatus type:values()){
+            if(type.name().equals(name)){
+                return type.label;
+            }
+        }
+        return null;
+    }
+}

@@ -155,6 +155,7 @@ public class JsonConverter {
     }
 
     public static JsonElement toJson(TransportProtos.ToDeviceRpcRequestMsg msg, boolean includeRequestId) {
+        //Thingskit function
         JsonObject result = null;
         if("methodThingskit".equals(msg.getMethodName())){
             result= JSON_PARSER.parse(msg.getParams()).getAsJsonObject();
@@ -163,6 +164,8 @@ public class JsonConverter {
             result.addProperty("method", msg.getMethodName());
             result.add("params", JSON_PARSER.parse(msg.getParams()));
         }
+
+
         if (includeRequestId) {
             result.addProperty("id", msg.getRequestId());
         }