From cb3124ebcaf7feb37cd59a96b8377eaf7b7f906b Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 04 Nov 2025 17:17:24 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/ws/WebsocketRunClient.java |   85 +++++++++++++++++++++++++++++++++---------
 1 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/nq/ws/WebsocketRunClient.java b/src/main/java/com/nq/ws/WebsocketRunClient.java
index 94f0369..f83d849 100644
--- a/src/main/java/com/nq/ws/WebsocketRunClient.java
+++ b/src/main/java/com/nq/ws/WebsocketRunClient.java
@@ -1,63 +1,112 @@
 package com.nq.ws;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.nq.enums.EStockType;
 import com.nq.pojo.StockRealTimeBean;
 import com.nq.service.IMandatoryLiquidationService;
 import com.nq.service.impl.MandatoryLiquidationService;
-import com.nq.utils.ApplicationContextRegisterUtil;
 import com.nq.utils.redis.RedisKeyUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
 import org.java_websocket.client.WebSocketClient;
 import org.java_websocket.handshake.ServerHandshake;
 import org.springframework.context.ApplicationContext;
 
+import java.io.IOException;
 import java.lang.reflect.Type;
 import java.net.URI;
-import java.util.Map;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
 
 @Slf4j
-public class WebsocketRunClient  extends WebSocketClient {
+public class WebsocketRunClient extends WebSocketClient {
 
     private EStockType eStockType;
-    public WebsocketRunClient(URI serverUri,
-    EStockType eStockType
-    ) {
-        super(serverUri);
+
+    public WebsocketRunClient(URI serverUri, EStockType eStockType) {
+        // 修改为新的WebSocket服务器地址
+        super(URI.create("wss://usws.yanshiz.com/websocket-server"));
         this.eStockType = eStockType;
     }
 
+
     @Override
     public void onOpen(ServerHandshake serverHandshake) {
+        log.info("WebSocket连接已建立,连接到: wss://usws.yanshiz.com/websocket-server");
+        // 发送身份验证消息
         send(("key:"+ eStockType.getStockKey()+":"+eStockType.getContryId()).getBytes());
+        Timer heartbeatTimer;
+        // 启动心跳定时器
+        heartbeatTimer = new Timer();
+        heartbeatTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                if (isOpen()) {
+                    send(("key:"+ eStockType.getStockKey()+":"+eStockType.getContryId()).getBytes());
+                }
+            }
+        }, 0, 3000); // 每3秒发送一次心跳消息
     }
 
     @Override
     public void onMessage(String s) {
-        try {
-            ApplicationContext act = ApplicationContextRegisterUtil.getApplicationContext();
-            MandatoryLiquidationService liquidationService = (MandatoryLiquidationService) act.getBean(IMandatoryLiquidationService.class);
-            StockRealTimeBean stockDetailBean =  new Gson().fromJson(s, StockRealTimeBean.class);
-            liquidationService.RealTimeDataProcess(eStockType,stockDetailBean);
-        }catch (Exception e){
+        if(!s.equals("pong") && !s.equals("身份验证成功")){
+            try {
+                Map<String, String> stringObjectMap = jsonToMap(s);
+                StockRealTimeBean stockRealTimeBean = new StockRealTimeBean();
+                stockRealTimeBean.setPid(stringObjectMap.get("Id"));
+                stockRealTimeBean.setLast(stringObjectMap.get("Last"));
+                stockRealTimeBean.setBid(stringObjectMap.get("Bid"));
+                stockRealTimeBean.setAsk(stringObjectMap.get("Ask"));
+                stockRealTimeBean.setHigh(stringObjectMap.get("High"));
+                stockRealTimeBean.setLow(stringObjectMap.get("Low"));
+                stockRealTimeBean.setPc(stringObjectMap.get("Chg"));
+                stockRealTimeBean.setPcp(stringObjectMap.get("ChgPct") + "%");
+                stockRealTimeBean.setTime(stringObjectMap.get("Time"));
+                stockRealTimeBean.setOpen(stringObjectMap.get("Open"));
+                stockRealTimeBean.setPrevClose(stringObjectMap.get("PrevClose"));
+                stockRealTimeBean.setSymbol(stringObjectMap.get("Symbol"));
 
+                RedisKeyUtil.setCacheRealTimeStock(EStockType.US, stockRealTimeBean);
+
+                ObjectMapper objectMapper = new ObjectMapper();
+                if(!stockRealTimeBean.getPcp().contains("-")){
+                    stockRealTimeBean.setPcp("+" + stringObjectMap.get("ChgPct") + "%");
+                }
+
+                StockRealTimeBean stockDetailBean = new Gson().fromJson(s, StockRealTimeBean.class);
+                RedisKeyUtil.setCacheRealTimeStock(EStockType.US, stockDetailBean);
+
+            } catch (Exception e) {
+                log.error("处理WebSocket消息时发生错误: {}", e.getMessage(), e);
+            }
+
+        } else {
+            log.info("WebSocket心跳或认证响应: {}", s);
         }
     }
 
-    public static Map<String, Object> jsonToMap(String json) {
+    public static Map<String, String> jsonToMap(String json) {
         Gson gson = new Gson();
-        Type type = new TypeToken<Map<String, Object>>(){}.getType();
+        Type type = new TypeToken<Map<String, String>>(){}.getType();
         return gson.fromJson(json, type);
     }
 
     @Override
     public void onClose(int i, String s, boolean b) {
-        log.info("websocket  印度股票  关闭"+1);
+        log.info("WebSocket连接已关闭,代码: {}, 原因: {}, 远程关闭: {}", i, s, b);
     }
 
     @Override
     public void onError(Exception e) {
-        log.info("websocket 错误");
+        log.error("WebSocket连接发生错误: {}", e.getMessage(), e);
     }
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3