From 2a13fc3d05c012766eb677cb0486e6dcf9ed1bf2 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 29 Aug 2024 18:30:16 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/utils/task/stock/StockTask.java |   80 +++++++++++++--------------------------
 1 files changed, 27 insertions(+), 53 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 620e980..f41d9d9 100644
--- a/src/main/java/com/nq/utils/task/stock/StockTask.java
+++ b/src/main/java/com/nq/utils/task/stock/StockTask.java
@@ -52,48 +52,51 @@
 
     private static final Logger log = LoggerFactory.getLogger(StockTask.class);
 
+    private final AtomicBoolean syncMASStockData = new AtomicBoolean(false);
 
+    private final Lock syncMASStockDataLock = new ReentrantLock();
 
-    private final AtomicBoolean syncINStockData = new AtomicBoolean(false);
+    private final AtomicBoolean syncSGPStockData = new AtomicBoolean(false);
 
-    private final Lock syncINStockDataLock = new ReentrantLock();
+    private final Lock syncSGPStockDataLock = new ReentrantLock();
 
     /**
-     * 同步系统所需要的股票
+     * 同步马来西亚系统所需要的股票
      */
-    @Scheduled(cron = "0/5 * * * * ?")
-    public void syncINStockData() {
-        if (syncINStockData.get()) { // 判断任务是否在处理中
+    @Scheduled(cron = "0 0/1 * * * ?")
+    public void syncMASStockData() {
+        if (syncMASStockData.get()) { // 判断任务是否在处理中
             return;
         }
-        if (syncINStockDataLock.tryLock()) {
+        if (syncMASStockDataLock.tryLock()) {
             try {
-                syncINStockData.set(true); // 设置处理中标识为true
-                loadAllStock(EStockType.IN);
+                syncMASStockData.set(true); // 设置处理中标识为true
+                loadAllStock(EStockType.MAS);
             } finally {
-                syncINStockDataLock.unlock();
-                syncINStockData.set(false); // 设置处理中标识为false
+                syncMASStockDataLock.unlock();
+                syncMASStockData.set(false); // 设置处理中标识为false
             }
         }
     }
 
-
     /**
-     * 同步美国股票
+     * 新加坡系统所需要的股票
      */
-//    @Scheduled(cron = "0 0/30 * * * ?")
-    public void loadStockCompanies() {
-        loadAllCompanies();
-    }
-
-    /**
-     * 同步美国股票
-     * */
     @Scheduled(cron = "0/10 * * * * ?")
-    public  void synsUSStockData(){
-        loadAllStock(EStockType.US);
+    public void syncSGPStockData() {
+        if (syncSGPStockData.get()) { // 判断任务是否在处理中
+            return;
+        }
+        if (syncSGPStockDataLock.tryLock()) {
+            try {
+                syncSGPStockData.set(true); // 设置处理中标识为true
+                loadAllStock(EStockType.SGP);
+            } finally {
+                syncSGPStockDataLock.unlock();
+                syncSGPStockData.set(false); // 设置处理中标识为false
+            }
+        }
     }
-
 
     /**
      * 加载公司信息
@@ -177,35 +180,6 @@
         } catch (
                 Exception e) {
             log.error("同步出错", e);
-        }
-    }
-
-    private final AtomicBoolean stockConstraint = new AtomicBoolean(false);
-
-    /**
-     * 强制平仓
-     */
-//    @Scheduled(cron = "0/1 * * * * ?")
-    public void stockConstraint() {
-        if (stockConstraint.get()) { // 判断任务是否在处理中
-            return;
-        }
-        if (stockConstraintLock.tryLock()) {
-            try {
-                stockConstraint.set(true); // 设置处理中标识为true
-                List<UserPosition> userPositions = userPositionMapper.selectList(new LambdaQueryWrapper<UserPosition>().isNull(UserPosition::getSellOrderId));
-                if (CollectionUtils.isNotEmpty(userPositions)) {
-                    userPositionService.stockConstraint(userPositions);
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-                log.error("强制平仓任务错误:" + e.getMessage());
-            } finally {
-                stockConstraintLock.unlock();
-                stockConstraint.set(false); // 设置处理中标识为false
-            }
-        } else {
-            log.info("强制平仓任务--------->上次任务还未执行完成,本次任务忽略");
         }
     }
 }

--
Gitblit v1.9.3