From 7aa5b5509eaa80e0361f261093f9d4ddabbadc0e Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 28 Jan 2026 18:47:27 +0800
Subject: [PATCH] adj优化
---
trading-order-huobi/src/main/java/com.yami.trading.huobi/data/job/AbstractGetDataJob.java | 157 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 111 insertions(+), 46 deletions(-)
diff --git a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/job/AbstractGetDataJob.java b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/job/AbstractGetDataJob.java
index 9ae134f..d10d3e9 100644
--- a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/job/AbstractGetDataJob.java
+++ b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/job/AbstractGetDataJob.java
@@ -6,6 +6,7 @@
import com.yami.trading.common.util.Arith;
import com.yami.trading.huobi.data.AdjustmentValueCache;
import com.yami.trading.huobi.data.DataCache;
+import com.yami.trading.huobi.data.RandomNumbersGenerator;
import com.yami.trading.huobi.data.internal.DataDBService;
import com.yami.trading.huobi.data.model.AdjustmentValue;
import com.yami.trading.huobi.hobi.HobiDataService;
@@ -23,7 +24,7 @@
public abstract class AbstractGetDataJob implements Runnable {
public static volatile boolean first = true;
- protected static Logger logger = LoggerFactory.getLogger(StockGetDataJob.class);
+ protected static Logger logger = LoggerFactory.getLogger(AbstractGetDataJob.class);
/**
* 数据接口调用间隔时长(毫秒)
*/
@@ -60,53 +61,88 @@
if (delayValue != null) {
if (delayValue.getSecond() < 0) {
- AdjustmentValueCache.getDelayValue().remove(symbol);
- AdjustmentValueCache.getPreAllocatedAdjustments().remove(symbol);
- AdjustmentValueCache.getCurrentAdjustmentIndex().remove(symbol);
- return;
+ clean(symbol);
+ continue;
}
- int frequency = (int) Arith.div(Arith.mul(delayValue.getSecond(), 1000.0D), this.interval);
- List<BigDecimal> adjustments = AdjustmentValueCache.getPreAllocatedAdjustments().get(symbol);
- Integer currentIndex = AdjustmentValueCache.getCurrentAdjustmentIndex().get(symbol);
-
- // 首次执行：生成含正负值的调整序列
- if (adjustments == null || currentIndex == null) {
- adjustments = generateRandomAdjustments(delayValue.getValue(), frequency, decimal);
- currentIndex = 0;
- AdjustmentValueCache.getPreAllocatedAdjustments().put(symbol, adjustments);
- AdjustmentValueCache.getCurrentAdjustmentIndex().put(symbol, currentIndex);
- }
-
- // 分步应用调整值（确保正负交替）
- if (currentIndex < frequency) {
- BigDecimal currentAdjust = adjustments.get(currentIndex);
-
- // 更新当前值（累加正负调整值）
- if (currentValue == null) {
- AdjustmentValueCache.getCurrentValue().put(symbol, currentAdjust.setScale(decimal, RoundingMode.HALF_UP));
+ Integer frequency = AdjustmentValueCache.getFrequency().get(symbol);
+ if (frequency == null) {
+ double rawFrequency = Arith.div(Arith.mul(delayValue.getSecond(), 1000.0D), this.interval);
+ // 判断是否有小数部分
+ if (rawFrequency > (int) rawFrequency) {
+ // 有小数（如333.333）→ +1
+ frequency = (int) rawFrequency + 1;
} else {
- AdjustmentValueCache.getCurrentValue().put(symbol, currentValue.add(currentAdjust).setScale(decimal, RoundingMode.HALF_UP));
+ // 无小数（如500.0）→ 不+1
+ frequency = (int) rawFrequency;
}
-
- // 更新延时值（剩余值和时间）
- delayValue.setValue(delayValue.getValue().subtract(currentAdjust).setScale(decimal, RoundingMode.HALF_UP));
- delayValue.setSecond(Arith.sub(delayValue.getSecond(), Arith.div(this.interval, 1000.0D)));
- AdjustmentValueCache.getDelayValue().put(symbol, delayValue);
-
- // 索引递增，完成后清理缓存
- int nextIndex = currentIndex + 1;
- AdjustmentValueCache.getCurrentAdjustmentIndex().put(symbol, nextIndex);
- if (nextIndex >= frequency) {
- AdjustmentValueCache.getDelayValue().remove(symbol);
- AdjustmentValueCache.getPreAllocatedAdjustments().remove(symbol);
- AdjustmentValueCache.getCurrentAdjustmentIndex().remove(symbol);
+ AdjustmentValueCache.getFrequency().put(symbol, frequency);
+ }
+ if (frequency <= 1) {
+ // 单次分配：直接用带符号值，避免符号丢失
+ BigDecimal delayVal = delayValue.getValue().setScale(decimal, RoundingMode.HALF_UP);
+ if (currentValue == null) {
+ AdjustmentValueCache.getCurrentValue().put(symbol, delayVal);
+ } else {
+ AdjustmentValueCache.getCurrentValue().put(symbol, currentValue.add(delayVal).setScale(decimal, RoundingMode.HALF_UP));
}
-
- // 持久化更新
- BigDecimal newAdjustValue = AdjustmentValueCache.getCurrentValue().get(symbol);
- if (!item.getAdjustmentValue().equals(newAdjustValue)) {
- item.setAdjustmentValue(newAdjustValue);
+ if (!item.getAdjustmentValue().equals(AdjustmentValueCache.getCurrentValue().get(symbol))) {
+ item.setAdjustmentValue(AdjustmentValueCache.getCurrentValue().get(symbol));
itemService.saveOrUpdate(item);
+ }
+ clean(symbol);
+ } else {
+ List<BigDecimal> adjustments = AdjustmentValueCache.getPreAllocatedAdjustments().get(symbol);
+ Integer currentIndex = AdjustmentValueCache.getCurrentAdjustmentIndex().get(symbol);
+
+ // 首次执行：生成含正负值的调整序列
+ if (adjustments == null || currentIndex == null) {
+ //分几段执行
+ int nums = Math.max(10, frequency / 10);
+ List<BigDecimal> result = RandomNumbersGenerator.generateNumbers(delayValue.getValue(), nums, decimal + 4);
+ for (int i = 0; i < result.size(); i++) {
+ if (adjustments == null) {
+ adjustments = new ArrayList<>();
+ }
+ int count = frequency / nums;
+ if (i == result.size() - 1) {
+ count += frequency % nums;
+ }
+ adjustments.addAll(generateRandomAdjustments(result.get(i), count, decimal));
+ }
+ currentIndex = 0;
+ AdjustmentValueCache.getPreAllocatedAdjustments().put(symbol, adjustments);
+ AdjustmentValueCache.getCurrentAdjustmentIndex().put(symbol, currentIndex);
+ }
+
+ // 分步应用调整值（确保正负交替）
+ if (currentIndex < frequency) {
+ BigDecimal currentAdjust = adjustments.get(currentIndex);
+
+ // 更新当前值（累加正负调整值）
+ if (currentValue == null) {
+ AdjustmentValueCache.getCurrentValue().put(symbol, currentAdjust.setScale(decimal, RoundingMode.HALF_UP));
+ } else {
+ AdjustmentValueCache.getCurrentValue().put(symbol, currentValue.add(currentAdjust).setScale(decimal, RoundingMode.HALF_UP));
+ }
+
+ // 更新延时值（剩余值和时间）
+ delayValue.setValue(delayValue.getValue().subtract(currentAdjust).setScale(decimal, RoundingMode.HALF_UP));
+ delayValue.setSecond(Arith.sub(delayValue.getSecond(), Arith.div(this.interval, 1000.0D)));
+ AdjustmentValueCache.getDelayValue().put(symbol, delayValue);
+
+ // 索引递增，完成后清理缓存
+ int nextIndex = currentIndex + 1;
+ AdjustmentValueCache.getCurrentAdjustmentIndex().put(symbol, nextIndex);
+ if (nextIndex >= frequency) {
+ clean(symbol);
+ }
+
+ // 持久化更新
+ BigDecimal newAdjustValue = AdjustmentValueCache.getCurrentValue().get(symbol);
+ if (!item.getAdjustmentValue().equals(newAdjustValue)) {
+ item.setAdjustmentValue(newAdjustValue);
+ itemService.saveOrUpdate(item);
+ }
}
}
}
@@ -160,15 +196,27 @@
realtime.setTs(Long.valueOf(realtime.getTs() + "000"));
}
realtime.setName(item.getName());
- if (high == null || realtime.getHigh().doubleValue() > high) {
+ /*if (high == null || realtime.getHigh().doubleValue() > high) {
DataCache.getRealtimeHigh().put(symbol, realtime.getHigh().doubleValue());
}
if ((low == null || realtime.getLow().doubleValue() < low) && realtime.getLow().doubleValue() > 0) {
DataCache.getRealtimeLow().put(symbol, realtime.getLow().doubleValue());
+ }*/
+ if (high != null) {
+ realtime.setHigh(BigDecimal.valueOf(high));
+ }
+ if (low != null) {
+ realtime.setLow(BigDecimal.valueOf(low));
}
this.dataDBService.saveAsyn(realtime);
}
+ private void clean(String symbol){
+ AdjustmentValueCache.getDelayValue().remove(symbol);
+ AdjustmentValueCache.getPreAllocatedAdjustments().remove(symbol);
+ AdjustmentValueCache.getCurrentAdjustmentIndex().remove(symbol);
+ AdjustmentValueCache.getFrequency().remove(symbol);
+ }
private List<BigDecimal> generateRandomAdjustments(BigDecimal totalValue, int count, int decimal) {
List<BigDecimal> adjustments = new ArrayList<>(count);
@@ -278,7 +326,24 @@
public static void main(String[] args) {
AbstractGetDataJob abstractGetDataJob = new CryptosGetDataJob();
- List<BigDecimal> list = abstractGetDataJob.generateRandomAdjustments(new BigDecimal(0.002), 300, 8);
+ List<BigDecimal> list = new ArrayList<>();
+ int frequency = 334;
+ int decimal = 4;
+ //分几段执行
+ int nums = Math.max(10, frequency / 10);
+ System.out.println(nums);
+ List<BigDecimal> result = RandomNumbersGenerator.generateNumbers(BigDecimal.valueOf(0.02), nums, decimal + 4);
+ System.out.println(result);
+ for (int i = 0; i < result.size(); i++) {
+ int count = frequency / nums;
+ if (i == result.size() - 1) {
+ count += frequency % nums;
+ }
+ List<BigDecimal> numbers = abstractGetDataJob.generateRandomAdjustments(result.get(i), count, decimal);
+ System.out.println(numbers);
+ list.addAll(numbers);
+ }
+
BigDecimal sum = BigDecimal.ZERO;
int num = 0;
int dmt = 1;
@@ -290,7 +355,7 @@
numd = numd.add(list.get(i));
num++;
- if (num == 20) {
+ if (num == 33) {
System.out.println(dmt+"ddd" + numd);
dmt++;
num=0;
--
Gitblit v1.9.3