.idea/inspectionProfiles/Project_Default.xml
@@ -2,7 +2,13 @@ <profile version="1.0"> <option name="myName" value="Project Default" /> <inspection_tool class="AliAccessStaticViaInstance" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="AliArrayNamingShouldHaveBracket" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="AliControlFlowStatementWithoutBraces" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="AliDeprecation" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="AliEqualsAvoidNull" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="AliLongLiteralsEndingWithLowercaseL" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="AliMissingOverrideAnnotation" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="AliWrapperTypeEquality" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="AlibabaAbstractClassShouldStartWithAbstractNaming" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="AlibabaAbstractMethodOrInterfaceMethodMustUseJavadoc" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="AlibabaAvoidApacheBeanUtilsCopy" enabled="true" level="WARNING" enabled_by_default="true" /> @@ -57,5 +63,6 @@ <inspection_tool class="AlibabaUnsupportedExceptionWithModifyAsList" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="AlibabaUseQuietReferenceNotation" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="AlibabaUseRightCaseForDateFormat" enabled="true" level="WARNING" enabled_by_default="true" /> <inspection_tool class="MapOrSetKeyShouldOverrideHashCodeEquals" enabled="true" level="WARNING" enabled_by_default="true" /> </profile> </component> bitgetsClient/src/main/java/org/example/bitgetsclient/wsClient/BitgetClient.java
@@ -15,6 +15,8 @@ import javax.websocket.*; import java.io.IOException; import java.lang.reflect.Type; import java.math.BigDecimal; import java.net.URI; import java.nio.ByteBuffer; import java.util.Arrays; @@ -105,17 +107,39 @@ // 确保 dataNode 不为 null，以避免空指针异常 if (dataNode != null) { // 存储数据到 HashMap Map<String, Object> bidAskMap = new HashMap<>(); // 变量命名更具描述性 bidAskMap.put("bids", dataNode.get("bids")); // 获取并存储 bids bidAskMap.put("asks", dataNode.get("asks")); // 获取并存储 asks Map<String, Object> hashMap = new HashMap<>(); // 变量命名更具描述性 Map<String, Object> argMap = gson.fromJson(map.get("arg").toString(), new TypeToken<Map<String, Object>>() {}.getType()); // 解析 arg 为 Map String key = "bitget" + argMap.get("instId"); // 构建 Redis 存储的键 String bids = dataNode.get("bids").toString(); String asks = dataNode.get("asks").toString(); // 存储到 Redis，使用 ObjectMapper 转换为 JSON 字符串 String jsonData = objectMapper.writeValueAsString(bidAskMap); // 先将 HashMap 转换为 JSON 字符串 RedisUtil.set(key, jsonData); // 存储数据 Type listType = new TypeToken<List<List<String>>>(){}.getType(); List<List<String>> bidsList = gson.fromJson(bids, listType); List<List<String>> asksList = gson.fromJson(asks, listType); if(!bidsList.isEmpty() && !bidsList.get(0).isEmpty() && !asksList.isEmpty() && !asksList.get(0).isEmpty()){ if (!bidsList.isEmpty() && !bidsList.get(0).isEmpty()) { List<String> bidsStringList = bidsList.get(0); HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks pvMap.put("p", new BigDecimal(bidsStringList.get(0)).toPlainString()); pvMap.put("v", new BigDecimal(bidsStringList.get(1)).toPlainString()); hashMap.put("bids", pvMap); // 获取并存储 bids } if (!asksList.isEmpty() && !asksList.get(0).isEmpty()) { List<String> asksStringList = asksList.get(0); // 修正此处为 asksList HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks pvMap.put("p", new BigDecimal(asksStringList.get(0)).toPlainString()); pvMap.put("v", new BigDecimal(asksStringList.get(1)).toPlainString()); hashMap.put("asks", pvMap); // 获取并存储 asks } Map<String, Object> argMap = gson.fromJson(map.get("arg").toString(), new TypeToken<Map<String, Object>>() {}.getType()); // 解析 arg 为 Map String key = "bitget" + argMap.get("instId"); // 构建 Redis 存储的键 // 存储到 Redis，使用 ObjectMapper 转换为 JSON 字符串 String jsonData = objectMapper.writeValueAsString(hashMap); // 先将 HashMap 转换为 JSON 字符串 RedisUtil.set(key, jsonData); // 存储数据 } } } } catch (JsonSyntaxException e) { geteClient/src/main/java/org/example/geteclient/wsClinet/GateClient.java
@@ -92,8 +92,6 @@ private static final String RESULT_KEY = "result"; // 定义结果键的常量 private static final String BIDS_KEY = "bids"; // 定义 bids 的常量 private static final String ASKS_KEY = "asks"; // 定义 asks 的常量 private static final String p = "p"; // 定义 asks 的常量 private static final String v = "v"; // 定义 asks 的常量 private static final String S_KEY = "s"; // 定义 s 的常量 @OnMessage @@ -110,28 +108,30 @@ Object asksObj = resultMap.get(BIDS_KEY); Object bidsObj = resultMap.get(ASKS_KEY); if (asksObj instanceof List && !((List<?>) asksObj).isEmpty()) { List<?> asksList = (List<?>) asksObj; String[][] dataArray = gson.fromJson(gson.toJson(asksList), String[][].class); HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks String[] asksData = dataArray[0]; pvMap.put(p, new BigDecimal(asksData[0])); pvMap.put(v, new BigDecimal(asksData[1])); hashMap.put(BIDS_KEY, pvMap); // 放入 bids 数据 } if(asksObj instanceof List && !((List<?>) asksObj).isEmpty() && bidsObj instanceof List && !((List<?>) bidsObj).isEmpty()){ if (asksObj instanceof List && !((List<?>) asksObj).isEmpty()) { List<?> asksList = (List<?>) asksObj; String[][] dataArray = gson.fromJson(gson.toJson(asksList), String[][].class); HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks String[] asksData = dataArray[0]; pvMap.put("p", new BigDecimal(asksData[0]).toPlainString()); pvMap.put("v", new BigDecimal(asksData[1]).toPlainString()); hashMap.put(BIDS_KEY, pvMap); // 放入 bids 数据 } if (bidsObj instanceof List && !((List<?>) bidsObj).isEmpty()) { List<?> bidsList = (List<?>) bidsObj; String[][] dataArray = gson.fromJson(gson.toJson(bidsList), String[][].class); String[] bidsData = dataArray[0]; HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks pvMap.put(p, new BigDecimal(bidsData[0])); pvMap.put(v, new BigDecimal(bidsData[1])); hashMap.put(ASKS_KEY,pvMap); } if (bidsObj instanceof List && !((List<?>) bidsObj).isEmpty()) { List<?> bidsList = (List<?>) bidsObj; String[][] dataArray = gson.fromJson(gson.toJson(bidsList), String[][].class); String[] bidsData = dataArray[0]; HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks pvMap.put("p", new BigDecimal(bidsData[0]).toPlainString()); pvMap.put("v", new BigDecimal(bidsData[1]).toPlainString()); hashMap.put(ASKS_KEY,pvMap); } String key = "gate" + resultMap.get(S_KEY); // 生成 Redis 键 RedisUtil.set(key.replace("_", ""), gson.toJson(hashMap)); // 存入 Redis，使用 Gson 进行序列化 String key = "gate" + resultMap.get(S_KEY); // 生成 Redis 键 RedisUtil.set(key.replace("_", ""), gson.toJson(hashMap)); // 存入 Redis，使用 Gson 进行序列化 } } } catch (JsonSyntaxException e) { log.error("JSON 解析异常：" + e.getMessage(), e); // 记录 JSON 解析异常 @@ -141,6 +141,7 @@ } @OnClose public void onClose() { log.info("gate ws 连接已关闭，尝试重新连接..."); // 连接关闭日志 kucoinClient/src/main/java/org/example/kucoinclient/wsClient/KucoinClient.java
@@ -144,34 +144,34 @@ ObjectMapper mapper = new ObjectMapper(); // 创建 ObjectMapper 实例 // 空值检查，避免存储 null 值到 Redis if (resultMap.get("bids") != null) { if (resultMap.get("bids") != null && resultMap.get("asks") != null) { Object bidsObj = resultMap.get("bids"); if (bidsObj instanceof List && !((List<?>) bidsObj).isEmpty()) { List<String> bidsList = (List<String>) bidsObj; HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks pvMap.put("p", bidsList.get(0)); pvMap.put("V", bidsList.get(1)); hashMap.put("bids",pvMap); } } if (resultMap.get("asks") != null) { Object asksObj = resultMap.get("asks"); if (asksObj instanceof List && !((List<?>) asksObj).isEmpty()) { List<String> asksList = (List<String>) asksObj; HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks pvMap.put("p", asksList.get(0)); pvMap.put("V", asksList.get(1)); hashMap.put("asks",pvMap); } } String symbol = extractSymbolFromTopic(topic); // 从 topic 提取符号 String key = PREFIX + symbol; // 创建 Redis 缓存键 try { RedisUtil.set(key, mapper.writeValueAsString(hashMap)); // 存储到 Redis } catch (JsonProcessingException e) { log.error("将数据存入 Redis 时出错: {}", e.getMessage()); // 输出数据存储错误日志 if(bidsObj instanceof List && !((List<?>) bidsObj).isEmpty() && asksObj instanceof List && !((List<?>) asksObj).isEmpty()){ if (bidsObj instanceof List && !((List<?>) bidsObj).isEmpty()) { List<String> bidsList = (List<String>) bidsObj; HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks pvMap.put("p", new BigDecimal(String.valueOf(bidsList.get(0))).toPlainString()); pvMap.put("v", new BigDecimal(String.valueOf(bidsList.get(1))).toPlainString()); hashMap.put("bids",pvMap); } if (asksObj instanceof List && !((List<?>) asksObj).isEmpty()) { List<String> asksList = (List<String>) asksObj; HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks pvMap.put("p", new BigDecimal(String.valueOf(asksList.get(0))).toPlainString()); pvMap.put("v", new BigDecimal(String.valueOf(asksList.get(1))).toPlainString()); hashMap.put("asks",pvMap); } String symbol = extractSymbolFromTopic(topic); // 从 topic 提取符号 String key = PREFIX + symbol; // 创建 Redis 缓存键 try { RedisUtil.set(key, mapper.writeValueAsString(hashMap)); // 存储到 Redis } catch (JsonProcessingException e) { log.error("将数据存入 Redis 时出错: {}", e.getMessage()); // 输出数据存储错误日志 } } } } else { log.error("topic--->存入redis失败"); // 输出处理失败日志 mexcClient/src/main/java/org/example/mexcclient/wsClient/MexcClient.java
@@ -88,7 +88,9 @@ try { Map<String, Object> map = gson.fromJson(message, new TypeToken<Map<String, Object>>() {}.getType()); if (map != null && map.containsKey("s")) { Object object = map.get("d"); Map<String, Object> resultMap = gson.fromJson(object.toString(), new TypeToken<Map<String, Object>>() {}.getType()); HashMap<String,Object> hashMap = new HashMap<>(); @@ -99,36 +101,38 @@ List<Map<String,Object>> asksList = gson.fromJson(asksObj.toString(), listType); List<Map<String,Object>> bidsList = gson.fromJson(bidsObj.toString(), listType); if (!asksList.isEmpty()) { Map<String,Object> objectMap = asksList.get(0); HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks pvMap.put("p", new BigDecimal(objectMap.get("p").toString())); pvMap.put("v", new BigDecimal(objectMap.get("v").toString())); hashMap.put("asks", pvMap); } if(!asksList.isEmpty() && !asksList.get(0).isEmpty() && !bidsList.isEmpty() && !bidsList.get(0).isEmpty()){ if (!asksList.isEmpty() && !asksList.get(0).isEmpty()) { if (!bidsList.isEmpty()) { Map<String,Object> objectMap = bidsList.get(0); HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks pvMap.put("p", new BigDecimal(objectMap.get("p").toString())); pvMap.put("v", new BigDecimal(objectMap.get("v").toString())); hashMap.put("bids", pvMap); } Map<String,Object> objectMap = asksList.get(0); HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks pvMap.put("p", new BigDecimal(objectMap.get("p").toString()).toPlainString()); pvMap.put("v", new BigDecimal(objectMap.get("v").toString()).toPlainString()); hashMap.put("asks", pvMap); } ObjectMapper mapper = new ObjectMapper(); String key = "mexc" + map.get("s").toString(); try { RedisUtil.set(key, mapper.writeValueAsString(hashMap)); } catch (JsonProcessingException e) { e.printStackTrace(); if (!bidsList.isEmpty() && !bidsList.get(0).isEmpty()) { Map<String,Object> objectMap = bidsList.get(0); HashMap<String, Object> pvMap = new HashMap<>(); // 创建新的 HashMap 保存 bids 和 asks pvMap.put("p", new BigDecimal(objectMap.get("p").toString()).toPlainString()); pvMap.put("v", new BigDecimal(objectMap.get("v").toString()).toPlainString()); hashMap.put("bids", pvMap); } ObjectMapper mapper = new ObjectMapper(); String key = "mexc" + map.get("s").toString(); try { RedisUtil.set(key, mapper.writeValueAsString(hashMap)); } catch (JsonProcessingException e) { e.printStackTrace(); } } } } catch (JsonSyntaxException e) { log.error("JSON 解析异常：" + e.getMessage(), e); } } @OnClose public void onClose() { websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java
@@ -26,7 +26,7 @@ private String currency; //价差 private double spread = 0; private double spread = 0.6; //最低金额 private String minAmount; websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
@@ -1,4 +1,5 @@ package org.example.server.impl; import org.apache.commons.lang3.StringUtils; import org.example.websocket.server.WsServer; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fasterxml.jackson.core.JsonProcessingException; @@ -9,7 +10,6 @@ import com.google.gson.GsonBuilder; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.example.dao.CurrencyMapper; import org.example.pojo.Currency; import org.example.pojo.Market; @@ -58,10 +58,10 @@ private WsServer wsServer; private void extracted() { ExecutorService executor = Executors.newFixedThreadPool(4); // 适当增加线程数以匹配处理的交易所数量 ExecutorService executor = Executors.newFixedThreadPool(20); // 适当增加线程数以匹配处理的交易所数量 // 异步处理每个交易所的数据 CompletableFuture<Void> mexcFuture = CompletableFuture.runAsync(() -> processMexc(), executor); CompletableFuture<Void> mexcFuture = CompletableFuture.runAsync(() -> processMarketData(RedisUtil.keys("mexc"), mexcList, "mexc"), executor); CompletableFuture<Void> gateFuture = CompletableFuture.runAsync(() -> processMarketData(RedisUtil.keys("gate"), gateList, "gate"), executor); CompletableFuture<Void> bitgetFuture = CompletableFuture.runAsync(() -> processMarketData(RedisUtil.keys("bitget"), bitgetList, "bitget"), executor); CompletableFuture<Void> kucoinFuture = CompletableFuture.runAsync(() -> processMarketData(RedisUtil.keys("kucoin"), kucoinList, "kucoin"), executor); @@ -94,7 +94,7 @@ if (bidsObj instanceof List && !((List<?>) bidsObj).isEmpty()) { List<?> bidsList = (List<?>) bidsObj; Map<?, ?> bidsMap = (Map<?, ?>) bidsList.get(bidsList.size() - 1); Map<?, ?> bidsMap = (Map<?, ?>) bidsList.get(0); BidsBo bidsBo = new BidsBo(); bidsBo.setP(new BigDecimal(bidsMap.get("p").toString())); bidsBo.setV(new BigDecimal(bidsMap.get("v").toString())); @@ -108,36 +108,46 @@ } private void processMarketData(Set<String> set, List<MarketBo> list, String exchangeName) { for (String key : set) { String v = RedisUtil.get(key); Map<String, Object> redisValueMap = gson.fromJson(v, new TypeToken<Map<String, Object>>() {}.getType()); Object asksObj = redisValueMap.get("asks"); Object bidsObj = redisValueMap.get("bids"); ArrayList<String> kyes = new ArrayList<>(set); List<String> mget = RedisUtil.mget(kyes); Map<String, String> resultMap = new HashMap<>(); for (int i = 0; i < kyes.size(); i++) { resultMap.put(kyes.get(i), mget.get(i)); } for (Map.Entry<String, String> entry : resultMap.entrySet()) { String v = entry.getValue(); String key = entry.getKey(); MarketBo marketBo = new MarketBo(); if (asksObj instanceof List && !((List<?>) asksObj).isEmpty()) { List<?> asksList = (List<?>) asksObj; String[][] dataArray = gson.fromJson(gson.toJson(asksList), String[][].class); String[] asksData = dataArray[0]; AsksBo asksBo = new AsksBo(); asksBo.setP(new BigDecimal(asksData[0])); asksBo.setV(new BigDecimal(asksData[1])); marketBo.setAsks(asksBo); Map<String, Map<String,String>> redisValueMap = gson.fromJson(v, new TypeToken<Map<String, Map<String,String>>>() {}.getType()); Map<String,String> asksObj = redisValueMap.get("asks"); Map<String,String> bidsObj = redisValueMap.get("bids"); try { if(StringUtils.isNotEmpty(asksObj.get("p")) && StringUtils.isNotEmpty(asksObj.get("v")) && StringUtils.isNotEmpty(bidsObj.get("p")) && StringUtils.isNotEmpty(bidsObj.get("v"))) { AsksBo asksBo = new AsksBo(); asksBo.setP(new BigDecimal(asksObj.get("p").toString())); asksBo.setV(new BigDecimal(asksObj.get("v").toString())); marketBo.setAsks(asksBo); BidsBo bidsBo = new BidsBo(); bidsBo.setP(new BigDecimal(bidsObj.get("p").toString())); bidsBo.setV(new BigDecimal(bidsObj.get("v").toString())); marketBo.setBids(bidsBo); marketBo.setKey(key.replaceAll(exchangeName, "")); marketBo.setExchange(exchangeName); list.add(marketBo); } }catch (Exception e){ e.printStackTrace(); } if (bidsObj instanceof List && !((List<?>) bidsObj).isEmpty()) { List<?> bidsList = (List<?>) bidsObj; String[][] dataArray = gson.fromJson(gson.toJson(bidsList), String[][].class); String[] bidsData = dataArray[bidsList.size() - 1]; BidsBo bidsBo = new BidsBo(); bidsBo.setP(new BigDecimal(bidsData[0])); bidsBo.setV(new BigDecimal(bidsData[1])); marketBo.setBids(bidsBo); } marketBo.setKey(key.replaceAll(exchangeName, "")); marketBo.setExchange(exchangeName); list.add(marketBo); } } @@ -226,18 +236,18 @@ private static void assembleMarketDataOut(String coinName, MarketBo markets1, MarketBo markets2, BigDecimal profitPercentage, BigDecimal buyPrice, BigDecimal sellPrice, List<MarketDataOut> marketDataOuts, String formattedDateTime) { MarketDataOut marketDataOut = new MarketDataOut(); marketDataOut.setBaseAsset(coinName.replaceAll("USDT","").toLowerCase()); // 设置基础资产 marketDataOut.setBuyingPlatform(markets1.getExchange()); // 设置买入平台 marketDataOut.setSellPlatform(markets2.getExchange()); // 设置卖出平台 marketDataOut.setSpread(profitPercentage.toString()); // 设置利润百分比 marketDataOut.setBuyPrice(buyPrice.toString()); // 设置买入价格 marketDataOut.setSellPrice(sellPrice.toString()); // 设置卖出价格 marketDataOut.setBuyNumber(markets1.getBids().getV().toString()); // 设置买入数量 marketDataOut.setSellNumber(markets2.getAsks().getV().toString()); // 设置卖出数量 marketDataOut.setBuyTotalPrice(markets1.getBids().getP().multiply(markets1.getBids().getV()).toString()); // 设置买入总价 marketDataOut.setSellTotalPrice(markets2.getAsks().getP().multiply(markets2.getAsks().getV()).toString()); // 设置卖出总价 marketDataOut.setBaseAsset(coinName.replaceAll("USDT","").toLowerCase().toUpperCase()); // 设置基础资产 marketDataOut.setBuyingPlatform(markets1.getExchange().toUpperCase()); // 设置买入平台 marketDataOut.setSellPlatform(markets2.getExchange().toUpperCase()); // 设置卖出平台 marketDataOut.setSpread(profitPercentage.setScale(4, RoundingMode.DOWN).toPlainString()); // 设置利润百分比 marketDataOut.setBuyPrice(buyPrice.toPlainString()); // 设置买入价格 marketDataOut.setSellPrice(sellPrice.toPlainString()); // 设置卖出价格 marketDataOut.setBuyNumber(markets1.getBids().getV().toPlainString()); // 设置买入数量 marketDataOut.setSellNumber(markets2.getAsks().getV().toPlainString()); // 设置卖出数量 marketDataOut.setBuyTotalPrice((markets1.getBids().getP().multiply(markets1.getBids().getV())).setScale(0,RoundingMode.DOWN).toPlainString()); // 设置买入总价 marketDataOut.setSellTotalPrice((markets2.getAsks().getP().multiply(markets2.getAsks().getV())).setScale(0,RoundingMode.DOWN).toPlainString()); // 设置卖出总价 marketDataOut.setServceTime(formattedDateTime); // 设置服务时间 marketDataOut.setBuyAndSell(marketDataOut.getBaseAsset()+markets1.getExchange()+markets2.getExchange()); marketDataOut.setBuyAndSell(marketDataOut.getBaseAsset()+marketDataOut.getBuyingPlatform()+marketDataOut.getSellPlatform()); marketDataOuts.add(marketDataOut); // 添加到输出列表 } @@ -257,10 +267,17 @@ } public void quotationCalculation(){ long startExtracted = System.nanoTime(); extracted(); findProfitablePairs(mexcList, gateList, bitgetList, kucoinList); long endExtracted = System.nanoTime(); double executionTimeExtracted = (endExtracted - startExtracted) / 1e9; // 转换为秒 System.out.println("extracted 方法执行时间: " + executionTimeExtracted + " 秒"); long startFindPairs = System.nanoTime(); findProfitablePairs(mexcList, gateList, bitgetList, kucoinList); // 请确保这些变量有定义和赋值 long endFindPairs = System.nanoTime(); double executionTimeFindPairs = (endFindPairs - startFindPairs) / 1e9; // 转换为秒 System.out.println("findProfitablePairs 方法执行时间: " + executionTimeFindPairs + " 秒"); } public void scheduler(){ websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
@@ -214,11 +214,9 @@ .collect(Collectors.toList()); } //价差 if(wsBo.getSpread() > 0){ redisValueMap = redisValueMap.stream() .filter(data -> Double.parseDouble(data.getSpread()) >= wsBo.getSpread()) .collect(Collectors.toList()); } redisValueMap = redisValueMap.stream() .filter(data -> Double.parseDouble(data.getSpread()) >= wsBo.getSpread()) .collect(Collectors.toList()); //最低金额 if(null != wsBo.getMinAmount()){ redisValueMap = redisValueMap.stream() @@ -271,9 +269,39 @@ Collections.sort(marketDataList, new Comparator<MarketDataOut>() { @Override public int compare(MarketDataOut a, MarketDataOut b) { // 将买入总价和卖出总价转换为 BigDecimal BigDecimal buyTotalPriceA = new BigDecimal(a.getBuyTotalPrice()); BigDecimal buyTotalPriceB = new BigDecimal(b.getBuyTotalPrice()); BigDecimal sellTotalPriceA = new BigDecimal(a.getSellTotalPrice()); BigDecimal sellTotalPriceB = new BigDecimal(b.getSellTotalPrice()); BigDecimal spreadA = new BigDecimal(a.getSpread()); BigDecimal spreadB = new BigDecimal(b.getSpread()); return spreadB.compareTo(spreadA); // 检查 a 和 b 的买入总价或卖出总价是否大于 1000 boolean aBuyOrSellAbove1000 = buyTotalPriceA.compareTo(new BigDecimal("1000")) > 0 || sellTotalPriceA.compareTo(new BigDecimal("1000")) > 0; boolean bBuyOrSellAbove1000 = buyTotalPriceB.compareTo(new BigDecimal("1000")) > 0 || sellTotalPriceB.compareTo(new BigDecimal("1000")) > 0; if (aBuyOrSellAbove1000 && !bBuyOrSellAbove1000) { return -1; // a 应排在 b 前面 } else if (!aBuyOrSellAbove1000 && bBuyOrSellAbove1000) { return 1; // b 应排在 a 前面 } else { // a 和 b 都大于 1000 或都小于等于 1000 // 先按照 spread 的降序排列 int spreadComparison = spreadB.compareTo(spreadA); if (spreadComparison != 0) { return spreadComparison; // 先按照 spread 排序 } else { // 如果 spread 相同，再按照买入总价或卖出总价的升序排列 if (aBuyOrSellAbove1000) { // 对于买入总价或卖出总价大于 1000 的记录 return buyTotalPriceA.compareTo(buyTotalPriceB); // 按照买入总价升序排序 } else { // 对于买入总价或卖出总价小于等于 1000 的记录 return buyTotalPriceA.compareTo(buyTotalPriceB); // 可以选择卖出总价或买入总价的升序排序 } } } } }); } websocketSerivce/src/main/resources/application.properties
@@ -1,6 +1,6 @@ XDB_PATH=/www/wwwroot/csdn-ip2region.xdb #XDB_PATH=F:/project/marketData/websocketSerivce/src/main/resources/ip/csdn-ip2region.xdb #XDB_PATH=/www/wwwroot/csdn-ip2region.xdb XDB_PATH=F:/project/marketData/websocketSerivce/src/main/resources/ip/csdn-ip2region.xdb redis1.ip=localhost redis1.port=6379
