From 5483fa32808d5fe1cbdc10f3df40316708d73c04 Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Thu, 23 Oct 2025 22:21:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/ws/WebsocketRunClient.java | 178 ++++++++++++++++++++++------------
src/main/java/com/nq/ws/WebSocketClientBeanConfig.java | 82 +++++++---------
src/main/java/com/nq/service/impl/AgentUserServiceImpl.java | 10 +
3 files changed, 157 insertions(+), 113 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/AgentUserServiceImpl.java b/src/main/java/com/nq/service/impl/AgentUserServiceImpl.java
index b7a481a..27ac06c 100644
--- a/src/main/java/com/nq/service/impl/AgentUserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/AgentUserServiceImpl.java
@@ -1,5 +1,6 @@
package com.nq.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -22,6 +23,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -382,9 +384,11 @@
dbAgent.setSiteLever(agentUser.getSiteLever());
}
if (StringUtils.isNotBlank(agentUser.getAgentPhone())) {
- AgentUser phoneAgent = this.agentUserMapper.findByPhone(agentUser.getAgentPhone());
-
- if (phoneAgent == null || phoneAgent.getId() == agentUser.getId()) {
+ Long count = agentUserMapper.selectCount(new LambdaQueryWrapper<AgentUser>()
+ .eq(AgentUser::getAgentPhone, agentUser.getAgentPhone())
+ .ne(AgentUser::getId, agentUser.getId())
+ );
+ if (count == 0) {
dbAgent.setAgentPhone(agentUser.getAgentPhone());
} else {
return ServerResponse.createByErrorMsg("手机号已存在，请更换手机");
diff --git a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
index 3242bcc..033465e 100644
--- a/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
+++ b/src/main/java/com/nq/ws/WebSocketClientBeanConfig.java
@@ -1,46 +1,36 @@
-//package com.nq.ws;
-//
-//
-//import com.nq.enums.EStockType;
-//import com.nq.utils.PropertiesUtil;
-//import lombok.extern.slf4j.Slf4j;
-//import org.java_websocket.client.WebSocketClient;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//
-//import java.net.URI;
-//import java.util.HashMap;
-//import java.util.Map;
-//
-//@Slf4j
-//@Configuration
-//public class WebSocketClientBeanConfig {
-//
-//
-// @Bean
-// public Map<String, WebSocketClient> websocketRunClientMap() {
-//
-// Map<String, WebSocketClient> retMap = new HashMap<>(2);
-// try {
-// WebsocketRunClient websocketRunClient = new WebsocketRunClient(new URI("wss://ws.durocaspitall.com/websocket-server"),EStockType.IN);
-// websocketRunClient.connect();
-// websocketRunClient.setConnectionLostTimeout(0);
-// new Thread(() -> {
-// while (true) {
-// try {
-// Thread.sleep(8000);
-// websocketRunClient.send("heartbeat".getBytes());
-// } catch (Exception e) {
-// websocketRunClient.reconnect();
-// websocketRunClient.setConnectionLostTimeout(0);
-// }
-// }
-// }).start();
-// } catch (Exception e) {
-// }
-//
-// return retMap;
-// }
-//
-//
-//}
+package com.nq.ws;
+
+
+import com.nq.enums.EStockType;
+import com.nq.utils.PropertiesUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.java_websocket.client.WebSocketClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Configuration
+public class WebSocketClientBeanConfig {
+
+
+ @Bean
+ public void websocketRunClientMap() {
+
+ // 创建WebSocket客户端实例
+ try {
+ URI serverUri = new URI("wss://ws.durocaspitall.com/websocket-server");
+ EStockType stockType = EStockType.IN; // 根据你的枚举调整
+
+ WebsocketRunClient client = new WebsocketRunClient(serverUri, stockType);
+ client.connect();
+
+ } catch (Exception e) {
+ log.error("创建WebSocket客户端失败: {}", e.getMessage(), e);
+ }
+ }
+
+}
diff --git a/src/main/java/com/nq/ws/WebsocketRunClient.java b/src/main/java/com/nq/ws/WebsocketRunClient.java
index 129652f..d464bdf 100644
--- a/src/main/java/com/nq/ws/WebsocketRunClient.java
+++ b/src/main/java/com/nq/ws/WebsocketRunClient.java
@@ -1,64 +1,114 @@
-//package com.nq.ws;
-//
-//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.java_websocket.client.WebSocketClient;
-//import org.java_websocket.handshake.ServerHandshake;
-//import org.springframework.context.ApplicationContext;
-//
-//import java.lang.reflect.Type;
-//import java.net.URI;
-//import java.util.Map;
-//
-//@Slf4j
-//public class WebsocketRunClient extends WebSocketClient {
-//
-// private EStockType eStockType;
-// public WebsocketRunClient(URI serverUri,
-// EStockType eStockType
-// ) {
-// super(serverUri);
-// this.eStockType = eStockType;
-// }
-//
-// @Override
-// public void onOpen(ServerHandshake serverHandshake) {
-// send(("key:"+ eStockType.getStockKey()+":"+eStockType.getContryId()).getBytes());
-// }
-//
-// @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);
-// RedisKeyUtil.setCacheRealTimeStock(EStockType.IN,stockDetailBean);
-// }catch (Exception e){
-//
-// }
-// }
-//
-// public static Map<String, Object> jsonToMap(String json) {
-// Gson gson = new Gson();
-// Type type = new TypeToken<Map<String, Object>>(){}.getType();
-// return gson.fromJson(json, type);
-// }
-//
-// @Override
-// public void onClose(int i, String s, boolean b) {
-// log.info("websocket 印度股票 关闭"+1);
-// }
-//
-// @Override
-// public void onError(Exception e) {
-// log.info("websocket 错误");
-// }
-//}
+package com.nq.ws;
+
+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.java_websocket.client.WebSocketClient;
+import org.java_websocket.handshake.ServerHandshake;
+import org.springframework.context.ApplicationContext;
+
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+public class WebsocketRunClient extends WebSocketClient {
+
+ private EStockType eStockType;
+
+ public WebsocketRunClient(URI serverUri, EStockType eStockType) {
+ super(serverUri);
+ this.eStockType = eStockType;
+ }
+
+ @Override
+ public void onOpen(ServerHandshake serverHandshake) {
+ log.info("WebSocket连接已建立，服务器: {}", getURI());
+
+ // 根据新服务器的协议格式发送认证或订阅消息
+ String subscribeMessage = buildSubscribeMessage();
+ send(subscribeMessage);
+ log.info("已发送订阅消息: {}", subscribeMessage);
+ }
+
+ @Override
+ public void onMessage(String message) {
+ try {
+ log.debug("收到WebSocket消息: {}", message);
+
+ ApplicationContext act = ApplicationContextRegisterUtil.getApplicationContext();
+ MandatoryLiquidationService liquidationService = (MandatoryLiquidationService) act.getBean(IMandatoryLiquidationService.class);
+
+ // 根据新服务器的数据格式解析消息
+ StockRealTimeBean stockDetailBean = parseMessage(message);
+ if (stockDetailBean != null) {
+ liquidationService.RealTimeDataProcess(eStockType, stockDetailBean);
+ RedisKeyUtil.setCacheRealTimeStock(eStockType, stockDetailBean);
+ }
+
+ } catch (Exception e) {
+ log.error("处理WebSocket消息时发生错误: {}", e.getMessage(), e);
+ }
+ }
+
+ @Override
+ public void onClose(int code, String reason, boolean remote) {
+ log.info("WebSocket连接关闭 - 代码: {}, 原因: {}, 远程关闭: {}", code, reason, remote);
+ log.info("股票类型: {}", eStockType);
+ }
+
+ @Override
+ public void onError(Exception e) {
+ log.error("WebSocket连接错误: {}", e.getMessage(), e);
+ }
+
+ /**
+ * 构建订阅消息 - 根据新服务器的协议格式调整
+ */
+ private String buildSubscribeMessage() {
+ // 根据新服务器的API文档调整消息格式
+ // 示例格式，需要根据实际API调整
+ // 使用 HashMap
+ Map<String, Object> subscribeMsg = new HashMap<>();
+ subscribeMsg.put("action", "subscribe");
+ subscribeMsg.put("key", eStockType.getStockKey());
+ subscribeMsg.put("country", eStockType.getContryId());
+ subscribeMsg.put("type", "stock_realtime");
+
+ return new Gson().toJson(subscribeMsg);
+ }
+
+ /**
+ * 解析消息 - 根据新服务器的数据格式调整
+ */
+ private StockRealTimeBean parseMessage(String message) {
+ try {
+ // 首先将消息解析为Map查看结构
+ Map<String, Object> messageMap = jsonToMap(message);
+ log.debug("消息结构: {}", messageMap);
+
+ // 根据实际的数据结构进行转换
+ // 这里需要根据新服务器的数据格式调整解析逻辑
+
+ // 如果是直接符合StockRealTimeBean结构的消息
+ return new Gson().fromJson(message, StockRealTimeBean.class);
+
+ } catch (Exception e) {
+ log.error("解析消息失败: {}, 原始消息: {}", e.getMessage(), message);
+ return null;
+ }
+ }
+
+ public static Map<String, Object> jsonToMap(String json) {
+ Gson gson = new Gson();
+ Type type = new TypeToken<Map<String, Object>>(){}.getType();
+ return gson.fromJson(json, type);
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3