refactor: 上、下行内容乱码问题

+package org.thingsboard.server.common.data.yunteng.enums;
+
+/**
+ * 编码类型
+ */
+public enum TcpDataTypeEnum {
+    HEX,
+    JSON,
+    ASCII
+}

@@ -156,7 +156,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
             if (msg instanceof ByteBuf) {
             if (msg instanceof ByteBuf) {
                 ByteBuf message = (ByteBuf) msg;
                 ByteBuf message = (ByteBuf) msg;
                 byte[] byteMsg = ByteUtils.buf2Bytes(message);
                 byte[] byteMsg = ByteUtils.buf2Bytes(message);
-                String msgStr = ByteUtils.bytesToHex(byteMsg);
+                String msgStr = ByteUtils.bytesToStr(byteMsg);
                 log.error("会话【{}】收到设备【{}】来自【{}】数据【{}】", sessionId, deviceSessionCtx.getDeviceId(), address, msgStr);
                 log.error("会话【{}】收到设备【{}】来自【{}】数据【{}】", sessionId, deviceSessionCtx.getDeviceId(), address, msgStr);
                 deviceSessionCtx.setChannel(ctx);
                 deviceSessionCtx.setChannel(ctx);
                 if (deviceSessionCtx.getDeviceInfo() == null || deviceSessionCtx.getDeviceProfile() == null) {
                 if (deviceSessionCtx.getDeviceInfo() == null || deviceSessionCtx.getDeviceProfile() == null) {
@@ -589,15 +589,10 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
      * @return
      * @return
      */
      */
     private ChannelFuture pushDeviceMsg(ChannelHandlerContext ctx, String message) {
     private ChannelFuture pushDeviceMsg(ChannelHandlerContext ctx, String message) {
-        try {
-            byte[] payloadInBytes = message.getBytes(ByteUtils.UTF_8);
-            ByteBuf payload = Unpooled.copiedBuffer(payloadInBytes);
+        byte[] payloadInBytes = ByteUtils.strToBytes(message);
+        ByteBuf payload = Unpooled.copiedBuffer(payloadInBytes);
 
 
-            return ctx.writeAndFlush(payload);
-        } catch (UnsupportedEncodingException e) {
-            log.error(e.getMessage(), e);
-            throw new RuntimeException(e);
-        }
+        return ctx.writeAndFlush(payload);
     }
     }
 
 
 
 

@@ -126,8 +126,15 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
 
 
     @Override
     @Override
     public Optional<TcpDownEntry> convertToPublish(TcpDeviceWareSessionContext ctx, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) throws ExecutionException, InterruptedException {
     public Optional<TcpDownEntry> convertToPublish(TcpDeviceWareSessionContext ctx, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) throws ExecutionException, InterruptedException {
-        ListenableFuture<Object> result = ctx.getContext().getJsEngine().invokeFunction(ctx.getRpcScriptId(),  rpcRequest.getParams());
-        return Optional.of(Futures.transform(result, t -> JacksonUtil.fromString(t.toString(), TcpDownEntry.class), MoreExecutors.directExecutor()).get());
+//        ListenableFuture<Object> result = ctx.getContext().getJsEngine().invokeFunction(ctx.getRpcScriptId(),  rpcRequest.getParams());
+//        return Optional.of(Futures.transform(result, t -> JacksonUtil.fromString(t.toString(), TcpDownEntry.class), MoreExecutors.directExecutor()).get());
+        String payload = rpcRequest.getParams();//methodThingskit
+        if (!payload.startsWith("{") && !payload.endsWith("}")) {
+            payload = payload.replace("\"","");;
+        }
+        TcpDownEntry data = new TcpDownEntry();
+        data.setDatas(payload);
+        return Optional.of(data);
     }
     }
 
 
     @Override
     @Override

@@ -2,6 +2,7 @@ package org.thingsboard.server.transport.tcp.adaptors;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.TcpDataTypeEnum;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.UUID;
 import java.util.UUID;
@@ -10,7 +11,6 @@ import java.util.UUID;
  * 下行脚本
  * 下行脚本
  */
  */
 @Data
 @Data
-@AllArgsConstructor
 public class TcpDownEntry implements Serializable {
 public class TcpDownEntry implements Serializable {
 
 
     /**
     /**
@@ -25,4 +25,7 @@ public class TcpDownEntry implements Serializable {
      * 下发给设备的最终内容
      * 下发给设备的最终内容
      */
      */
     private String datas;
     private String datas;
+
+    /**下发给设备的字符串编码*/
+    private TcpDataTypeEnum dataType;
 }
 }