modify

Helius

2020-08-27 cee2d4afc2650353cc0c6c378b290579b9c3d55a

 src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java

@@ -37,7 +37,6 @@
            // 可以操作
            System.out.println("当前价格:" + price + "---正序---" + "队列价格:" + b.getValue().toPlainString() + " time:" + new Date());
            while (queue.peek() != null && queue.peek().compareTo(now) <= 0) {
                log.info("------->");
                // 可以发送消息操作
                list.add(queue.remove());
            }
@@ -87,6 +86,7 @@
            for (AscBigDecimal asc : list) {
                String key = asc.getValue().toPlainString();
                assert orderMap != null;
                log.info("----->->{}, --> {}", JSONObject.toJSONString(orderMap), key);
                if (orderMap.containsKey(key)) {
                    orderModelList.addAll(orderMap.get(key));
                    orderMap.remove(key);
@@ -97,8 +97,7 @@
            if (CollectionUtils.isEmpty(orderModelList)) {
                return;
            }
            System.out.println("本次执行的列表ASC");
            System.out.println(JSONObject.toJSONString(orderModelList));
            log.info("本次执行的列表ASC");
            // 根据订单的类型发送消息
            // 3:开空  7:爆仓平空
            // 9:止盈平多 12：止损平空
@@ -111,9 +110,14 @@
                List<OrderModel> bcList = new ArrayList<OrderModel>();
                // 开空
                List<OrderModel> wtkkList = new ArrayList<OrderModel>();
                // 委托平多
                List<OrderModel> wtpdList = new ArrayList<>();
                switch (model.getType()) {
                    case 3:
                        wtkkList.add(model);
                        break;
                    case 4:
                        wtpdList.add(model);
                        break;
                    case 7:
                        bcList.add(model);
@@ -144,6 +148,9 @@
                if (CollectionUtils.isNotEmpty(wtkkList)) {
                    orderProducer.sendLimit(JSONObject.toJSONString(wtkkList));
                }
                if (CollectionUtils.isNotEmpty(wtpdList)) {
                    orderProducer.sendLimitClose(JSONObject.toJSONString(wtpdList));
                }
            }
        }
    }
@@ -159,6 +166,7 @@
            for (DescBigDecimal desc : list) {
                String key = desc.getValue().toPlainString();
                assert orderMap != null;
                log.info("----->->{}, --> {}", JSONObject.toJSONString(orderMap), key);
                if (orderMap.containsKey(key)) {
                    orderModelList.addAll(orderMap.get(key));
                    orderMap.remove(key);
@@ -169,8 +177,7 @@
            if (CollectionUtils.isEmpty(orderModelList)) {
                return;
            }
            System.out.println("本次执行的列表Desc");
            System.out.println(JSONObject.toJSONString(orderModelList));
            log.info("本次执行的列表Desc");
            // 根据订单的类型发送消息
            // 2：开多6:爆仓平多
            // 10：止盈平空11：止损平多
@@ -183,9 +190,14 @@
                List<OrderModel> bcList = new ArrayList<OrderModel>();
                // 开多委托
                List<OrderModel> wtkdList = new ArrayList<OrderModel>();
                // 委托平空
                List<OrderModel> wtpkList = new ArrayList<>();
                switch (model.getType()) {
                    case 2:
                        wtkdList.add(model);
                        break;
                    case 5:
                        wtpkList.add(model);
                        break;
                    case 6:
                        bcList.add(model);
@@ -214,7 +226,9 @@
                }
                if (CollectionUtils.isNotEmpty(wtkdList)) {
                    orderProducer.sendLimit(JSONObject.toJSONString(wtkdList));

                }
                if (CollectionUtils.isNotEmpty(wtpkList)) {
                    orderProducer.sendLimitClose(JSONObject.toJSONString(wtpkList));
                }
            }
        }