From be8c9767089b5e52ed462ea1d083d846e7420a45 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 15 Jun 2026 11:01:37 +0800
Subject: [PATCH] 1

---
 trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java |   69 ++++++++++++++++++++++++----------
 1 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java b/trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java
index 6c295ab..77d6bd0 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java
@@ -1,15 +1,15 @@
 package com.yami.trading.admin.task;
 
-
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yami.trading.bean.ico.domain.Ico;
 import com.yami.trading.bean.item.domain.Item;
+import com.yami.trading.common.util.ApplicationContextUtils;
+import com.yami.trading.huobi.data.internal.KlineInitService;
 import com.yami.trading.service.ico.IcoService;
 import com.yami.trading.service.item.ItemService;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -18,40 +18,67 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-
+/**
+ * ICO 定时任务:到期 ICO 转入交易品种,并触发行情初始化。
+ */
 @Component
 @Slf4j
 public class IcoTask {
 
     @Autowired
-    IcoService icoService;
+    private IcoService icoService;
 
     @Autowired
-    ItemService itemService;
+    private ItemService itemService;
+
+    @Autowired
+    private InitHandle initHandle;
+
+    @Autowired
+    private KlineInitService klineInitService;
 
     /**
-     * ico转入产品
+     * ICO 上市时间到期后,写入品种表并刷新行情缓存。
      */
-    @Scheduled(cron = "0 */5 * * * ?")
+    @Scheduled(cron = "0 */1 * * * ?")
     public void icoToItem() {
-        QueryWrapper<Ico> query  = new QueryWrapper<>();
+        QueryWrapper<Ico> query = new QueryWrapper<>();
         query.lt("market_date", DateTime.now());
         List<Ico> icoList = icoService.list(query);
-        if (icoList != null && !icoList.isEmpty()) {
-            List<String> symbolList = icoList.stream().map(Ico::getSymbol).collect(Collectors.toList());
-
-            QueryWrapper<Item> iQuery  = new QueryWrapper<>();
-            iQuery.in("SYMBOL", symbolList);
-            iQuery.eq("currency_type", 1);
-
-            List<Item> itemList = itemService.list(iQuery);
-            List<Item> addItemList = new ArrayList<>();
-            for (Ico ico : icoList) {
-                Item item = itemList.stream().filter(x -> x.getSymbol().equals(ico.getSymbol())).findFirst().orElse(new Item());
-                item =icoService.icoToItem(item, ico);
+        if (icoList == null || icoList.isEmpty()) {
+            return;
+        }
+        List<Item> addItemList = new ArrayList<>();
+        for (Ico ico : icoList) {
+            QueryWrapper<Item> iQuery = new QueryWrapper<>();
+            iQuery.eq("SYMBOL", ico.getSymbol());
+            iQuery.eq("SYMBOL_DATA", ico.getSymbolData());
+            Item item = itemService.getOne(iQuery);
+            if (item == null) {
+                item = new Item();
+                item = icoService.icoToItem(item, ico);
                 addItemList.add(item);
             }
+        }
+        if (!addItemList.isEmpty()) {
+            log.info("ico转入产品 数据 Start>> count={}", addItemList.size());
             itemService.saveOrUpdateBatch(addItemList);
+            initHandle.init();
+            log.info("成功ico转入产品 数据 End count={}", addItemList.size());
+        }
+    }
+
+    /**
+     * K线数据修正(默认关闭定时,需要时取消注释 cron)
+     */
+    // @Scheduled(cron = "0 */5 * * * ?")
+    public void klineInit() {
+        List<Item> items = ApplicationContextUtils.getApplicationContext()
+                .getBean(ItemService.class)
+                .list();
+        if (CollectionUtil.isNotEmpty(items)) {
+            String symbols = items.stream().map(Item::getSymbol).collect(Collectors.joining(","));
+            klineInitService.klineInit(symbols);
         }
     }
 }

--
Gitblit v1.9.3