From ac8522fc973eaedee01d867b9886c807fdc5e945 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 30 Aug 2024 18:39:40 +0800
Subject: [PATCH] 1
---
websocketSerivce/src/main/java/org/example/controller/UserController.java | 11 ++++++++++-
websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java | 4 ++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/websocketSerivce/src/main/java/org/example/controller/UserController.java b/websocketSerivce/src/main/java/org/example/controller/UserController.java
index 90f156e..adf77f8 100644
--- a/websocketSerivce/src/main/java/org/example/controller/UserController.java
+++ b/websocketSerivce/src/main/java/org/example/controller/UserController.java
@@ -1,4 +1,5 @@
package org.example.controller;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -131,7 +132,15 @@
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
String formattedDateTime = now.format(formatter);
currency.setAddTime(formattedDateTime);
- currencyMapper.insert(currency);
+ List<ConfigCurrency> configCurrencies = currencyMapper.selectList(new LambdaQueryWrapper<>(ConfigCurrency.class)
+ .eq(ConfigCurrency::getUserId,user.getId())
+ .eq(ConfigCurrency::getCurrency, f.getCurrency())
+ .eq(ConfigCurrency::getBuy, f.getBuy())
+ .eq(ConfigCurrency::getSell, f.getSell())
+ );
+ if(CollectionUtil.isEmpty(configCurrencies)){
+ currencyMapper.insert(currency);
+ }
});
List<ConfigCurrency> configCurrencies = currencyMapper.selectList(new LambdaQueryWrapper<ConfigCurrency>().eq(ConfigCurrency::getUserId, user.getId()));
String key = "config_";
diff --git a/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java b/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
index 1a956df..a6c451f 100644
--- a/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
+++ b/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
@@ -226,8 +226,8 @@
}
if (!CollectionUtils.isEmpty(currencies)) {
Set<String> filtrationSet = currencies.stream()
-// .map(f -> f.getCurrency() + f.getBuy() + f.getSell()) //组合过滤 ，暂时不使用，直接过滤整个币种
- .map(f -> f.getCurrency())
+ .map(f -> f.getCurrency() + f.getBuy() + f.getSell()) //组合过滤 ，暂时不使用，直接过滤整个币种
+// .map(f -> f.getCurrency())
.collect(Collectors.toSet());
redisValueMap.removeIf(data -> filtrationSet.contains(data.getBaseAsset()));
}
--
Gitblit v1.9.3