From ff955adf5a6dda63dd09068eba743efb9553488d Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 29 Oct 2024 16:12:15 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/utils/task/stock/StockTask.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 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 98dc9b7..4d9b175 100644
--- a/src/main/java/com/nq/utils/task/stock/StockTask.java
+++ b/src/main/java/com/nq/utils/task/stock/StockTask.java
@@ -58,10 +58,14 @@
 
     private final Lock syncINStockDataLock = new ReentrantLock();
 
+    private final AtomicBoolean syncUSStockData = new AtomicBoolean(false);
+
+    private final Lock syncUSStockDataLock = new ReentrantLock();
+
     /**
      * 同步系统所需要的股票
      */
-    @Scheduled(cron = "0 0 0/2  * * ?")
+    @Scheduled(cron = "0 0/1 * * * ?")
     public void syncINStockData() {
         if (syncINStockData.get()) { // 判断任务是否在处理中
             return;
@@ -69,7 +73,7 @@
         if (syncINStockDataLock.tryLock()) {
             try {
                 syncINStockData.set(true); // 设置处理中标识为true
-                loadAllStock(EStockType.IN);
+                loadAllStock(EStockType.JP);
             } finally {
                 syncINStockDataLock.unlock();
                 syncINStockData.set(false); // 设置处理中标识为false
@@ -81,9 +85,20 @@
     /**
      * 同步美国股票
      */
-//    @Scheduled(cron = "0 0/30 * * * ?")
+    @Scheduled(cron = "0 0/1 * * * ?")
     public void loadStockCompanies() {
-        loadAllCompanies();
+        if (syncUSStockData.get()) { // 判断任务是否在处理中
+            return;
+        }
+        if (syncUSStockDataLock.tryLock()) {
+            try {
+                syncUSStockData.set(true); // 设置处理中标识为true
+                loadAllStock(EStockType.US);
+            } finally {
+                syncUSStockDataLock.unlock();
+                syncUSStockData.set(false); // 设置处理中标识为false
+            }
+        }
     }
 
 
@@ -177,7 +192,7 @@
     /**
      * 强制平仓
      */
-    @Scheduled(cron = "0/1 * * * * ?")
+//    @Scheduled(cron = "0/1 * * * * ?")
     public void stockConstraint() {
         if (stockConstraint.get()) { // 判断任务是否在处理中
             return;

--
Gitblit v1.9.3