外汇接口调整

peter

2025-07-11 19be3926c88d19645f43dd926d00615225f30802

 trading-order-huobi/src/main/java/com.yami.trading.huobi/hobi/internal/XinLangDataServiceImpl.java

@@ -10,16 +10,20 @@
import com.yami.trading.bean.cms.Infomation;
import com.yami.trading.bean.data.domain.*;
import com.yami.trading.bean.data.respDto.TradeTickResp;
import com.yami.trading.bean.item.domain.Item;
import com.yami.trading.common.util.RedisUtil;
import com.yami.trading.common.util.StringUtils;
import com.yami.trading.common.util.UTCDateUtils;
import com.yami.trading.huobi.data.DataCache;
import com.yami.trading.huobi.data.internal.DepthTimeObject;
import com.yami.trading.huobi.data.internal.KlineConstant;
import com.yami.trading.huobi.data.internal.KlineService;
import com.yami.trading.huobi.data.internal.TradeTimeObject;
import com.yami.trading.huobi.data.model.AlltickBatchKlineResult;
import com.yami.trading.huobi.data.model.AlltickNewPriceResult;
import com.yami.trading.huobi.data.model.AllticktradeResult;
import com.yami.trading.huobi.hobi.HobiDataService;
import com.yami.trading.huobi.hobi.constant.AllticktradeMadeOptions;
import com.yami.trading.huobi.hobi.http.HttpHelper;
import com.yami.trading.huobi.hobi.http.HttpMethodType;
import com.yami.trading.service.cms.InfomationService;
@@ -174,20 +178,47 @@
                    for (Realtime realtime : realtimes){
                        if(tickNewPrice.getCode().equals(realtime.getName())){
                            realtime.setCloseOld(realtime.getClose());
                            realtime.setClose(new BigDecimal(tickNewPrice.getPrice()));
                            realtime.setVolume(new BigDecimal(tickNewPrice.getVolume()));
//                            realtime.setClose(new BigDecimal(tickNewPrice.getPrice()));
//                            realtime.setVolume(new BigDecimal(tickNewPrice.getVolume()));
                        }
//                        Item bySymbol = itemService.findBySymbol(realtime.getSymbol());
//                        if(null != bySymbol.getYesterdayLastPrice() && bySymbol.getYesterdayLastPrice().compareTo(BigDecimal.ZERO) != 0){
//                            BigDecimal changePercent = (realtime.getClose().subtract(bySymbol.getYesterdayLastPrice()))
//                                    .divide(bySymbol.getYesterdayLastPrice(), 5, RoundingMode.HALF_UP) // 精确到4位小数
//                                    .multiply(new BigDecimal("100").setScale(2)).setScale(4,RoundingMode.HALF_UP); // 乘以100得到百分比
//                            realtime.setChangeRatioStr(changePercent);
//                        }
                        }
                    }
                }
            }
            //            Map<String, Object> requestData = createRequest(strings);
//            String resultStr = HttpHelper.sendPostRequest(batchKline,requestData);
//            JSONObject resultJson = JSON.parseObject(resultStr);
//            if(null == resultJson || 200 != resultJson.getInteger("ret")){
//                logger.error("数据，返回:{} ", resultJson);
//            }
//            JSONObject tempdata = resultJson.getJSONObject("data");
//            JSONArray dataArray = tempdata.getJSONArray("kline_list");
//            if (dataArray.size() > 0) {
//                List<AlltickBatchKlineResult> batchKlines = JSONObject.parseArray(JSONObject.toJSONString(dataArray), AlltickBatchKlineResult.class);
//                for (AlltickBatchKlineResult batchKline : batchKlines) {
//                    for (AllticktradeResult result : batchKline.getKline_data()){
//                        for (Realtime realtime : list){
//                            if(realtime.getSymbol().equals(batchKline.getCode())){
//                                int decimal = itemService.getDecimal(realtime.getSymbol());
//                                realtime.setOpen(result.getOpen_price().setScale(decimal, RoundingMode.HALF_UP));
//                                realtime.setHigh(result.getHigh_price().setScale(decimal, RoundingMode.HALF_UP));
//                                realtime.setLow(result.getLow_price().setScale(decimal, RoundingMode.HALF_UP));
//                                realtime.setClose(result.getClose_price().setScale(decimal, RoundingMode.HALF_UP));
////                                realtime.setAmount(tickNewPrice.getPrice().multiply(tickNewPrice.getVolume()).setScale(item.getDecimals(), RoundingMode.HALF_UP));
////                                realtime.setVolume(tickNewPrice.getVolume());
//                            }
//                        }
//                    }
//                }
//            }
        } catch (Exception e){
            logger.error("error", e);
        }
        for (Realtime realtime : realtimes) {
            if(realtime.getName().equals("USDSGD")){
                System.out.println("USDSGD实时价格数据替换前=="+realtime.getCloseOld());
                System.out.println("USDSGD实时价格数据替换后=="+realtime.getClose());
            }
        }
        return realtimes;
    }
