From c50561d007e420f7397f73afce8966231973ec54 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Mon, 18 Aug 2025 17:35:30 +0800
Subject: [PATCH] 外汇接口调整
---
trading-order-admin/src/main/resources/application-local.yml | 4 ++--
trading-order-admin/src/main/resources/application.yml | 2 +-
trading-order-admin/src/main/resources/application-prod.yml | 2 +-
trading-order-admin/src/main/java/com/yami/trading/api/controller/RealtimeController.java | 17 ++++++++++++++---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiItemController.java | 4 ++--
5 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiItemController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiItemController.java
index a97f03b..35f075c 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiItemController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiItemController.java
@@ -142,8 +142,8 @@
queryWrapper.in(CollectionUtil.isNotEmpty(symbols), "symbol", symbols);
String name = itemQuery.getName();
queryWrapper.and(StringUtils.isNotEmpty(name), itemWrapper->itemWrapper.like("name",name).or().like("symbol", name));
- queryWrapper.eq(StrUtil.isNotBlank(type), "type", type);
- queryWrapper.like(StrUtil.isNotBlank(category), "category", category);
+ queryWrapper.eq(StrUtil.isNotBlank(type), "type", "forex");
+ queryWrapper.like(StrUtil.isNotBlank(category), "category", "forex");
queryWrapper.orderByDesc("sorted");
Page<Item> page = new Page<>(1, 1000);
IPage<Item> result = itemService.page(page, queryWrapper);
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 3fb1759..3d8ffcf 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
@@ -59,9 +59,20 @@
public Result<List<Realtime>> getRealtime(@RequestParam(value = "",required = false) String symbol) {
try {
-// if(StringUtils.isEmptyString(symbol)){
-// return new Result<>();
-// }
+ if(StringUtils.isEmptyString(symbol)){
+ List<Item> items = itemService.findByType("forex");
+ StringBuilder symbolBuilder = new StringBuilder();
+ if (items != null && !items.isEmpty()) {
+ for (Item item : items) {
+ symbolBuilder.append(item.getSymbol()).append(",");
+ }
+ // 移除最后一个逗号
+ if (symbolBuilder.length() > 0) {
+ symbolBuilder.setLength(symbolBuilder.length() - 1);
+ }
+ }
+ symbol = symbolBuilder.toString();
+ }
List<Realtime> data = this.dataService.realtime(symbol);
data.forEach(d->{
Item bySymbol = itemService.findBySymbol(d.getSymbol());
diff --git a/trading-order-admin/src/main/resources/application-local.yml b/trading-order-admin/src/main/resources/application-local.yml
index c0b9b89..68c2db4 100644
--- a/trading-order-admin/src/main/resources/application-local.yml
+++ b/trading-order-admin/src/main/resources/application-local.yml
@@ -2,7 +2,7 @@
port: 8086
spring:
datasource:
- url: jdbc:mysql://127.0.0.1:3306/trading_order?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+ url: jdbc:mysql://127.0.0.1:3306/trading_order_no?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username: root
password: 123456
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -29,7 +29,7 @@
logging:
config: classpath:logback/logback-local.xml
alltick:
- token: 3ba36ca15660073739f25c4b1512086a-c-app
+ token: a3844e6f035d241e10899875024c1f87-c-app
trade-tick: "https://quote.alltick.io/quote-b-api/trade-tick?token=${alltick.token}&query={1}"
trade-kline: "https://quote.alltick.io/quote-b-api/kline?token=${alltick.token}&query={1}"
batch-kline: "https://quote.alltick.io/quote-b-api/batch-kline?token=${alltick.token}"
diff --git a/trading-order-admin/src/main/resources/application-prod.yml b/trading-order-admin/src/main/resources/application-prod.yml
index 72e3b95..a47b96e 100644
--- a/trading-order-admin/src/main/resources/application-prod.yml
+++ b/trading-order-admin/src/main/resources/application-prod.yml
@@ -24,7 +24,7 @@
config: classpath:logback/logback-prod.xml
alltick:
- token: 3ba36ca15660073739f25c4b1512086a-c-app
+ token: a3844e6f035d241e10899875024c1f87-c-app
trade-tick: "https://quote.alltick.io/quote-b-api/trade-tick?token=${alltick.token}&query={1}"
trade-kline: "https://quote.alltick.io/quote-b-api/kline?token=${alltick.token}&query={1}"
batch-kline: "https://quote.alltick.io/quote-b-api/batch-kline?token=${alltick.token}"
diff --git a/trading-order-admin/src/main/resources/application.yml b/trading-order-admin/src/main/resources/application.yml
index 70fb875..9f8ccc3 100644
--- a/trading-order-admin/src/main/resources/application.yml
+++ b/trading-order-admin/src/main/resources/application.yml
@@ -1,7 +1,7 @@
spring:
# 环境 dev|local|test|prod
profiles:
- active: local
+ active: prod
#文件上传设置
servlet:
multipart:
--
Gitblit v1.9.3