From a522f170fe22ffeb03e2b6bc81ae40243fb4cecb Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 05 Aug 2024 02:09:36 +0800
Subject: [PATCH] 1

---
 websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java b/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
index bdf64ef..c49739d 100644
--- a/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
+++ b/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
@@ -1,5 +1,5 @@
 package org.example.server.impl;
-
+import org.example.websocket.server.WsServer;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -19,7 +19,6 @@
 import org.example.pojo.bo.MarketBo;
 import org.example.server.CurrencySerivce;
 import org.example.util.RedisUtil;
-import org.example.websocket.server.WsServer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.yaml.snakeyaml.error.Mark;
@@ -218,7 +217,10 @@
         allFutures.join();
 
         executor.shutdown(); // 关闭线程池
-
+        mexcList.clear();
+        gateList.clear();
+        bitgetList.clear();
+        kucoinList.clear();
         pushWs(marketDataOuts); // 推送结果
     }
 
@@ -235,6 +237,7 @@
         marketDataOut.setBuyTotalPrice(markets1.getBids().getP().multiply(markets1.getBids().getV()).toString()); // 设置买入总价
         marketDataOut.setSellTotalPrice(markets2.getAsks().getP().multiply(markets2.getAsks().getV()).toString()); // 设置卖出总价
         marketDataOut.setServceTime(formattedDateTime); // 设置服务时间
+        marketDataOut.setBuyAndSell(marketDataOut.getBaseAsset()+markets1.getExchange()+markets2.getExchange());
         marketDataOuts.add(marketDataOut); // 添加到输出列表
     }
 
@@ -247,7 +250,7 @@
 //        RedisUtil.set(key,json);
         try {
             // 全体发送
-            wsServer.sendMessageToAll("11111111111111111111");
+            wsServer.sendMessageToAll(json);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -256,6 +259,8 @@
     public void quotationCalculation(){
         extracted();
         findProfitablePairs(mexcList, gateList, bitgetList, kucoinList);
+
+
     }
 
     public void scheduler(){

--
Gitblit v1.9.3