From 8c27b10ce8697cf64605ea78d0079cc5809b89c4 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 22 Aug 2024 16:35:57 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=94=B5=E5=8D=95=E8=BD=A6=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-pre.yml    |  2 +-
 .../ElectricBicyclesServerHandler.java        | 52 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml
index 2e040b713..c22d5842a 100644
--- a/jsowell-admin/src/main/resources/application-pre.yml
+++ b/jsowell-admin/src/main/resources/application-pre.yml
@@ -102,7 +102,7 @@ logging:
 
 # 基础URL前缀
 baseurl:
-  prefix: http://121.40.174.65:8080
+  prefix: https://apitest.jsowellcloud.com
 
 # Minio配置
 minio:
diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerHandler.java
index 82957fb76..65e0aef56 100644
--- a/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerHandler.java
+++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerHandler.java
@@ -3,16 +3,26 @@ package com.jsowell.netty.server.electricbicycles;
 import com.alibaba.fastjson2.JSON;
 import com.jsowell.netty.service.electricbicycles.EBikeBusinessService;
 import com.jsowell.pile.domain.ebike.AbsEBikeMessage;
-import io.netty.channel.*;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelInboundHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 @ChannelHandler.Sharable
 @Slf4j
 @Component
 public class ElectricBicyclesServerHandler extends SimpleChannelInboundHandler<AbsEBikeMessage> {
 
+    private final Map<String, ResponseFuture> responseFutureMap = new ConcurrentHashMap<>();
+
     @Autowired
     private EBikeBusinessService eBikeService;
 
@@ -21,4 +31,44 @@ public class ElectricBicyclesServerHandler extends SimpleChannelInboundHandler<A
         log.info("收到消息, channelId:{}, msg:{}", ctx.channel().id().toString(), JSON.toJSONString(msg));
     }
 
+    public String sendCommandAndWaitForResponse(Channel channel, String command, long timeout) throws InterruptedException {
+        String requestId = generateRequestId();
+        ResponseFuture future = new ResponseFuture();
+        responseFutureMap.put(requestId, future);
+
+        // 发送命令
+        channel.writeAndFlush(command);
+
+        // 等待响应
+        return future.get(timeout, TimeUnit.MILLISECONDS);
+    }
+
+    private String extractRequestId(String msg) {
+        // 从响应消息中提取请求ID的逻辑
+        // 这里需要根据您的协议格式进行实现
+        return "";
+    }
+
+    private String generateRequestId() {
+        // 生成唯一的请求ID
+        return String.valueOf(System.currentTimeMillis());
+    }
+
+    private static class ResponseFuture {
+        private final CountDownLatch latch = new CountDownLatch(1);
+        private String response;
+
+        public void setResponse(String response) {
+            this.response = response;
+            latch.countDown();
+        }
+
+        public String get(long timeout, TimeUnit unit) throws InterruptedException {
+            if (latch.await(timeout, unit)) {
+                return response;
+            }
+            return null;
+        }
+    }
+
 }
\ No newline at end of file