@@ -195,38 +226,57 @@
        List<Realtime> list = new ArrayList<Realtime>();
        try {
            List<String> strings = Arrays.asList(symbols.split(","));
            Map<String, Object> requestData = createRequest(strings);
            String resultStr = HttpHelper.sendPostRequest(batchKline,requestData);
            JSONObject resultJson = JSON.parseObject(resultStr);
            if(null == resultJson || 200 != resultJson.getInteger("ret")){
                logger.error("数据，返回:{} ", resultJson);
            Map<String, Object> requestDataTick = createRequestTick(strings);
            String url = tradeTick.replace("{1}", URLEncoder.encode(requestDataTick.toString(), "UTF-8"));
            HttpGet request = new HttpGet(url);
            HttpResponse response = HttpHelper.getHttpclient().execute(request);
            String resultTickStr = HttpHelper.responseProc(response);
            JSONObject resultJsonTick = JSON.parseObject(resultTickStr);
            if(null == resultJsonTick || 200 != resultJsonTick.getInteger("ret")){
                logger.error("数据，返回:{} ", resultJsonTick);
            }
            JSONObject tempdata = resultJson.getJSONObject("data");
            JSONArray dataArray = tempdata.getJSONArray("kline_list");
            if (dataArray.size() > 0) {
                List<AlltickBatchKlineResult> batchKlines = JSONObject.parseArray(JSONObject.toJSONString(dataArray), AlltickBatchKlineResult.class);
                for (AlltickBatchKlineResult batchKline : batchKlines) {
                    for (AllticktradeResult result : batchKline.getKline_data()){
            JSONObject tempdataTick = resultJsonTick.getJSONObject("data");
            JSONArray dataArrayTick = tempdataTick.getJSONArray("tick_list");
            if (dataArrayTick.size() > 0) {
                List<AlltickNewPriceResult> alltickNewPriceResults = JSONObject.parseArray(JSONObject.toJSONString(dataArrayTick), AlltickNewPriceResult.class);
                for (AlltickNewPriceResult tickNewPrice : alltickNewPriceResults) {
                        Realtime realtime = new Realtime();
                        int decimal = itemService.getDecimal(batchKline.getCode());
                        realtime.setSymbol(batchKline.getCode());
                        realtime.setTs(Long.parseLong(result.getTimestamp()));
                        realtime.setName(batchKline.getCode());
                        realtime.setOpen(result.getOpen_price().setScale(decimal, RoundingMode.HALF_UP));
                        realtime.setHigh(result.getHigh_price().setScale(decimal, RoundingMode.HALF_UP));
                        realtime.setLow(result.getLow_price().setScale(decimal, RoundingMode.HALF_UP));
                        realtime.setClose(result.getClose_price().setScale(decimal, RoundingMode.HALF_UP));
                    Item item = itemService.findBySymbol(tickNewPrice.getCode());
                    realtime.setSymbol(tickNewPrice.getCode());
                    realtime.setTs(Long.parseLong(tickNewPrice.getTickTime()));
                    realtime.setName(tickNewPrice.getCode());
                    realtime.setClose(tickNewPrice.getPrice().setScale(item.getDecimals(), RoundingMode.HALF_UP));
//                    //涨跌幅 = (当天收盘价 - 前一日收盘价) / 前一日收盘价 * 100%
//                    if(null != item.getYesterdayLastPrice() && item.getYesterdayLastPrice().compareTo(BigDecimal.ZERO) != 0){
//                        BigDecimal changePercent = (realtime.getClose().subtract(item.getYesterdayLastPrice()))
//                                .divide(item.getYesterdayLastPrice(), 5, RoundingMode.HALF_UP) // 精确到4位小数
//                                .multiply(new BigDecimal("100").setScale(2)).setScale(4,RoundingMode.HALF_UP); // 乘以100得到百分比
//                        realtime.setChangeRatioStr(changePercent);
//                    }
                        realtime.setMarketCapital(0L);
                        realtime.setFloatMarketCapital(0L);
                        realtime.setPeForecast(BigDecimal.ZERO);
                        realtime.setVolumeRatio(BigDecimal.ZERO);
                        realtime.setTurnoverRate(BigDecimal.ZERO);
                        realtime.setAmount(result.getVolume());
                        realtime.setVolume(result.getTurnover());

                    Kline kline = klineService.getLast(tickNewPrice.getCode(),Kline.PERIOD_1DAY);
                    if(null != kline){
                        realtime.setOpen(kline.getOpen().setScale(item.getDecimals(), RoundingMode.HALF_UP));
                        realtime.setHigh(kline.getHigh().setScale(item.getDecimals(), RoundingMode.HALF_UP));
                        realtime.setLow(kline.getLow().setScale(item.getDecimals(), RoundingMode.HALF_UP));
                        realtime.setAmount(kline.getAmount().setScale(item.getDecimals(), RoundingMode.HALF_UP));
                        realtime.setVolume(kline.getVolume().setScale(item.getDecimals(), RoundingMode.HALF_UP));
                    }else {
                        realtime.setOpen(BigDecimal.ZERO);
                        realtime.setHigh(BigDecimal.ZERO);
                        realtime.setLow(BigDecimal.ZERO);
                        realtime.setAmount(BigDecimal.ZERO);
                        realtime.setVolume(BigDecimal.ZERO);
                    }
                        list.add(realtime);
                    }
                }
            }

        } catch (Exception e) {
            logger.error("error", e);
        }