From ad1097015ebbd712f86761ee85e035c0b2bf5ab4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 09 Feb 2026 16:33:45 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/utils/task/stock/StockTask.java | 209 ++++++++++++++++++++++++++++------------------------
1 files changed, 113 insertions(+), 96 deletions(-)
diff --git a/src/main/java/com/nq/utils/task/stock/StockTask.java b/src/main/java/com/nq/utils/task/stock/StockTask.java
index f7520a6..b4cecbd 100644
--- a/src/main/java/com/nq/utils/task/stock/StockTask.java
+++ b/src/main/java/com/nq/utils/task/stock/StockTask.java
@@ -3,38 +3,36 @@
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import com.nq.Repository.StockRepository;
+import com.nq.dao.StockConfigMapper;
import com.nq.dao.StockMapper;
import com.nq.dao.UserPositionMapper;
+import com.nq.enums.EConfigKey;
import com.nq.enums.EStockType;
import com.nq.pojo.*;
+import com.nq.service.ExchangeRateService;
import com.nq.service.IMandatoryLiquidationService;
import com.nq.service.IStockService;
import com.nq.service.IUserPositionService;
+import com.nq.service.impl.StockServiceImpl;
import com.nq.utils.PropertiesUtil;
+import com.nq.utils.StringUtils;
import com.nq.utils.http.HttpClientRequest;
import com.nq.utils.http.HttpRequest;
import com.nq.utils.redis.RedisKeyUtil;
-import net.sf.json.JSONArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -44,85 +42,89 @@
@Component
public class StockTask {
@Autowired
- IStockService stockService;
- @Autowired
StockMapper stockMapper;
-
@Autowired
- IUserPositionService userPositionService;
-
- @Autowired
- UserPositionMapper userPositionMapper;
+ IStockService istockService;
@Autowired
StockRepository stockRepository;
private final Lock stockConstraintLock = new ReentrantLock();
-
@Autowired
IMandatoryLiquidationService mandatoryLiquidationService;
-
private static final Logger log = LoggerFactory.getLogger(StockTask.class);
-
-
private final AtomicBoolean syncINStockData = new AtomicBoolean(false);
private final Lock syncINStockDataLock = new ReentrantLock();
+ @Autowired
+ private ThreadPoolTaskExecutor taskExecutor;
+ @Autowired
+ private StockServiceImpl iStockService;
+ @Autowired
+ private ExchangeRateService exchangeRateService;
+
+ @Autowired
+ StockConfigMapper stockConfigMapper;
+
+ /**
+ * test
+ */
+ //@Scheduled(cron = "*/5 * * * * *")
+ public void test() {}
+
/**
* 同步系统所需要的股票
*/
- @Scheduled(cron = "0 0/1 * * * ?")
+ @Scheduled(cron = "0 0/3 * * * ?")
public void syncINStockData() {
+
if (syncINStockData.get()) { // 判断任务是否在处理中
return;
}
if (syncINStockDataLock.tryLock()) {
- ExecutorService executor = Executors.newFixedThreadPool(4);
- Future<?> future1 = null;
- Future<?> future2 = null;
- Future<?> future3 = null;
- Future<?> future4 = null;
try {
- syncINStockData.set(true); // 设置处理中标识为true
+ syncINStockData.set(true);
- // 同步股票数据
- future1 = executor.submit(() -> loadAllStock(EStockType.US));
- future2 = executor.submit(() -> loadAllStock(EStockType.MX));
- // 同步指数数据
- future3 = executor.submit(() -> syncIndices(EStockType.US));
- future4 = executor.submit(() -> syncIndices(EStockType.MX));
+ // 1. 定义需要处理的所有股票类型（集中管理，新增类型只需添加到列表）
+ List<EStockType> stockTypes = Arrays.asList(
+ EStockType.US,
+ EStockType.JP
+ );
- // 等待任务都完成
- future1.get();
- future2.get();
- future3.get();
- future4.get();
+ // 2. 批量创建所有异步任务
+ List<CompletableFuture<Void>> futures = new ArrayList<>();
+ for (EStockType type : stockTypes) {
+ // 添加loadAllStock任务
+ futures.add(CompletableFuture.runAsync(() -> loadAllStock(type), taskExecutor));
+ // 添加syncIndices任务
+ futures.add(CompletableFuture.runAsync(() -> syncIndices(type), taskExecutor));
+ }
+
+ // 3. 等待所有任务完成（将List转换为数组传入allOf）
+ CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
} catch (Exception e) {
- Thread.currentThread().interrupt();
log.error("同步股票数据出错", e);
} finally {
- // 关闭线程池
- if (executor != null) {
- executor.shutdown();
- }
syncINStockDataLock.unlock();
- syncINStockData.set(false); // 设置处理中标识为false
+ syncINStockData.set(false);
}
}
}
+ /**
+ * 加载所有指数数据
+ */
private void syncIndices(EStockType eStockType) {
+ log.info("同步指数 数据 {}", eStockType.getCode());
List<DataStockBean> list = new ArrayList<>();
int totleStock = 1;
try {
while (totleStock > list.size()) {
try {
- //String result = HttpClientRequest.doGet(eStockType.stockUrl + "indices?key=" + eStockType.getStockKey() + "&country_id=" + eStockType.getContryId());
- //ReponseBase reponseBase = new Gson().fromJson(result, ReponseBase.class);
String result = HttpRequest.doGrabGet(eStockType.stockUrl + "indices?key=" + eStockType.getStockKey() + "&country_id=" + eStockType.getContryId());
// 把JSON数据解析为List<DataStockBean>
Type listType = new TypeToken<List<DataStockBean>>(){}.getType();
@@ -150,31 +152,65 @@
stock = new Stock();
}
stock.setStockCode(o.getId());
- stock.setStockName(o.getName());
+ stock.setStockName(StringUtils.trim(o.getName()));
stock.setStockType(eStockType.getCode());
- if (o.getType() == null) {
- stock.setStockGid(eStockType.getCode());
- } else {
- stock.setStockGid(o.getType());
- }
+ //指数数据类型
+ stock.setStockGid(EConfigKey.INDICES.getCode());
stock.setStockSpell(o.getSymbol());
stock.setIsLock(0);
- stock.setIsShow(0);
+ if (null == stock.getIsShow()){
+ stock.setIsShow(0);
+ }
stock.setDataBase(0);
stock.setAddTime(new Date());
updateStockList.add(stock);
- /*if (stock.getId() == null) {
- stockMapper.insert1(stock);
- } else {
- stockMapper.updateById(stock);
- }*/
+
RedisKeyUtil.setCaCheKeyBaseStock(eStockType, o);
}
stockRepository.saveAll(updateStockList);
+ cacheKData(eStockType.getCode(), list);
log.info("同步指数 数据 成功 {} 总共同步数据 {}", eStockType.getCode(), list.size());
} catch (Exception e) {
- log.error("同步指数列表出现异常: {}", e.getMessage());
+ e.printStackTrace();
+ log.error("同步指数列表出现异常: {}", eStockType.getCode());
}
+ }
+
+ /**
+ * 同步指数股票后缓存k线图
+ */
+ public void cacheKData(String stockType, List<DataStockBean> list) {
+ /*StringBuilder codeList = new StringBuilder();
+ codeList.append(PropertiesUtil.getProperty("us_home_indices_code"));
+ codeList.append(PropertiesUtil.getProperty("hk_home_indices_code"));
+ codeList.append(PropertiesUtil.getProperty("in_home_indices_code"));
+ codeList.append(PropertiesUtil.getProperty("tw_home_indices_code"));*/
+
+
+ List<StockConfig> stockConfigList = stockConfigMapper.selectList
+ (new LambdaQueryWrapper<StockConfig>()
+ .like(StockConfig::getCKey, EConfigKey.INDICES.getCode()));
+ String codeList = null;
+ if (stockConfigList != null && !stockConfigList.isEmpty()) {
+ codeList = stockConfigList.stream().filter(Objects::nonNull)
+ .map(x -> { return x.getCValue() == null ? "" : x.getCValue();
+ }).collect(Collectors.joining(","));
+ }
+ if (codeList == null || codeList.isEmpty()) {
+ return;
+ }
+ for (DataStockBean dataStockBean : list) {
+ //缓存首页指数k线图
+ if (codeList.contains(dataStockBean.getId())) {
+ // 获取K线数据
+ Object kData = istockService.getKData(dataStockBean.getId(), "D", stockType);
+ if (kData != null) {
+ //缓存redis
+ RedisKeyUtil.setCaCheStockKData(stockType, dataStockBean.getId(), kData);
+ }
+ }
+ }
+ log.info("同步指数k线图 数据 成功 {} 总共同步数据 {}", stockType, list.size());
}
/**
@@ -218,7 +254,7 @@
try {
while (totleStock > list.size()) {
try {
- String result = HttpClientRequest.doGet(eStockType.stockUrl + "list?country_id=" + eStockType.getContryId() + "&size=1000&page=" + page + "&key=" + eStockType.stockKey);
+ String result = HttpClientRequest.doGet(eStockType.stockUrl + "list?country_id=" + eStockType.getContryId() + "&size=100000&page=" + page + "&key=" + eStockType.stockKey);
ReponseBase reponseBase = new Gson().fromJson(result, ReponseBase.class);
list.addAll(reponseBase.getData());
page++;
@@ -233,9 +269,7 @@
}
List<String> stockCodeList = list.stream().map(DataStockBean::getId).collect(Collectors.toList());
List<Stock> stockList = stockMapper.selectList(new QueryWrapper<Stock>().in("stock_code", stockCodeList));
- int i = 1;
List<Stock> updateStockList = new ArrayList<>();
- System.out.println(new Date());
for (DataStockBean o : list) {
//Stock stock = stockMapper.findStockByCode(o.getId());
Stock stock = stockList.stream()
@@ -244,43 +278,26 @@
.orElse(null);
if (stock == null) {
stock = new Stock();
- stock.setStockCode(o.getId());
- stock.setStockName(o.getName());
- stock.setStockType(eStockType.getCode());
- if (o.getType() == null) {
- stock.setStockGid(eStockType.getCode());
- } else {
- stock.setStockGid(o.getType());
- }
- stock.setStockSpell(o.getSymbol());
- stock.setIsLock(0);
- stock.setIsShow(0);
- stock.setDataBase(0);
- stock.setAddTime(new Date());
- //stockMapper.insert1(stock);
- } else {
- stock.setStockCode(o.getId());
- stock.setStockName(o.getName());
- stock.setStockType(eStockType.getCode());
- if (o.getType() == null) {
- stock.setStockGid(eStockType.getCode());
- } else {
- stock.setStockGid(o.getType());
- }
- stock.setStockSpell(o.getSymbol());
- stock.setIsLock(0);
- stock.setIsShow(0);
- stock.setDataBase(0);
- stock.setAddTime(new Date());
- //stockMapper.updateById(stock);
}
+ stock.setStockCode(o.getId());
+ stock.setStockName(StringUtils.trim(o.getName()));
+ stock.setStockType(eStockType.getCode());
+ if (o.getType() == null) {
+ stock.setStockGid(eStockType.getCode());
+ } else {
+ stock.setStockGid(o.getType());
+ }
+ stock.setStockSpell(o.getSymbol());
+ stock.setIsLock(0);
+ if (null == stock.getIsShow()){
+ stock.setIsShow(0);
+ }
+ stock.setDataBase(0);
+ stock.setAddTime(new Date());
updateStockList.add(stock);
RedisKeyUtil.setCaCheKeyBaseStock(eStockType, o);
- System.out.println(i);
- i++;
}
stockRepository.saveAll(updateStockList);
- System.out.println(new Date());
log.info("同步股票 数据 成功 {} 总共同步数据 {}", eStockType.getCode(), list.size());
} catch (
Exception e) {
--
Gitblit v1.9.3