fix: TCP命令下发状态超时问题修复

1、同步时，命令下发后返回状态DELIVERED给演员节点
2、异步时，命令下发后返回状态SENT给演员节点
设备演员在收到的RPC状态为DELIVERED才会删除监控RPC状态的定时任务。

@@ -71,6 +71,7 @@ import java.util.Optional;
 import java.util.UUID;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 import java.util.regex.Pattern;
 
 
@@ -526,11 +527,23 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         TcpTransportAdaptor adaptor = deviceSessionCtx.getPayloadAdaptor();
         TcpTransportAdaptor adaptor = deviceSessionCtx.getPayloadAdaptor();
         try {
         try {
             adaptor.convertToPublish(deviceSessionCtx, rpcRequest).ifPresent(payload -> {
             adaptor.convertToPublish(deviceSessionCtx, rpcRequest).ifPresent(payload -> {
-
+                int msgId = rpcRequest.getRequestId();
+                boolean oneWay = rpcRequest.getOneway();
+                if (!oneWay) {
+                    rpcAwaitingAck.put(msgId, rpcRequest);
+                    context.getScheduler().schedule(() -> {
+                        TransportProtos.ToDeviceRpcRequestMsg msg = rpcAwaitingAck.remove(msgId);
+                        if (msg != null) {
+                            transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.TIMEOUT, TransportServiceCallback.EMPTY);
+                        }
+                    }, Math.max(0, Math.min(deviceSessionCtx.getContext().getTimeout(), rpcRequest.getExpirationTime() - System.currentTimeMillis())), TimeUnit.MILLISECONDS);
+                }
                 var cf = pushDeviceMsg(deviceSessionCtx.getChannel(), payload.getDatas());
                 var cf = pushDeviceMsg(deviceSessionCtx.getChannel(), payload.getDatas());
                 cf.addListener(result -> {
                 cf.addListener(result -> {
                     if (result.cause() == null) {
                     if (result.cause() == null) {
-                        if (rpcRequest.getPersisted()) {
+                        if (oneWay) {
+                            transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.DELIVERED, TransportServiceCallback.EMPTY);
+                        } else if (rpcRequest.getPersisted()) {
                             transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.SENT, TransportServiceCallback.EMPTY);
                             transportService.process(deviceSessionCtx.getSessionInfo(), rpcRequest, RpcStatus.SENT, TransportServiceCallback.EMPTY);
                         }
                         }
                     } else {
                     } else {

@@ -93,11 +93,15 @@ public class TcpGatewayDeviceSessionCtx extends TcpDeviceWareSessionContext impl
         try {
         try {
             parent.getPayloadAdaptor().convertToPublish(this, request).ifPresent(
             parent.getPayloadAdaptor().convertToPublish(this, request).ifPresent(
                     payload -> {
                     payload -> {
+                        boolean oneWay = request.getOneway();
                         ChannelFuture channelFuture = parent.pushDeviceMsg(payload.getDatas());
                         ChannelFuture channelFuture = parent.pushDeviceMsg(payload.getDatas());
                         if (request.getPersisted()) {
                         if (request.getPersisted()) {
                             channelFuture.addListener(result -> {
                             channelFuture.addListener(result -> {
-                                if (result.cause() == null) {
+                                if (oneWay) {
+                                    transportService.process(getSessionInfo(), request, RpcStatus.DELIVERED, TransportServiceCallback.EMPTY);
+                                } else if (request.getPersisted()) {
                                     transportService.process(getSessionInfo(), request, RpcStatus.SENT, TransportServiceCallback.EMPTY);
                                     transportService.process(getSessionInfo(), request, RpcStatus.SENT, TransportServiceCallback.EMPTY);
+
                                 }
                                 }
                             });
                             });
                         }
                         }