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/BitgetStock.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/websocketSerivce/src/main/java/org/example/task/BitgetStock.java b/websocketSerivce/src/main/java/org/example/task/BitgetStock.java
index fba2768..ff479c7 100644
--- a/websocketSerivce/src/main/java/org/example/task/BitgetStock.java
+++ b/websocketSerivce/src/main/java/org/example/task/BitgetStock.java
@@ -1,6 +1,8 @@
package org.example.task;
+import cn.hutool.core.convert.Convert;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -8,6 +10,7 @@
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
@@ -19,6 +22,8 @@
import org.example.pojo.Currency;
import org.example.pojo.bo.CurrencyBitgetBo;
import org.example.server.impl.CurrencySerivceImpl;
+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;
@@ -28,6 +33,7 @@
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.sql.SQLOutput;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -53,7 +59,8 @@
/**
* 同步bitget交易所交易对
*/
- @Scheduled(cron = "0 0/45 * * * ?")
+ @Scheduled(cron = "0 0/30 * * * ?")
+// @Scheduled(cron = "0/10 * * * * ?")
public void syncCurrency() {
// 使用Lock来确保同步
syncCurrencyLock.lock();
@@ -84,13 +91,26 @@
getList.parallelStream().forEach(person -> person.setSymbol(StringUtils.remove(person.getSymbol(), "-")));
- // 获取数据库中已有的symbol列表
- List<Currency> dbList = currencyService.list();
- Set<String> symbolSet = dbList.stream().map(Currency::getSymbol).collect(Collectors.toSet());
+
+ List<Currency> dbList = currencyService.list(new LambdaQueryWrapper<Currency>().eq(Currency::getSource,"bitget"));
+
+ // 删除已经下架的币种
+ Set<String> symbolSet = getList.stream().map(CurrencyBitgetBo::getSymbol).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("bitget"+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 -> !symbolSet.contains(currency.getSymbol()))
+ .filter(currency -> !loclSymbolSet.contains(currency.getSymbol()))
.map(currency -> {
Currency newCurrency = new Currency();
newCurrency.setSymbol(currency.getSymbol());
--
Gitblit v1.9.3