From 16479558108f8da4be9fc37f084167b2d7a0fd38 Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Fri, 26 Sep 2025 23:19:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/9.17' into 9.17
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/data/AdminKlineController.java | 10 +++
trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java | 30 ++++++++++
trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java | 127 +++++++++++++++++++++++------------------
trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineService.java | 1
4 files changed, 112 insertions(+), 56 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/data/AdminKlineController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/data/AdminKlineController.java
index 2816a1d..71f5802 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/data/AdminKlineController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/data/AdminKlineController.java
@@ -6,6 +6,7 @@
import com.yami.trading.common.exception.YamiShopBindException;
import com.yami.trading.common.util.MarketOpenChecker;
import com.yami.trading.common.util.UTCDateUtils;
+import com.yami.trading.huobi.data.internal.CryptosKlineService;
import com.yami.trading.huobi.data.internal.KlineInitService;
import com.yami.trading.huobi.data.internal.KlineService;
import com.yami.trading.service.item.ItemService;
@@ -40,6 +41,9 @@
private ItemService itemService;
@Autowired
private KlineService klineService;
+ @Autowired
+ private CryptosKlineService cryptosKlineService;
+
/**
* kline初始化
*/
@@ -68,4 +72,10 @@
klineService.clean();;
return Result.succeed ("kline清理完成");
}
+
+ @GetMapping("klineInitBySql")
+ public Result <String> klineInitBySql(String symbol) {
+ cryptosKlineService.initBySql(symbol);
+ return Result.ok("success");
+ }
}
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 1332448..4f9c33b 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
@@ -13,20 +13,27 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yami.trading.api.UD.*;
+import com.yami.trading.bean.data.domain.Kline;
import com.yami.trading.bean.ico.domain.Ico;
import com.yami.trading.bean.item.domain.Item;
import com.yami.trading.bean.model.ChannelBlockchain;
import com.yami.trading.bean.model.User;
import com.yami.trading.bean.model.Withdraw;
+import com.yami.trading.common.config.RequestDataHelper;
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.util.*;
+import com.yami.trading.huobi.data.DataCache;
+import com.yami.trading.huobi.data.internal.CryptosKlineService;
import com.yami.trading.huobi.data.internal.KlineInitService;
+import com.yami.trading.huobi.data.internal.KlineTimeObject;
+import com.yami.trading.huobi.hobi.HobiDataService;
import com.yami.trading.security.common.enums.CryptoCurrencyEnum;
import com.yami.trading.security.common.enums.SysTypeEnum;
import com.yami.trading.security.common.manager.PasswordCheckManager;
import com.yami.trading.security.common.util.SecurityUtils;
import com.yami.trading.service.IdentifyingCodeService;
import com.yami.trading.service.WithdrawService;
+import com.yami.trading.service.data.KlineDBService;
import com.yami.trading.service.ico.IcoService;
import com.yami.trading.service.item.ItemService;
import com.yami.trading.service.user.UserService;
@@ -36,8 +43,10 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestMapping;
import java.io.IOException;
+import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.*;
@@ -75,68 +84,74 @@
UserService userService;
@Autowired
PasswordCheckManager passwordCheckManager;
+ @Autowired
+ HobiDataService hobiDataService;
+ @Autowired
+ KlineDBService klineDBService;
- private double getRandomValue(int value) {
- double addValue;
- if (value > 0) {
- int count = 0;
- while (value > 0) {
- value = value / 10;
- count++;
- }
- // 个
- if (count == 1) {
- addValue = RandomUtil.randomFloat(0.01, 0.1999, 4);
- return addValue;
- }
- // 十
- if (count == 2) {
- addValue = RandomUtil.randomFloat(0.1, 0.5999, 4);
- return addValue;
- }
- // 百
- if (count == 3) {
- addValue = RandomUtil.randomFloat(0.1, 2.9999, 4);
- return addValue;
- }
- // 千
- if (count == 4) {
- addValue = RandomUtil.randomFloat(1, 3.9999, 4);
- return addValue;
- }
- // 万
- if (count == 5) {
- addValue = RandomUtil.randomFloat(1, 5.9999, 4);
- return addValue;
- }
- // 十万
- else {
- addValue = RandomUtil.randomFloat(1, 5.9999, 4);
- return addValue;
- }
- } else {
- addValue = RandomUtil.randomFloat(0.01, 0.2999, 4);
- return addValue;
- }
- }
-
- // @Scheduled(cron = "*/5 * * * * ?")
+ //@Scheduled(cron = "*/5 * * * * ?")
public void test() throws Exception {
- double amt = 0.005215;
- double addPriceValue = getRandomValue((int)amt);
- double price = Arith.add(amt, addPriceValue);
+ /*String symbol ="snekusdt";
+ RequestDataHelper.set("symbol", symbol);
+ LambdaQueryWrapper<Kline> queryWrapper = new LambdaQueryWrapper<Kline>()
+ .eq(Kline::getSymbol, symbol)
+ .eq(Kline::getPeriod, "5min")
+ .ge(Kline::getTs, ts1)
+ .lt(Kline::getTs, ts2)
+ .orderByAsc(Kline::getTs);
+ List<Kline> list = klineDBService.list(queryWrapper);
+ BigDecimal tz = num.divide(BigDecimal.valueOf(list.size()), 6, RoundingMode.HALF_UP);
+ System.out.println(list.size());
+ System.out.println(tz);
+ for(int i=0;i<list.size();i++){
+ BigDecimal nums = BigDecimal.valueOf(i+1);
+ *//*BigDecimal integerPart = nums.divide(BigDecimal.valueOf(100), 0, RoundingMode.FLOOR).add(BigDecimal.valueOf(1));
- String format = "";
- format = "#.";
- for (int j = 0; j < 6; j++) {
- format = format + "#";
+ System.out.printf("nums=%d, 除以100的整数部分=%d%n", nums.intValue(), integerPart.intValue());*//*
+ BigDecimal addNum = nums.multiply(tz);
+ list.get(i).setClose(list.get(i).getClose().add(addNum));
+ list.get(i).setOpen(list.get(i).getOpen().add(addNum));
+ list.get(i).setHigh(list.get(i).getHigh().add(addNum));
+ list.get(i).setLow(list.get(i).getLow().add(addNum));
}
+ klineDBService.saveOrUpdateBatch(list);*/
- DecimalFormat df = new DecimalFormat(format);
- df.setRoundingMode(RoundingMode.FLOOR);// 向下取整
+ /*RequestDataHelper.clear();
+ // 定义时间范围：2025-09-16 00:00:00 到 2025-09-19 16:15:00
+ LocalDateTime startTime = LocalDateTime.of(2025, 9, 16, 0, 0, 0);
+ LocalDateTime endTime = LocalDateTime.of(2025, 9, 19, 16, 15, 0);
- System.out.println(df.format(price));
- System.out.println("dd");
+ // 转换为东八区（UTC+8）的毫秒级时间戳
+ ZoneOffset zoneOffset = ZoneOffset.of("+8");
+ long startTs = startTime.toInstant(zoneOffset).toEpochMilli();
+ long endTs = endTime.toInstant(zoneOffset).toEpochMilli();
+
+ // 存储所有时间戳
+ List<Long> timestamps = new ArrayList<>();
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+ List<Kline> list = new ArrayList<>();
+ // 每5分钟 = 300000毫秒，遍历生成时间戳
+ for (long currentTs = startTs; currentTs <= endTs; currentTs += 300000) {
+ timestamps.add(currentTs);
+
+ // 打印时间和对应的时间戳（可选）
+ LocalDateTime currentTime = LocalDateTime.ofInstant(
+ java.time.Instant.ofEpochMilli(currentTs),
+ zoneOffset
+ );
+ System.out.printf("时间: %s | 时间戳: %d%n",
+ currentTime.format(formatter), currentTs);
+ Kline kline = new Kline();
+ kline.setTs(currentTs);
+ kline.setSymbol(symbol);
+ kline.setPeriod("5min");
+ list.add(kline);
+ }
+ System.out.println(list.size());
+ RequestDataHelper.set("symbol", symbol);
+ klineDBService.saveOrUpdateBatch(list);
+ RequestDataHelper.clear();*/
}
/**
* ico转入产品
diff --git a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineService.java b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineService.java
index 86d089f..75967a3 100644
--- a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineService.java
+++ b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineService.java
@@ -6,6 +6,7 @@
import java.util.List;
public interface CryptosKlineService {
+ public void initBySql(String symbol);
public void init(String symbol);
public void saveInit(String symbol);
diff --git a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java
index 2c4e4c7..bf74cac 100644
--- a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java
+++ b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java
@@ -38,6 +38,19 @@
private NamedParameterJdbcOperations namedParameterJdbcTemplate;
@Override
+ public void initBySql(String symbol) {
+ this.bulidBySql(symbol, Kline.PERIOD_1MIN);
+ this.bulidBySql(symbol, Kline.PERIOD_5MIN);
+ this.bulidBySql(symbol, Kline.PERIOD_15MIN);
+ this.bulidBySql(symbol, Kline.PERIOD_30MIN);
+ this.bulidBySql(symbol, Kline.PERIOD_60MIN);
+ this.bulidBySql(symbol, Kline.PERIOD_4HOUR);
+ this.bulidBySql(symbol, Kline.PERIOD_1DAY);
+ this.bulidBySql(symbol, Kline.PERIOD_1MON);
+ this.bulidBySql(symbol, Kline.PERIOD_1WEEK);
+ }
+
+ @Override
public void init(String symbol) {
this.bulid(symbol, Kline.PERIOD_1MIN);
this.bulid(symbol, Kline.PERIOD_5MIN);
@@ -70,6 +83,23 @@
}
+ public void bulidBySql(String symbol, String line) {
+ RequestDataHelper.set("symbol", symbol);
+ LambdaQueryWrapper<Kline> queryWrapper = new LambdaQueryWrapper<Kline>()
+ .eq(Kline::getSymbol, symbol)
+ .eq(Kline::getPeriod, line)
+ .orderByAsc(Kline::getTs);
+ List<Kline> list = klineDBService.list(queryWrapper);
+
+ KlineTimeObject model = new KlineTimeObject();
+ Collections.sort(list); // 按时间升序
+ model.setKline(list);
+ model.setLastTime(new Date());
+ DataCache.putKline(symbol, line, model);
+ RequestDataHelper.clear();
+
+ }
+
public void bulid(String symbol, String line) {
RequestDataHelper.set("symbol", symbol);
List<Kline> list = hobiDataService.kline(itemService.findBySymbol(symbol).getSymbol(), line, null,
--
Gitblit v1.9.3