From c1289aa55b47d436ffa478095074f7ab23aa88a1 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 28 Jul 2025 01:22:20 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/utils/task/stock/StockTask.java | 121 ++++++++++++++++++++++++---------------
1 files changed, 74 insertions(+), 47 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 ed9caf6..261a03b 100644
--- a/src/main/java/com/nq/utils/task/stock/StockTask.java
+++ b/src/main/java/com/nq/utils/task/stock/StockTask.java
@@ -1,33 +1,35 @@
package com.nq.utils.task.stock;
-import cn.hutool.json.JSONUtil;
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.nq.dao.*;
+import com.nq.dao.StockMapper;
+import com.nq.dao.UserPositionMapper;
import com.nq.enums.EStockType;
-import com.nq.pojo.*;
+import com.nq.pojo.DataStockBean;
+import com.nq.pojo.ReponseBase;
+import com.nq.pojo.Stock;
+import com.nq.pojo.UserPosition;
import com.nq.service.IMandatoryLiquidationService;
import com.nq.service.IStockService;
import com.nq.service.IUserPositionService;
import com.nq.utils.http.HttpClientRequest;
import com.nq.utils.redis.RedisKeyUtil;
-import com.nq.utils.redis.RedisShardedPoolUtils;
-import com.nq.utils.stock.BuyAndSellUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import java.util.stream.Collectors;
@Component
@@ -46,52 +48,61 @@
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();
+
/**
* 同步系统所需要的股票
- * */
-// @Scheduled(cron = "0/30 * * * * ?")
+ */
+ @Scheduled(cron = "0 0/1 * * * ?")
public void syncINStockData() {
- loadAllStock(EStockType.IN);
-// loadAllStock(EStockType.HK);
+ if (syncINStockData.get()) { // 判断任务是否在处理中
+ return;
+ }
+ if (syncINStockDataLock.tryLock()) {
+ try {
+ syncINStockData.set(true); // 设置处理中标识为true
+ loadAllStock(EStockType.JP);
+ } finally {
+ syncINStockDataLock.unlock();
+ syncINStockData.set(false); // 设置处理中标识为false
+ }
+ }
}
-
-
/**
* 同步美国股票
- * */
+ */
// @Scheduled(cron = "0 0/30 * * * ?")
- public void loadStockCompanies(){
+ public void loadStockCompanies() {
loadAllCompanies();
}
-
-
/**
* 加载公司信息
- * */
- public void loadAllCompanies(){
- List<Stock> list = stockMapper.findStockList();
- for (int i = 0; i <list.size() ; i++) {
+ */
+ public void loadAllCompanies() {
+ List<Stock> list = stockMapper.findStockList();
+ for (int i = 0; i < list.size(); i++) {
Stock stock = list.get(i);
EStockType eStockType = EStockType.getEStockTypeByCode(stock.getStockType());
- String result = HttpClientRequest.doGet(eStockType.stockUrl+"companies?pid=+"+stock.getStockCode()+"+country_id="+eStockType.getContryId()+"&size=1&page=1&key="+eStockType.stockKey);
+ String result = HttpClientRequest.doGet(eStockType.stockUrl + "companies?pid=+" + stock.getStockCode() + "+country_id=" + eStockType.getContryId() + "&size=1&page=1&key=" + eStockType.stockKey);
try {
JSONObject jsonObject = JSONObject.parseObject(result);
JSONObject companiesInfo = jsonObject.getJSONArray("data").getJSONObject(0);
- RedisKeyUtil.setCacheCompanies(stock,new Gson().toJson(companiesInfo));
- }catch (Exception e){
+ RedisKeyUtil.setCacheCompanies(stock, new Gson().toJson(companiesInfo));
+ } catch (Exception e) {
log.info("");
}
@@ -101,25 +112,36 @@
/**
* 加载所有股票数据
- * */
- public void loadAllStock(EStockType eStockType){
- log.info("同步股票 数据 {}",eStockType.getCode());
+ */
+ public void loadAllStock(EStockType eStockType) {
+ log.info("同步股票 数据 {}", eStockType.getCode());
List<DataStockBean> list = new ArrayList<>();
int totleStock = 1;
- int page =0;
+ int page = 0;
try {
- while (totleStock>list.size()){
- try{
- String result = HttpClientRequest.doGet(eStockType.stockUrl+"list?country_id="+eStockType.getContryId()+"&size=1000&page="+page+"&key="+eStockType.stockKey);
- ReponseBase reponseBase = new Gson().fromJson(result,ReponseBase.class);
+ while (totleStock > list.size()) {
+ try {
+ String result = HttpClientRequest.doGet(eStockType.stockUrl + "list?country_id=" + eStockType.getContryId() + "&size=1000&page=" + page + "&key=" + eStockType.stockKey);
+ ReponseBase reponseBase = new Gson().fromJson(result, ReponseBase.class);
list.addAll(reponseBase.getData());
page++;
totleStock = reponseBase.getTotal();
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
break;
}
}
+ List<DataStockBean> filteredList = list.stream()
+ .collect(Collectors.groupingBy(
+ stock -> stock.getSymbol() + "|" + stock.getName()
+ ))
+ .values().stream()
+ .flatMap(group -> group.stream()
+ .filter(stock -> group.size() == 1 || "TSE".equals(stock.getType()))
+ .limit(1) // 每组最多取 1 条
+ )
+ .collect(Collectors.toList());
+ list = filteredList;
for (DataStockBean o : list) {
Stock stock = stockMapper.findStockByCode(o.getId());
if (stock == null) {
@@ -127,9 +149,9 @@
stock.setStockCode(o.getId());
stock.setStockName(o.getName());
stock.setStockType(eStockType.getCode());
- if(o.getType() == null){
+ if (o.getType() == null) {
stock.setStockGid(eStockType.getCode());
- }else{
+ } else {
stock.setStockGid(o.getType());
}
stock.setStockSpell(o.getSymbol());
@@ -138,13 +160,13 @@
stock.setDataBase(0);
stock.setAddTime(new Date());
stockMapper.insert1(stock);
- }else{
+ } else {
stock.setStockCode(o.getId());
stock.setStockName(o.getName());
stock.setStockType(eStockType.getCode());
- if(o.getType() == null){
+ if (o.getType() == null) {
stock.setStockGid(eStockType.getCode());
- }else{
+ } else {
stock.setStockGid(o.getType());
}
stock.setStockSpell(o.getSymbol());
@@ -154,25 +176,30 @@
stock.setAddTime(new Date());
stockMapper.updateById(stock);
}
- RedisKeyUtil.setCaCheKeyBaseStock(eStockType,o);
+ RedisKeyUtil.setCaCheKeyBaseStock(eStockType, o);
}
- log.info("同步股票 数据 成功 {} 总共同步数据 {}",eStockType.getCode(),list.size());
+ log.info("同步股票 数据 成功 {} 总共同步数据 {}", eStockType.getCode(), list.size());
} catch (
Exception e) {
log.error("同步出错", e);
}
}
+ private final AtomicBoolean stockConstraint = new AtomicBoolean(false);
+
/**
* 强制平仓
*/
- @Scheduled(cron = "0/1 * * * * ?")
- public void stockConstraint(){
+// @Scheduled(cron = "0/1 * * * * ?")
+ public void stockConstraint() {
+ if (stockConstraint.get()) { // 判断任务是否在处理中
+ return;
+ }
if (stockConstraintLock.tryLock()) {
- log.info("强制平仓任务：--------->开始");
try {
+ stockConstraint.set(true); // 设置处理中标识为true
List<UserPosition> userPositions = userPositionMapper.selectList(new LambdaQueryWrapper<UserPosition>().isNull(UserPosition::getSellOrderId));
- if(CollectionUtils.isNotEmpty(userPositions)){
+ if (CollectionUtils.isNotEmpty(userPositions)) {
userPositionService.stockConstraint(userPositions);
}
} catch (Exception e) {
@@ -180,7 +207,7 @@
log.error("强制平仓任务错误：" + e.getMessage());
} finally {
stockConstraintLock.unlock();
- log.info("强制平仓任务：--------->结束");
+ stockConstraint.set(false); // 设置处理中标识为false
}
} else {
log.info("强制平仓任务--------->上次任务还未执行完成，本次任务忽略");
--
Gitblit v1.9.3