From 5a0c918b13c9bb48af816594c7770bee376fac5c Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 09 Aug 2024 17:16:37 +0800
Subject: [PATCH] 1
---
websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 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 8cf96d9..070a357 100644
--- a/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
+++ b/websocketSerivce/src/main/java/org/example/server/impl/CurrencySerivceImpl.java
@@ -237,19 +237,27 @@
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().toUpperCase()); // 设置基础资产
- marketDataOut.setBuyingPlatform(markets1.getExchange().toUpperCase()); // 设置买入平台
- marketDataOut.setSellPlatform(markets2.getExchange().toUpperCase()); // 设置卖出平台
+ marketDataOut.setBuyingPlatform(capitalizeFirstLetter(markets1.getExchange())); // 设置买入平台，首字母大写
+ marketDataOut.setSellPlatform(capitalizeFirstLetter(markets2.getExchange())); // 设置卖出平台，首字母大写
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.setBuyNumber(markets1.getBids().getV().setScale(4, RoundingMode.HALF_UP).toPlainString()); // 设置买入数量
+ marketDataOut.setSellNumber(markets2.getAsks().getV().setScale(4, RoundingMode.HALF_UP).toPlainString()); // 设置卖出数量
+ marketDataOut.setBuyTotalPrice((markets1.getBids().getP().multiply(markets1.getBids().getV())).setScale(0, RoundingMode.HALF_UP).toPlainString()); // 设置买入总价
+ marketDataOut.setSellTotalPrice((markets2.getAsks().getP().multiply(markets2.getAsks().getV())).setScale(0,RoundingMode.HALF_UP).toPlainString()); // 设置卖出总价
marketDataOut.setServceTime(formattedDateTime); // 设置服务时间
marketDataOut.setBuyAndSell(marketDataOut.getBaseAsset()+marketDataOut.getBuyingPlatform()+marketDataOut.getSellPlatform());
marketDataOuts.add(marketDataOut); // 添加到输出列表
}
+
+ public static String capitalizeFirstLetter(String word) {
+ if (word == null || word.isEmpty()) {
+ return word;
+ }
+ return Character.toUpperCase(word.charAt(0)) + word.substring(1);
+ }
+
private void pushWs(List<MarketDataOut> marketDataOuts) {
// String key = "MARKET_Date";
@@ -267,17 +275,8 @@
}
public void quotationCalculation(){
- long startExtracted = System.nanoTime();
extracted();
- 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(){
--
Gitblit v1.9.3