Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

xiaoyong931011

2020-06-03 59baf780dc74b95b65c453a9cb6bd8e1d9f3a2b1

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

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.rabbit.producer.OrderProducer;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -12,6 +13,7 @@
import java.util.Map;
import java.util.concurrent.PriorityBlockingQueue;

@Slf4j
@Component
public class WebsocketPriceService {

@@ -63,6 +65,7 @@
            while (queue.peek() != null && queue.peek().compareTo(now) <= 0) {
                // 可以发送消息操作
                list.add(queue.remove());
                log.info("#{}#", JSONObject.toJSONString(list));
            }
        }
        if(CollectionUtils.isNotEmpty(list)){
@@ -82,13 +85,13 @@
            // 根据价格查询到对应的订单
            for (AscBigDecimal asc : list) {
                String key = asc.getValue().toPlainString();
                assert orderMap != null;
                if(orderMap.containsKey(key)){
                    orderModelList.addAll(orderMap.get(key));
                    orderMap.remove(key);
                }

            }

            if(CollectionUtils.isEmpty(orderModelList)){
                return;
            }
@@ -98,34 +101,29 @@
            // 3:开空  7:爆仓平空
            // 9:止盈平多 12：止损平空
            for (OrderModel model : orderModelList) {
                List<OrderModel> kkzsList = null;
                List<OrderModel> kdzyList = null;
                List<OrderModel> bcList = null;
                List<OrderModel> wtkkList = null;
                // 止损平空
                List<OrderModel> kkzsList = new ArrayList<OrderModel>();
                // 止盈平多
                List<OrderModel> kdzyList = new ArrayList<OrderModel>();
                // 爆仓平空
                List<OrderModel> bcList = new ArrayList<OrderModel>();
                // 开空
                List<OrderModel> wtkkList = new ArrayList<OrderModel>();
                switch (model.getType()) {
                    case 3:
                        if (wtkkList == null) {
                            wtkkList = new ArrayList<OrderModel>();
                        }
                        wtkkList.add(model);
                        break;
                    case 7:
                        if (bcList == null) {
                            bcList = new ArrayList<OrderModel>();
                        }
                        bcList.add(model);
                        break;
                    case 9:
                        if (kdzyList == null) {
                            kdzyList = new ArrayList<OrderModel>();
                        }
                        kdzyList.add(model);
                        break;
                    case 12:
                        if (kkzsList == null) {
                            kkzsList = new ArrayList<OrderModel>();
                        }
                        kkzsList.add(model);
                        break;
                    default:
                        log.info("#price-service unknown type#");
                        break;
                }

@@ -143,7 +141,6 @@
                }
                if(CollectionUtils.isNotEmpty(wtkkList)){
                    orderProducer.sendLimit(JSONObject.toJSONString(wtkkList));

                }
            }
        }
@@ -159,6 +156,7 @@
            // 根据价格查询到对应的订单
            for (DescBigDecimal desc : list) {
                String key = desc.getValue().toPlainString();
                assert orderMap != null;
                if(orderMap.containsKey(key)){
                    orderModelList.addAll(orderMap.get(key));
                    orderMap.remove(key);
@@ -175,35 +173,29 @@
            // 2：开多6:爆仓平多
            // 10：止盈平空11：止损平多
            for (OrderModel model : orderModelList) {
                List<OrderModel> kkzyList = null;
                List<OrderModel> kdzsList = null;
                List<OrderModel> bcList = null;
                List<OrderModel> wtkdList = null;
                // 开空止盈
                List<OrderModel> kkzyList = new ArrayList<OrderModel>();
                // 开多止损
                List<OrderModel> kdzsList = new ArrayList<OrderModel>();
                // 爆仓
                List<OrderModel> bcList = new ArrayList<OrderModel>();
                // 开多委托
                List<OrderModel> wtkdList = new ArrayList<OrderModel>();
                switch (model.getType()) {
                    case 2:
                        if (wtkdList == null) {
                            wtkdList = new ArrayList<OrderModel>();
                        }
                        wtkdList.add(model);
                        break;
                    case 6:
                        if (bcList == null) {
                            bcList = new ArrayList<OrderModel>();
                        }
                        bcList.add(model);
                        break;
                    case 10:
                        if (kkzyList == null) {
                            kkzyList = new ArrayList<OrderModel>();
                        }
                        kkzyList.add(model);
                        break;
                    case 11:
                        if (kdzsList == null) {
                            kdzsList = new ArrayList<OrderModel>();
                        }
                        kdzsList.add(model);
                        break;
                    default:
                        break;
                }

                // 发送消息