From f07b9f6d18cd85123a01a0c11a76328427b30034 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 11 Oct 2024 23:27:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
websocketSerivce/src/main/java/org/example/task/GateStock.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/websocketSerivce/src/main/java/org/example/task/GateStock.java b/websocketSerivce/src/main/java/org/example/task/GateStock.java
index fc56177..7fc0921 100644
--- a/websocketSerivce/src/main/java/org/example/task/GateStock.java
+++ b/websocketSerivce/src/main/java/org/example/task/GateStock.java
@@ -10,11 +10,13 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.example.pojo.Currency;
+import org.example.pojo.bo.CurrencyBitgetBo;
import org.example.pojo.bo.CurrencyGateBo;
import org.example.pojo.bo.CurrencyMexcBo;
import org.example.server.impl.CurrencySerivceImpl;
import org.example.common.MarketDataClient;
import org.example.util.ConverterUtil;
+import org.example.util.RedisUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -45,7 +47,7 @@
/**
* 同步gate交易所交易对
*/
- @Scheduled(cron = "0 0/40 * * * ?")
+ @Scheduled(cron = "0 0/35 * * * ?")
// @Scheduled(cron = "0/10 * * * * ?")
public void syncCurrency() {
// 使用Lock来确保同步
@@ -74,10 +76,27 @@
getList.parallelStream().forEach(person -> person.setId(StringUtils.remove(person.getId(), "_")));
- currencyService.remove(new LambdaQueryWrapper<Currency>().eq(Currency::getSource,"gate"));
+ List<Currency> dbList = currencyService.list(new LambdaQueryWrapper<Currency>().eq(Currency::getSource, "gate"));
+
+ // 删除已经下架的币种
+ Set<String> symbolSet = getList.stream().map(CurrencyGateBo::getId).collect(Collectors.toSet());
+ List<Currency> removeList = dbList.stream()
+ .filter(currency -> !symbolSet.contains(currency.getSymbol()))
+ .collect(Collectors.toList());
+
+ if(CollectionUtils.isNotEmpty(removeList)){
+ removeList.forEach(f->{
+ RedisUtil.delete("gate"+f.getSymbol());
+ currencyService.remove(new LambdaQueryWrapper<Currency>().eq(Currency::getSymbol,f.getSymbol()));
+ });
+ }
+
+
// 比对接口返回的数据和数据库中已有的数据，找出新增的数据
+ Set<String> loclSymbolSet = dbList.stream().map(Currency::getSymbol).collect(Collectors.toSet());
List<Currency> saveList = getList.stream()
+ .filter(currency -> !loclSymbolSet.contains(currency.getId()))
.map(currency -> {
Currency newCurrency = new Currency();
newCurrency.setSymbol(currency.getId());
@@ -87,6 +106,7 @@
return newCurrency;
})
.collect(Collectors.toList());
+
// 批量保存新增数据到数据库
if(CollectionUtils.isNotEmpty(saveList)){
currencyService.saveBatch(saveList);
--
Gitblit v1.9.3