From 3446c284c744bd6b1fb082a2a33aa263b2d475fe Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 10 Apr 2026 17:55:12 +0800
Subject: [PATCH] 1
---
trading-order-bean/src/main/java/com/yami/trading/bean/model/StockWSBean.java | 5 +++++
trading-order-huobi/src/main/java/com/yami/trading/huobi/jsws/WebsocketRunClient.java | 13 ++++++++++---
trading-order-bean/src/main/java/com/yami/trading/bean/model/StockRealTimeBean.java | 5 +++++
trading-order-bean/src/main/java/com/yami/trading/bean/data/domain/Realtime.java | 16 ++++++++++++++++
trading-order-huobi/src/main/java/com/yami/trading/huobi/websocket/constant/enums/EStockType.java | 2 +-
trading-order-admin/src/main/java/com/yami/trading/admin/task/StockTask.java | 8 ++++++++
6 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/task/StockTask.java b/trading-order-admin/src/main/java/com/yami/trading/admin/task/StockTask.java
index 493e33e..16a0f15 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/task/StockTask.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/task/StockTask.java
@@ -273,6 +273,14 @@
realtime.setBid(new BigDecimal(o.getBid()).doubleValue());
if (verify(o.getAsk()))
realtime.setAsk(new BigDecimal(o.getAsk()).doubleValue());
+ if (verify(o.getPrevLast()))
+ realtime.setPrevLast(new BigDecimal(o.getPrevLast()).doubleValue());
+ if (verify(o.getPrevChg()))
+ realtime.setPrevChg(new BigDecimal(o.getPrevChg()).doubleValue());
+ if (verify(o.getPrevChgPct()))
+ realtime.setPrevChgPct(new BigDecimal(o.getPrevChgPct()).doubleValue());
+ if (verify(o.getPrevPrevClose()))
+ realtime.setPrevPrevClose(new BigDecimal(o.getPrevPrevClose()).doubleValue());
DataCache.putRealtime(realtime.getSymbol(), realtime);
}
});
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 061d1fa..25221b1 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
@@ -96,6 +96,22 @@
@ApiModelProperty("昨日收盘价")
private double prevClose;
+ @TableField(exist = false)
+ @ApiModelProperty("盘中收盘价格")
+ private double prevLast;
+
+ @TableField(exist = false)
+ @ApiModelProperty("盘中涨幅")
+ private double prevChg;
+
+ @TableField(exist = false)
+ @ApiModelProperty("盘中涨幅率")
+ private double prevChgPct;
+
+ @TableField(exist = false)
+ @ApiModelProperty("昨收")
+ private double prevPrevClose;
+
/**
* 涨跌幅
*/
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/model/StockRealTimeBean.java b/trading-order-bean/src/main/java/com/yami/trading/bean/model/StockRealTimeBean.java
index 5eb0de9..411dae7 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/model/StockRealTimeBean.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/model/StockRealTimeBean.java
@@ -23,4 +23,9 @@
private String Eps; // 每股收益
private String Bid; // 买进价
private String Ask; // 卖出价
+
+ private String PrevLast; // 盘中收盘价格
+ private String PrevChg; // 盘中涨幅
+ private String PrevChgPct; // 盘中涨幅率
+ private String PrevPrevClose; // 昨收
}
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/model/StockWSBean.java b/trading-order-bean/src/main/java/com/yami/trading/bean/model/StockWSBean.java
index b31cdf7..338e4ac 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/model/StockWSBean.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/model/StockWSBean.java
@@ -24,5 +24,10 @@
private String bid; // 买进价
private String ask; // 卖出价
+ private String prevLast; // 盘中收盘价格
+ private String prevChg; // 盘中涨幅
+ private String prevChgPct; // 盘中涨幅率
+ private String prevPrevClose; // 昨收
+
}
diff --git a/trading-order-huobi/src/main/java/com/yami/trading/huobi/jsws/WebsocketRunClient.java b/trading-order-huobi/src/main/java/com/yami/trading/huobi/jsws/WebsocketRunClient.java
index 59bbfbf..7e1a25c 100644
--- a/trading-order-huobi/src/main/java/com/yami/trading/huobi/jsws/WebsocketRunClient.java
+++ b/trading-order-huobi/src/main/java/com/yami/trading/huobi/jsws/WebsocketRunClient.java
@@ -88,7 +88,7 @@
if (item == null || !item.getType().equalsIgnoreCase(Item.US_STOCKS)) {
return;
}
- //System.out.println(s);
+ System.out.println(s);
StockWSBean stockRealTimeBean = new StockWSBean();
stockRealTimeBean.setPid(stringObjectMap.get("Id"));
stockRealTimeBean.setLast(stringObjectMap.get("Last"));
@@ -103,6 +103,10 @@
stockRealTimeBean.setPrevClose(stringObjectMap.get("PrevClose"));
stockRealTimeBean.setSymbol(stringObjectMap.get("Symbol"));
stockRealTimeBean.setVolume(stringObjectMap.get("Volume"));
+ stockRealTimeBean.setPrevLast(stringObjectMap.get("PrevLast"));
+ stockRealTimeBean.setPrevChg(stringObjectMap.get("PrevChg"));
+ stockRealTimeBean.setPrevChgPct(stringObjectMap.get("PrevChgPct"));
+ stockRealTimeBean.setPrevPrevClose(stringObjectMap.get("PrevPrevClose"));
Realtime realtime = new Realtime();
/*realtime.setUuid(stringObjectMap.get("pid"));
realtime.setSymbol(stringObjectMap.get("symbol"));
@@ -129,7 +133,10 @@
realtime.setBid(new BigDecimal(stringObjectMap.get("Bid")).doubleValue());
realtime.setAsk(new BigDecimal(stringObjectMap.get("Ask")).doubleValue());
realtime.setVolume(new BigDecimal(stringObjectMap.get("Volume")).doubleValue());
-
+ realtime.setPrevLast(new BigDecimal(stringObjectMap.get("PrevLast")).doubleValue());
+ realtime.setPrevChg(new BigDecimal(stringObjectMap.get("PrevChg")).doubleValue());
+ realtime.setPrevChgPct(new BigDecimal(stringObjectMap.get("PrevChgPct")).doubleValue());
+ realtime.setPrevPrevClose(new BigDecimal(stringObjectMap.get("PrevPrevClose")).doubleValue());
DataCache.putRealtime(realtime.getSymbol(), realtime);
@@ -138,7 +145,7 @@
sendLoca(json);
} catch (Exception e) {
- log.error("处理WebSocket消息时发生错误: {}", e);
+ //log.error("处理WebSocket消息时发生错误: {}", e);
}
} else {
log.info("WebSocket心跳或认证响应: {}", s);
diff --git a/trading-order-huobi/src/main/java/com/yami/trading/huobi/websocket/constant/enums/EStockType.java b/trading-order-huobi/src/main/java/com/yami/trading/huobi/websocket/constant/enums/EStockType.java
index 28cf128..5a1e0b0 100644
--- a/trading-order-huobi/src/main/java/com/yami/trading/huobi/websocket/constant/enums/EStockType.java
+++ b/trading-order-huobi/src/main/java/com/yami/trading/huobi/websocket/constant/enums/EStockType.java
@@ -3,7 +3,7 @@
public enum EStockType {
- US("US","美国股票","5","http://api-us-v2.js-stock.top/","ws://api-us-v2-ws.js-stock.top","idNOCuJCtIFHjpAF2NKK","USD","$"),
+ US("US","美国股票","5","http://api-us-v2.js-stock.top/","ws://api-us-v2-ws.js-stock.top","WF3wvEx4StZcdsAfisks","USD","$"),
;
private String code;
--
Gitblit v1.9.3