From 865464c7b3aa65eba7469a256cfd01af64ba581f Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 07 Nov 2025 18:40:02 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java
index c3dce79..c72de32 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java
@@ -133,8 +133,7 @@
// 此处返回的 closeTime 是时间戳类型
data = this.contractOrderService.getPaged(page_no, 10, partyId, symbol, type, startTime, endTime, symbolType);
}
-
- String symbolsStr = "";
+ String symbolsStr = null;
Set<String> symbols = new HashSet<>();
for (int i = 0; i < data.size(); i++) {
Map<String, Object> oneRow = data.get(i);
@@ -172,14 +171,16 @@
}
}
- List<Realtime> realtime_all = this.dataService.realtime(symbolsStr);
- if (realtime_all.size() <= 0) {
- realtime_all = new ArrayList<>();
- }
-
Map<String, Realtime> realtimeMap = new HashMap<String, Realtime>();
- for (int i = 0; i < realtime_all.size(); i++) {
- realtimeMap.put(realtime_all.get(i).getSymbol(), realtime_all.get(i));
+
+ if (symbolsStr != null && !symbolsStr.isEmpty()) {
+ List<Realtime> realtime_all = this.dataService.realtime(symbolsStr);
+ if (realtime_all.size() <= 0) {
+ realtime_all = new ArrayList<>();
+ }
+ for (int i = 0; i < realtime_all.size(); i++) {
+ realtimeMap.put(realtime_all.get(i).getSymbol(), realtime_all.get(i));
+ }
}
for (int i = 0; i < data.size(); i++) {
@@ -192,7 +193,7 @@
} else {
String thisSymbol = realtime.getSymbol();
- Item bySymbol = itemService.findBySymbol(thisSymbol);
+ Item bySymbol = itemService.findCaCheBySymbol(thisSymbol);
if(LangUtils.isEnItem()){
map.put("name", bySymbol.getName());
}
--
Gitblit v1.9.3