From 9f56e13daf9e17e0c2ad9e14472e6c714b429b0d Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 20 Sep 2025 17:46:34 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java | 11 +++++++++++
trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java | 2 +-
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiMoneyLogController.java | 2 ++
trading-order-admin/src/main/java/com/yami/trading/api/websocket/WebSocketServer.java | 1 +
4 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java b/trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java
index 9b01f25..404b04e 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java
@@ -117,7 +117,7 @@
/**
* K线数据修正
*/
- @Scheduled(cron = "0 */1 * * * ?")
+ @Scheduled(cron = "0 */2 * * * ?")
public void klineInit() {
List<Item> items = ApplicationContextUtils.getApplicationContext().getBean(ItemService.class).list();
if (CollectionUtil.isNotEmpty(items)) {
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiMoneyLogController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiMoneyLogController.java
index 376f533..e386ca9 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiMoneyLogController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiMoneyLogController.java
@@ -75,9 +75,11 @@
log.info(symbols+"==========");
lambdaQueryWrapper.orderByDesc(MoneyLog::getCreateTime);
moneyLogService.page(page, lambdaQueryWrapper);
+ List<Item> itemList = itemService.list();
for (MoneyLog log : (List<MoneyLog>) page.getRecords()) {
log.setContent_type(log.getContentType());
log.setWallet_type(log.getWalletType());
+ itemList.stream().filter(x -> x.getSymbol().equals(log.getWalletType())).findFirst().ifPresent(item -> log.setWallet_type(item.getName()));
log.setAmount_after(log.getAmountAfter().setScale(4, RoundingMode.HALF_UP));
log.setAmount_before(log.getAmountBefore().setScale(4, RoundingMode.HALF_UP));
if (Constants.MONEYLOG_CONTENT_FINANCE_PROFIT.equals(log.getContentType())) {
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java
index ef57068..fefeb36 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/KlineController.java
@@ -8,6 +8,7 @@
import com.yami.trading.common.exception.YamiShopBindException;
import com.yami.trading.common.util.DateUtils;
import com.yami.trading.common.web.ResultObject;
+import com.yami.trading.huobi.data.AdjustmentValueCache;
import com.yami.trading.huobi.data.internal.KlineService;
import com.yami.trading.service.data.DataService;
import com.yami.trading.service.etf.MarketService;
@@ -95,6 +96,16 @@
DateUtils.timeStamp2Date(String.valueOf(datum.getTs()), "MM-dd HH:mm"));
}
}
+
+ BigDecimal currentValue = AdjustmentValueCache.getCurrentValue().get(symbol);
+ if (currentValue != null) {
+ data.forEach(kline -> {
+ kline.setOpen(kline.getOpen().add(currentValue));
+ kline.setLow(kline.getLow().add(currentValue));
+ kline.setHigh(kline.getHigh().add(currentValue));
+ kline.setClose(kline.getClose().add(currentValue));
+ });
+ }
return Result.succeed(this.build(data, line, symbol));
} catch (Exception e) {
logger.error("getKline error", e);
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/websocket/WebSocketServer.java b/trading-order-admin/src/main/java/com/yami/trading/api/websocket/WebSocketServer.java
index d022125..aea9336 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/websocket/WebSocketServer.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/websocket/WebSocketServer.java
@@ -138,6 +138,7 @@
try {
if (WebSocketEnum.SOCKET_ENUM_REALTIME.getCode().equals(type)) {
if (realtimeMap.get(key) != null) {
+
realtimeMap.get(key).sendMessage(message);
} else {
System.out.println("realtimeMap中没有此key，不推送消息");
--
Gitblit v1.9.3