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 | 138 ++++++++++++++++++++++-----------------------
1 files changed, 67 insertions(+), 71 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 2ffd21b..b4cecbd 100644
--- a/src/main/java/com/nq/utils/task/stock/StockTask.java
+++ b/src/main/java/com/nq/utils/task/stock/StockTask.java
@@ -1,10 +1,12 @@
package com.nq.utils.task.stock;
import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.gson.Gson;
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;
@@ -16,6 +18,7 @@
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;
@@ -64,27 +67,19 @@
@Autowired
private ExchangeRateService exchangeRateService;
+ @Autowired
+ StockConfigMapper stockConfigMapper;
+
/**
* test
*/
- //@Scheduled(cron = "0 0/1 * * * ?")
- @Scheduled(cron = "*/5 * * * * *")
- public void test() {
- /*ExchangeRate model = new ExchangeRate();
- model.setCurrency("MXN");
- model.setConversionCurrency("USD");
- model.setRata(BigDecimal.valueOf(0.0520));
- exchangeRateService.updateRate(model,null);*/
-
- //iStockService.getStockByType(1, 20, "desc","st" , "US", null);
- //istockService.getIndicesList("US");
- //istockService.getIndicesAndKData("15882", "US");
- }
+ //@Scheduled(cron = "*/5 * * * * *")
+ public void test() {}
/**
* 同步系统所需要的股票
*/
- @Scheduled(cron = "0 0/1 * * * ?")
+ @Scheduled(cron = "0 0/3 * * * ?")
public void syncINStockData() {
if (syncINStockData.get()) { // 判断任务是否在处理中
@@ -94,14 +89,23 @@
try {
syncINStockData.set(true);
- // 使用CompletableFuture并行执行任务
- CompletableFuture<Void> future1 = CompletableFuture.runAsync(() -> loadAllStock(EStockType.US), taskExecutor);
- CompletableFuture<Void> future2 = CompletableFuture.runAsync(() -> loadAllStock(EStockType.MX), taskExecutor);
- CompletableFuture<Void> future3 = CompletableFuture.runAsync(() -> syncIndices(EStockType.US), taskExecutor);
- CompletableFuture<Void> future4 = CompletableFuture.runAsync(() -> syncIndices(EStockType.MX), taskExecutor);
+ // 1. 定义需要处理的所有股票类型（集中管理，新增类型只需添加到列表）
+ List<EStockType> stockTypes = Arrays.asList(
+ EStockType.US,
+ EStockType.JP
+ );
- // 等待所有任务完成
- CompletableFuture.allOf(future1, future2, future3, future4).join();
+ // 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) {
log.error("同步股票数据出错", e);
} finally {
@@ -115,6 +119,7 @@
* 加载所有指数数据
*/
private void syncIndices(EStockType eStockType) {
+ log.info("同步指数 数据 {}", eStockType.getCode());
List<DataStockBean> list = new ArrayList<>();
int totleStock = 1;
try {
@@ -147,39 +152,27 @@
stock = new Stock();
}
stock.setStockCode(o.getId());
- stock.setStockName(o.getName());
+ stock.setStockName(StringUtils.trim(o.getName()));
stock.setStockType(eStockType.getCode());
//指数数据类型
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);
- /*StockRealTimeBean stockRealTimeBean = new StockRealTimeBean();
- stockRealTimeBean.setPid(o.getId());
- stockRealTimeBean.setLast(o.getLast());
- stockRealTimeBean.setHigh(o.getHigh());
- stockRealTimeBean.setLow(o.getLow());
- stockRealTimeBean.setPc(o.getChg());
- stockRealTimeBean.setPcp(o.getChgPct()+ "%");
- stockRealTimeBean.setTime(o.getTime());
- RedisKeyUtil.setCacheRealTimeStock(eStockType, stockRealTimeBean);*/
+ RedisKeyUtil.setCaCheKeyBaseStock(eStockType, o);
}
stockRepository.saveAll(updateStockList);
cacheKData(eStockType.getCode(), list);
log.info("同步指数 数据 成功 {} 总共同步数据 {}", eStockType.getCode(), list.size());
} catch (Exception e) {
e.printStackTrace();
- log.error("同步指数列表出现异常: {}", e.getMessage());
+ log.error("同步指数列表出现异常: {}", eStockType.getCode());
}
}
@@ -187,11 +180,28 @@
* 同步指数股票后缓存k线图
*/
public void cacheKData(String stockType, List<DataStockBean> list) {
- String usCodeList = PropertiesUtil.getProperty("us_home_indices_code");
- String mxCodeList = PropertiesUtil.getProperty("mx_home_indices_code");
+ /*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 (usCodeList.contains(dataStockBean.getId()) || mxCodeList.contains(dataStockBean.getId())) {
+ if (codeList.contains(dataStockBean.getId())) {
// 获取K线数据
Object kData = istockService.getKData(dataStockBean.getId(), "D", stockType);
if (kData != null) {
@@ -268,36 +278,22 @@
.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);
}
--
Gitblit v1.9.3