Merge branch '20230428' into 'master_dev'

20230428

See merge request yunteng/thingskit!188

@@ -32,5 +32,5 @@ public class TkDeviceRpcDTO implements Serializable {
 
     @ApiModelProperty(value = "寄存器值")
     @NotEmpty(message = "数据相关信息不能为空或者空字符串")
-    private List<Integer> registerVales;
+    private List<Integer> registerValues;
 }

@@ -500,17 +500,25 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         log.debug("【{}】下发RPC命令【{}】给设备【{}】", sessionId, rpcRequest.getParams(), deviceSessionCtx.getDeviceInfo().getDeviceName());
         TcpTransportAdaptor adaptor = deviceSessionCtx.getPayloadAdaptor();
         try {
-            adaptor.convertToPublish(deviceSessionCtx, rpcRequest).ifPresent(payload -> {
-                deviceSessionCtx.rpcRequesting(payload.getIdentifier(),rpcRequest);
+      adaptor
+          .convertToPublish(deviceSessionCtx, rpcRequest)
+          .ifPresent(
+              payload -> {
+                deviceSessionCtx.rpcRequesting(payload.getIdentifier(), rpcRequest);
                 var cf = pushDeviceMsg(deviceSessionCtx.getChannel(), payload.getDatas());
-                cf.addListener(result -> {
-                    if (result.cause() == null) {
-                        transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.DELIVERED, TransportServiceCallback.EMPTY);
-                    } else {
+                cf.addListener(
+                    result -> {
+                      if (result.cause() == null) {
+                        transportService.process(
+                            deviceSessionCtx.getSessionInfo(),
+                            rpcRequest,
+                            RpcStatus.DELIVERED,
+                            TransportServiceCallback.EMPTY);
+                      } else {
                         // TODO: send error
-                    }
-                });
-            });
+                      }
+                    });
+              });
         } catch (Exception e) {
             transportService.process(deviceSessionCtx.getSessionInfo(),
                     TransportProtos.ToDeviceRpcResponseMsg.newBuilder()
@@ -532,10 +540,13 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
      * @return
      */
     private ChannelFuture pushDeviceMsg(ChannelHandlerContext ctx, String message) {
-        byte[] payloadInBytes = ByteUtils.strToBytes(StringUtils.isEmpty(message)?"":message);
-        ByteBuf payload = Unpooled.copiedBuffer(payloadInBytes);
-
-        return ctx.writeAndFlush(payload);
+        ByteBuf buff = Unpooled.buffer();
+        if(!message.matches("-?[0-9a-fA-F]+")){
+            //不满足16进制将字符串转为16进制
+            message = ByteUtils.stringEncodeToHex(message);
+        }
+        buff.writeBytes(ByteUtils.hexToByteArray(message));
+        return ctx.writeAndFlush(buff);
     }
 
 

@@ -140,7 +140,7 @@ public class JsonTcpAdaptor implements TcpTransportAdaptor {
 //        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("\"","");;
+            payload = payload.replace("\"","").replace(" ","");
         }
         TcpDownEntry data = new TcpDownEntry();
         data.setDatas(payload);

@@ -300,7 +300,7 @@ public class TkDeviceScriptServiceImpl
     String addrStr = ByteUtils.integerToHex(config.getRegisterAddr());
     result.append(addrStr.substring(addrStr.length()-4));
 
-    List<Integer> values = config.getRegisterVales();
+    List<Integer> values = config.getRegisterValues();
     Integer registerNum = config.getRegisterNum()==null?1:config.getRegisterNum();
     if(values ==null || values.isEmpty()){
       //读寄存器数据