From 2462671fc9f457a50eb584d852e6273aec2a5a37 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 18 Dec 2025 14:51:41 +0800
Subject: [PATCH] 1
---
trading-order-bean/src/main/java/com/yami/trading/bean/data/domain/Realtime.java | 4 ++++
trading-order-admin/src/main/java/com/yami/trading/api/controller/RealtimeController.java | 26 ++++----------------------
trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java | 2 +-
trading-order-common/src/main/java/com/yami/trading/common/manager/sms/BUKASmsUtils.java | 2 +-
4 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/RealtimeController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/RealtimeController.java
index 9309b23..c2a70a8 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/RealtimeController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/RealtimeController.java
@@ -31,6 +31,7 @@
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.Map;
@@ -89,30 +90,11 @@
d.setOpen(open);
}
d.setChangeRatio(dataDBService.getChangeRatio(d, d.getSymbol()));
+ d.setSort(Integer.parseInt(bySymbol.getSorted()));
});
- List<Realtime> result = new ArrayList<>();
- if (!data.isEmpty()) {
- Realtime realtime = data.stream().filter(x -> x.getSymbol().equalsIgnoreCase("btcusdt")).findFirst().orElse(null);
- if (realtime != null) {
- result.add(realtime);
- data.remove(realtime);
- }
- Realtime realtime2 = data.stream().filter(x -> x.getSymbol().equalsIgnoreCase("ethusdt")).findFirst().orElse(null);
- if (realtime2 != null) {
- result.add(realtime2);
- data.remove(realtime2);
- }
- Realtime realtime3 = data.stream().filter(x -> x.getSymbol().equalsIgnoreCase("xrpusdt")).findFirst().orElse(null);
- if (realtime3 != null) {
- result.add(realtime3);
- data.remove(realtime3);
- }
- if (!data.isEmpty()) {
- result.addAll(data);
- }
- }
- return Result.ok(result);
+ data.sort(Comparator.comparing(Realtime::getSort).reversed());
+ return Result.ok(data);
} catch (Exception e) {
log.error("c", e);
throw new YamiShopBindException("生成实时数据失败");
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/data/domain/Realtime.java b/trading-order-bean/src/main/java/com/yami/trading/bean/data/domain/Realtime.java
index 9b508c1..da20251 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/data/domain/Realtime.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/data/domain/Realtime.java
@@ -152,6 +152,10 @@
*/
private BigDecimal ask;
+ @TableField(exist = false)
+ @JSONField(name = "sort")
+ private int sort;
+
@Override
public Object clone() throws CloneNotSupportedException {
diff --git a/trading-order-common/src/main/java/com/yami/trading/common/manager/sms/BUKASmsUtils.java b/trading-order-common/src/main/java/com/yami/trading/common/manager/sms/BUKASmsUtils.java
index aeddfb0..38fee05 100644
--- a/trading-order-common/src/main/java/com/yami/trading/common/manager/sms/BUKASmsUtils.java
+++ b/trading-order-common/src/main/java/com/yami/trading/common/manager/sms/BUKASmsUtils.java
@@ -18,7 +18,7 @@
private static final String apiKey = "M1OMJVgD";
private static final String apiPwd = "IdYtbSHH";
private static final String appId = "PC0S982D";
- private static final String senderId = "56465123124";
+ private static final String senderId = "56465123126";
public void sendSms(String numbers,String message){
HttpRequest request = HttpRequest.post(baseUrl);
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java
index b32d26e..900274e 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java
@@ -93,7 +93,7 @@
}
// log.info(MessageFormat.format("target:{0},code:{1},ip:{2}", target, code, ip));
- String content = "[MetaEquityEX]";
+ String content = "[FracTionXEX]";
if (target.indexOf("@") == -1) {
send_code_text = this.sysparaService.find("send_code_text").getSvalue();
--
Gitblit v1.9.3