1
zyy
2 days ago 3446c284c744bd6b1fb082a2a33aa263b2d475fe
1
6 files modified
49 ■■■■■ changed files
trading-order-admin/src/main/java/com/yami/trading/admin/task/StockTask.java 8 ●●●●● patch | view | raw | blame | history
trading-order-bean/src/main/java/com/yami/trading/bean/data/domain/Realtime.java 16 ●●●●● patch | view | raw | blame | history
trading-order-bean/src/main/java/com/yami/trading/bean/model/StockRealTimeBean.java 5 ●●●●● patch | view | raw | blame | history
trading-order-bean/src/main/java/com/yami/trading/bean/model/StockWSBean.java 5 ●●●●● patch | view | raw | blame | history
trading-order-huobi/src/main/java/com/yami/trading/huobi/jsws/WebsocketRunClient.java 13 ●●●● patch | view | raw | blame | history
trading-order-huobi/src/main/java/com/yami/trading/huobi/websocket/constant/enums/EStockType.java 2 ●●● patch | view | raw | blame | history
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);
                }
            });
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;
    /**
     * 涨跌幅
     */
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;  // 昨收
}
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;  // 昨收
}
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);
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;