From 1040b69682b06d78284b39a277be63cd67edf961 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 14 Aug 2024 07:59:32 +0800
Subject: [PATCH] 1
---
websocketSerivce/src/main/java/org/example/pojo/ConfigCurrency.java | 6 +++
websocketSerivce/src/main/java/org/example/controller/UserController.java | 8 +++
websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java | 47 +++++++++--------------
websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java | 3 +
4 files changed, 33 insertions(+), 31 deletions(-)
diff --git a/websocketSerivce/src/main/java/org/example/controller/UserController.java b/websocketSerivce/src/main/java/org/example/controller/UserController.java
index 0be2408..90f156e 100644
--- a/websocketSerivce/src/main/java/org/example/controller/UserController.java
+++ b/websocketSerivce/src/main/java/org/example/controller/UserController.java
@@ -26,6 +26,8 @@
import java.security.SecureRandom;
import java.sql.Date;
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -125,6 +127,10 @@
currency.setCurrency(f.getCurrency());
currency.setBuy(f.getBuy());
currency.setSell(f.getSell());
+ LocalDateTime now = LocalDateTime.now();
+ 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>().eq(ConfigCurrency::getUserId, user.getId()));
@@ -157,7 +163,7 @@
User user = JwtUtil.verify(token);
Page<ConfigCurrency> page = new Page<>(pageNum, pageSize);
Page<ConfigCurrency> configCurrencyPage = currencyMapper.selectPage(page, new LambdaQueryWrapper<ConfigCurrency>()
- .eq(StringUtils.isNotEmpty(currency), ConfigCurrency::getCurrency, currency).eq(ConfigCurrency::getUserId,user.getId()));
+ .eq(StringUtils.isNotEmpty(currency), ConfigCurrency::getCurrency, currency).eq(ConfigCurrency::getUserId,user.getId()).orderByDesc(ConfigCurrency::getAddTime));
return ServerResponse.createBySuccess(configCurrencyPage);
}
diff --git a/websocketSerivce/src/main/java/org/example/pojo/ConfigCurrency.java b/websocketSerivce/src/main/java/org/example/pojo/ConfigCurrency.java
index e206047..18424c9 100644
--- a/websocketSerivce/src/main/java/org/example/pojo/ConfigCurrency.java
+++ b/websocketSerivce/src/main/java/org/example/pojo/ConfigCurrency.java
@@ -1,10 +1,14 @@
package org.example.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.example.pojo.vo.SaveConfigVo;
+import java.util.Date;
import java.util.List;
/**
@@ -28,4 +32,6 @@
//卖出平台
private String sell;
+
+ private String addTime;
}
diff --git a/websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java b/websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java
index aa4a917..9eed3a1 100644
--- a/websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java
+++ b/websocketSerivce/src/main/java/org/example/pojo/bo/WsBo.java
@@ -42,7 +42,8 @@
private String uuid;
- private Boolean systemFiltration = false;
+ //立即推送 false:延迟 true:立即推送
+ private Boolean pushNow = false;
//当前页
private Integer current = 1;
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 a4494e3..89459d6 100644
--- a/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
+++ b/websocketSerivce/src/main/java/org/example/websocket/server/WsServer.java
@@ -1,10 +1,10 @@
package org.example.websocket.server;
-import cn.hutool.core.util.NumberUtil;
import cn.hutool.json.JSONUtil;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -20,26 +20,17 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import javax.annotation.PostConstruct;
import javax.websocket.*;
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.math.BigDecimal;
-import java.nio.ByteBuffer;
-import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
-import java.util.zip.Deflater;
-import java.util.zip.DeflaterOutputStream;
/**
* @ClassDescription: websocket服务端
@@ -127,14 +118,16 @@
if(!message.equals("ping")){
WsBo bean = JSONUtil.toBean(message, WsBo.class);
if(null == bean){
- closeSession(session,"没有订阅消息");
+ log.error("没有订阅消息");
+ closeSession(session,null);
}
String s = RedisUtil.get(bean.getUserId().toString());
if(StringUtils.isEmpty(s)){
+ log.error("未登录");
Map<String,Integer> map = new HashMap<>();
map.put("status",1);
pushMessage(session,JSONUtil.toJsonStr(map));
- closeSession(session,"没有订阅消息");
+ closeSession(session,null);
}
threadLocalData.put(session.getId(), bean);
}
@@ -206,17 +199,19 @@
long lastMessageTime = lastMessageTimeMap.getOrDefault(session, 0L);
int time = wsBo.getTime();
- message = megFiltration(wsBo,message);
- if (currentTime - lastMessageTime >= time * 1000) {
- // 时间间隔达到要求，可以发送消息
+ if(wsBo.getPushNow()){
+ message = megFiltration(wsBo,message);
pushMessage(session, message);
lastMessageTimeMap.put(session, currentTime); // 更新最后发送时间
- } else {
- // 时间间隔未达到，不发送消息，可以记录日志或者其他操作
-// log.info("距离上次发送消息时间未达到指定间隔，不发送消息。");
+ wsBo.setPushNow(false);
+ }else{
+ message = megFiltration(wsBo,message);
+ if (currentTime - lastMessageTime >= time * 1000) {
+ // 时间间隔达到要求，可以发送消息
+ pushMessage(session, message);
+ lastMessageTimeMap.put(session, currentTime); // 更新最后发送时间
+ }
}
- }else{
- pushMessage(session,"没有订阅消息");
}
}
private static final Gson gson = new Gson();
@@ -245,15 +240,9 @@
.collect(Collectors.toList());
}
//价差
- if(wsBo.getSystemFiltration()){
- redisValueMap = redisValueMap.stream()
- .filter(data -> Double.parseDouble(data.getSpread()) <= wsBo.getSpread())
- .collect(Collectors.toList());
- }else{
- redisValueMap = redisValueMap.stream()
- .filter(data -> Double.parseDouble(data.getSpread()) >= wsBo.getSpread() && Double.parseDouble(data.getSpread()) >= 1000)
- .collect(Collectors.toList());
- }
+ redisValueMap = redisValueMap.stream()
+ .filter(data -> Double.parseDouble(data.getSpread()) >= wsBo.getSpread() && Double.parseDouble(data.getSpread()) <= 1000)
+ .collect(Collectors.toList());
//最低金额
if(null != wsBo.getMinAmount()){
--
Gitblit v1.9.3