From 7d43a7f0a3ea90a152a9d0e52fde1e0f13272c10 Mon Sep 17 00:00:00 2001
From: PC-202403201522\Administrator <1041918560@qq.com>
Date: Mon, 13 May 2024 17:37:10 +0800
Subject: [PATCH] 定时任务阻塞
---
src/main/java/com/nq/utils/task/stock/CarryPositionTask.java | 11 +++
src/main/java/com/nq/utils/task/YEBTask.java | 33 ++++++++--
src/main/java/com/nq/utils/task/stock/StockTask.java | 97 ++++++++++++++++++--------------
src/main/java/com/nq/utils/task/news/NewsTask.java | 34 ++++++++---
4 files changed, 115 insertions(+), 60 deletions(-)
diff --git a/src/main/java/com/nq/utils/task/YEBTask.java b/src/main/java/com/nq/utils/task/YEBTask.java
index de9d595..12d22a2 100644
--- a/src/main/java/com/nq/utils/task/YEBTask.java
+++ b/src/main/java/com/nq/utils/task/YEBTask.java
@@ -6,29 +6,46 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Controller;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
/**
* 余额宝定时任务
- * */
+ */
@Slf4j
@Component
public class YEBTask {
-
@Autowired
IEchoServices echoServices;
+ boolean sendYEBMoney = true;
+
+ private final Lock sendYEBMoneyLock = new ReentrantLock();
/**
* 余额宝发放利息
- * */
+ */
@Scheduled(cron = "0 0/1 * * * ?")
- public void sendYEBMoney(){
- log.info("基金定时任务-------开始");
- echoServices.sendMoney();
- log.info("基金定时任务-------结束");
+ public void sendYEBMoney() {
+ if (sendYEBMoney)
+ sendYEBMoney = false;
+ else return;
+ if (sendYEBMoneyLock.tryLock()) {
+ try {
+
+ log.info("基金定时任务-------开始");
+ echoServices.sendMoney();
+ log.info("基金定时任务-------结束");
+
+ } finally {
+ sendYEBMoneyLock.unlock();
+ sendYEBMoney = true;
+ }
+ }
}
}
diff --git a/src/main/java/com/nq/utils/task/news/NewsTask.java b/src/main/java/com/nq/utils/task/news/NewsTask.java
index 3f4a1fc..330df1e 100644
--- a/src/main/java/com/nq/utils/task/news/NewsTask.java
+++ b/src/main/java/com/nq/utils/task/news/NewsTask.java
@@ -7,6 +7,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
//import org.springframework.scheduling.annotation.Scheduled;
@@ -20,25 +23,36 @@
@Autowired
ISiteArticleService iSiteArticleService;
+ boolean NewsInfoTask = true;
+
+ private final Lock NewsInfoTaskLock = new ReentrantLock();
/*
* 新聞資訊抓取
* */
- @Scheduled(cron = "0 0/5 * * * ?")
+ @Scheduled(cron = "0/1 * * * * ?")
public void NewsInfoTask() {
- try {
- System.out.println("新闻定时任务---->开始");
- this.iSiteNewsService.grabNews();
- }catch (Exception e){
- e.printStackTrace();
+ if (NewsInfoTask)
+ NewsInfoTask = false;
+ else return;
+ if (NewsInfoTaskLock.tryLock()) {
+ try {
+ System.out.println("新闻定时任务---->开始");
+ this.iSiteNewsService.grabNews();
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ NewsInfoTaskLock.unlock();
+ NewsInfoTask = true;
+ }
+ System.out.println("新闻定时任务---->结束");
}
- System.out.println("新闻定时任务---->结束");
}
/*
* 新聞公告抓取
* */
- @Scheduled(cron = "0 0/30 9-20 * * ?")
- public void ArtInfoTask() {
+// @Scheduled(cron = "0 0/30 9-20 * * ?")
+// public void ArtInfoTask() {
// this.iSiteArticleService.grabArticle();
- }
+// }
}
diff --git a/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java b/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java
index 4469cee..1178088 100644
--- a/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java
+++ b/src/main/java/com/nq/utils/task/stock/CarryPositionTask.java
@@ -56,8 +56,13 @@
private final Lock subscriptionLock = new ReentrantLock();
+ boolean ballot = true;
+
@Scheduled(cron = "0 0/10 * * * ?")
public void ballot() {
+ if (ballot)
+ ballot = false;
+ else return;
if (ballotLock.tryLock()) {
try {
log.info("新股上市转持仓定时任务--------->开始");
@@ -83,14 +88,19 @@
log.error("新股上市转持仓定时任务发生异常", e);
} finally {
ballotLock.unlock();
+ ballot = true;
}
} else {
log.info("新股上市转持仓定时任务--------->上次任务还未执行完成，本次任务忽略");
}
}
+ boolean subscription = true;
@Scheduled(cron = "0 0/1 * * * ?")
public void subscription() {
+ if (subscription)
+ subscription = false;
+ else return;
if (subscriptionLock.tryLock()) {
try {
log.info("自动转已认缴--------->开始");
@@ -108,6 +118,7 @@
log.error("自动转已认缴定时任务发生异常", e);
} finally {
subscriptionLock.unlock();
+ subscription = true;
}
} else {
log.info("自动转已认缴定时任务--------->上次任务还未执行完成，本次任务忽略");
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 92b2db7..90967b3 100644
--- a/src/main/java/com/nq/utils/task/stock/StockTask.java
+++ b/src/main/java/com/nq/utils/task/stock/StockTask.java
@@ -1,28 +1,27 @@
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;
@@ -46,52 +45,60 @@
private final Lock stockConstraintLock = new ReentrantLock();
-
@Autowired
IMandatoryLiquidationService mandatoryLiquidationService;
-
private static final Logger log = LoggerFactory.getLogger(StockTask.class);
+ boolean syncINStockData = true;
+
+ private final Lock syncINStockDataLock = new ReentrantLock();
+
/**
* 同步系统所需要的股票
- * */
+ */
@Scheduled(cron = "0 0 0/2 * * ?")
public void syncINStockData() {
- loadAllStock(EStockType.IN);
+ if (syncINStockData)
+ syncINStockData = false;
+ else return;
+ if (syncINStockDataLock.tryLock()) {
+ try {
+ loadAllStock(EStockType.IN);
// loadAllStock(EStockType.HK);
+ } finally {
+ syncINStockDataLock.unlock();
+ syncINStockData = true;
+ }
+ }
}
-
-
/**
* 同步美国股票
- * */
+ */
// @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,21 +108,21 @@
/**
* 加载所有股票数据
- * */
- 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;
}
@@ -127,9 +134,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 +145,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,24 +161,29 @@
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);
}
}
+ boolean stockConstraint = true;
+
/**
* 强制平仓
*/
@Scheduled(cron = "0/1 * * * * ?")
- public void stockConstraint(){
+ public void stockConstraint() {
+ if (stockConstraint)
+ stockConstraint = false;
+ else return;
if (stockConstraintLock.tryLock()) {
try {
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) {
@@ -179,6 +191,7 @@
log.error("强制平仓任务错误：" + e.getMessage());
} finally {
stockConstraintLock.unlock();
+ stockConstraint = true;
}
} else {
log.info("强制平仓任务--------->上次任务还未执行完成，本次任务忽略");
--
Gitblit v1.9.3