From 48a8b0d3502e01cb00d5a913b7be4a0ed2e12fc0 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 10 Sep 2025 18:26:55 +0800
Subject: [PATCH] 新币数据调整
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/DepthController.java | 3 +
trading-order-admin/src/main/java/com/yami/trading/admin/controller/etf/KlineConfigController.java | 12 ++++++
trading-order-service/src/main/java/com/yami/trading/service/item/ItemService.java | 4 +-
trading-order-service/src/main/resources/mapper/item/ItemMapper.xml | 7 ++-
trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java | 14 ++----
trading-order-admin/src/main/java/com/yami/trading/api/websocket/WebSocketServer.java | 20 +++++++++-
trading-order-bean/src/main/java/com/yami/trading/bean/item/dto/ItemDTO.java | 10 +++++
7 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/etf/KlineConfigController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/etf/KlineConfigController.java
index 9da7748..86307fa 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/etf/KlineConfigController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/etf/KlineConfigController.java
@@ -91,8 +91,20 @@
@ApiOperation(value = "添加交易对")
@PostMapping("addItem")
public Result<String> addItem(@Valid @RequestBody Item item) throws Exception {
+ if (item.getUuid() != null) {
+ Item model = itemService.getById(item.getUuid());
+ if (model == null) {
+ return Result.failed("数据不存在");
+ }
+ //币类型不允许修改
+ if (model.getCurrencyType() != null) {
+ item.setCurrencyType(model.getCurrencyType());
+ }
+ }
//新增或编辑表单保存
itemService.saveOrUpdate(item);
+ //修改后重新缓存
+ itemService.reloadListAndCache();
return Result.ok("添加交易对成功");
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java b/trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java
index cb5ee12..5810a22 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/task/IcoTask.java
@@ -42,17 +42,13 @@
if (icoList == null || icoList.isEmpty()) {
return;
}
- List<String> symbolList = icoList.stream().map(Ico::getSymbol).collect(Collectors.toList());
-
- QueryWrapper<Item> iQuery = new QueryWrapper<>();
- iQuery.in("SYMBOL", symbolList);
- iQuery.eq("currency_type", 1);
- List<Item> itemList = itemService.list(iQuery);
-
List<Item> addItemList = new ArrayList<>();
for (Ico ico : icoList) {
- //如何不存在添加
- Item item = itemList.stream().filter(x -> x.getSymbol().equals(ico.getSymbol())).findFirst().orElse(null);
+ //是否已存在币
+ QueryWrapper<Item> iQuery = new QueryWrapper<>();
+ iQuery.eq("SYMBOL", ico.getSymbol());
+ iQuery.eq("SYMBOL_DATA", ico.getSymbolData());
+ Item item = itemService.getOne(iQuery);
if (item == null) {
item = new Item();
item =icoService.icoToItem(item, ico);
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/DepthController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/DepthController.java
index 13b409f..d01805e 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/DepthController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/DepthController.java
@@ -50,6 +50,9 @@
resultObject.setMsg("[symbol]参数为空");
return resultObject;
}
+ if (itemService.isSuspended(symbol)) {
+ return resultObject;
+ }
// 数据处理
Depth data = this.dataService.depth(symbol);
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/websocket/WebSocketServer.java b/trading-order-admin/src/main/java/com/yami/trading/api/websocket/WebSocketServer.java
index fb37c44..70f773a 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/websocket/WebSocketServer.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/websocket/WebSocketServer.java
@@ -1,5 +1,9 @@
package com.yami.trading.api.websocket;
+import cn.hutool.core.collection.CollectionUtil;
+import com.yami.trading.bean.item.domain.Item;
+import com.yami.trading.common.util.ApplicationContextUtils;
+import com.yami.trading.service.item.ItemService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -8,6 +12,7 @@
import javax.websocket.server.ServerEndpoint;
import java.io.IOException;
import java.util.Calendar;
+import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -35,14 +40,25 @@
public static ConcurrentHashMap<String, WebSocketSession> tradeMap = new ConcurrentHashMap<String, WebSocketSession>();
public static ConcurrentHashMap<String, WebSocketSession> depthMap = new ConcurrentHashMap<String, WebSocketSession>();
-
-
/**
* 连接建立成功调用的方法
*/
@OnOpen
public void onOpen(@PathParam(value = "type") String type,
@PathParam(value = "param") String param, Session session) {
+ //停牌断开连接
+ if (WebSocketEnum.SOCKET_ENUM_DEPTH.getCode().equals(type)) {
+ List<Item> items = ApplicationContextUtils.getApplicationContext().getBean(ItemService.class).list();
+ if (CollectionUtil.isNotEmpty(items)) {
+ Item item = items.stream().filter(i -> param.equalsIgnoreCase(i.getSymbol())).findFirst().orElse(null);
+ if (item != null) {
+ if (item.getStatus() != null && item.getStatus() == 0) {
+ return;
+ }
+ }
+ }
+
+ }
WebSocketSession webSocketSession = new WebSocketSession(session, getTimeInMillis(), type, param);
// 加入set中
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/item/dto/ItemDTO.java b/trading-order-bean/src/main/java/com/yami/trading/bean/item/dto/ItemDTO.java
index 3dc4c61..094949d 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/item/dto/ItemDTO.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/item/dto/ItemDTO.java
@@ -166,4 +166,14 @@
}
+
+ @ApiModelProperty("币类型 0.主流币 1.新币")
+ private Integer currencyType;
+
+ @ApiModelProperty("状态(新币) 0.停牌 1.复牌")
+ private Integer status;
+
+ @ApiModelProperty("是否开放合约交易 0.否 1.是")
+ private String tradeType;
+
}
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/item/ItemService.java b/trading-order-service/src/main/java/com/yami/trading/service/item/ItemService.java
index 61044e2..c65f18f 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/item/ItemService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/item/ItemService.java
@@ -269,8 +269,8 @@
public boolean isSuspended(String symbol) {
Item item = findBySymbol(symbol);
//虚拟币新币才判断
- if (item.getType().equals(Item.cryptos) && (item.getCurrencyType() != null && item.getCurrencyType() == 1)) {
- item = getById(item.getUuid());
+ if (item.getType().equals(Item.cryptos) /*&& (item.getCurrencyType() != null && item.getCurrencyType() == 1)*/) {
+ //item = getById(item.getUuid());
if (item.getStatus() != null && item.getStatus() == 0) {
return true;
}
diff --git a/trading-order-service/src/main/resources/mapper/item/ItemMapper.xml b/trading-order-service/src/main/resources/mapper/item/ItemMapper.xml
index 404995d..3c32962 100644
--- a/trading-order-service/src/main/resources/mapper/item/ItemMapper.xml
+++ b/trading-order-service/src/main/resources/mapper/item/ItemMapper.xml
@@ -28,8 +28,11 @@
a.category AS "category",
a.sorted AS "sorted",
a.quote_currency AS "quoteCurrency",
- a.show_status AS "showStatus",
- a.trade_status AS "tradeStatus"
+ a.show_status AS "showStatus",
+ a.trade_status AS "tradeStatus",
+ a.currency_type AS "currencyType",
+ a.status AS "status",
+ a.trade_type AS "tradeType"
</sql>
--
Gitblit v1.9.3