From f5e6133809c553cfd9fb28ee61019927c547c374 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 08 Dec 2021 15:58:33 +0800
Subject: [PATCH] 20211208  fish

---
 src/main/java/com/xcong/excoin/rabbit/consumer/WebsocketPriceConsumer.java |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/rabbit/consumer/WebsocketPriceConsumer.java b/src/main/java/com/xcong/excoin/rabbit/consumer/WebsocketPriceConsumer.java
index 8368c52..ffbc2be 100644
--- a/src/main/java/com/xcong/excoin/rabbit/consumer/WebsocketPriceConsumer.java
+++ b/src/main/java/com/xcong/excoin/rabbit/consumer/WebsocketPriceConsumer.java
@@ -24,6 +24,7 @@
  */
 @Slf4j
 @Component
+@Deprecated
 @ConditionalOnProperty(prefix = "app", name = "rabbit-consumer", havingValue = "true")
 public class WebsocketPriceConsumer {
 
@@ -43,10 +44,10 @@
     @RabbitListener(queues = RabbitMqConfig.QUEUE_MOREPRO)
     public void onMessageMorePro(Message message, Channel channel) {
         String content = new String(message.getBody());
-        System.out.println("我收到消息了开多止盈：" + content);
+        log.info("==message-price-consumer==我收到消息了开多止盈 : {}", content);
         List<OrderModel> list = JSONArray.parseArray(content, OrderModel.class);
-        // 开始处理  TODO
-        //orderWebsocketService.dealOrderFromMq(list,9);
+        // 开始处理
+        orderWebsocketService.dealOrderFromMq(list, 9);
     }
     // 1：买入委托2：开多3:开空4：平多5：平空6:爆仓平多7:爆仓平空8:撤单9:止盈平多10：止盈平空11：止损平多12：止损平空
 
@@ -59,11 +60,11 @@
     @RabbitListener(queues = RabbitMqConfig.QUEUE_LESSPRO)
     public void onMessageLessPro(Message message, Channel channel) {
         String content = new String(message.getBody());
-        System.out.println("我收到消息了开空止盈：" + content);
+        log.info("==message-price-consumer==我收到消息了开空止盈 : {}", content);
         // 开始处理
         List<OrderModel> list = JSONArray.parseArray(content, OrderModel.class);
         // 开始处理
-        //orderWebsocketService.dealOrderFromMq(list,10);
+        orderWebsocketService.dealOrderFromMq(list, 10);
     }
 
 
@@ -76,11 +77,11 @@
     @RabbitListener(queues = RabbitMqConfig.QUEUE_MORELOSS)
     public void onMessageMoreLoss(Message message, Channel channel) {
         String content = new String(message.getBody());
-        System.out.println("我收到消息了开多止损：" + content);
+        log.info("==message-price-consumer==我收到消息了开多止损 : {}", content);
         // 开始处理
         List<OrderModel> list = JSONArray.parseArray(content, OrderModel.class);
         // 开始处理
-        //orderWebsocketService.dealOrderFromMq(list,11);
+        orderWebsocketService.dealOrderFromMq(list, 11);
     }
 
     /**
@@ -92,11 +93,11 @@
     @RabbitListener(queues = RabbitMqConfig.QUEUE_LESSLOSS)
     public void onMessageLessLoss(Message message, Channel channel) {
         String content = new String(message.getBody());
-        System.out.println("我收到消息了开空止损：" + content);
+        log.info("==message-price-consumer==我收到消息了开空止损 : {}", content);
         // 开始处理
         List<OrderModel> list = JSONArray.parseArray(content, OrderModel.class);
         // 开始处理
-        //orderWebsocketService.dealOrderFromMq(list,12);
+        orderWebsocketService.dealOrderFromMq(list, 12);
     }
 
     /**
@@ -108,11 +109,11 @@
     @RabbitListener(queues = RabbitMqConfig.QUEUE_LIMIT)
     public void onMessageLimit(Message message, Channel channel) {
         String content = new String(message.getBody());
-        System.out.println("我收到消息了限价委托：" + content);
+        log.info("==message-price-consumer==我收到消息了限价委托 : {}", content);
         // 开始处理
         List<OrderModel> list = JSONArray.parseArray(content, OrderModel.class);
         // 开始处理
-        //orderWebsocketService.dealForLimitMq(list);
+        orderWebsocketService.dealForLimitMq(list);
     }
 
     /**
@@ -124,11 +125,11 @@
     @RabbitListener(queues = RabbitMqConfig.QUEUE_COINOUT)
     public void onMessageCoinout(Message message, Channel channel) {
         String content = new String(message.getBody());
-        System.out.println("我收到消息了爆仓：" + content);
+        log.info("==message-price-consumer==我收到消息了爆仓 : {}", content);
         // 开始处理
         List<OrderModel> list = JSONArray.parseArray(content, OrderModel.class);
         // 开始处理
-        //orderWebsocketService.dealOrderFromMq(list,6);
+        orderWebsocketService.dealOrderFromMq(list, 6);
     }
 
     /**
@@ -140,7 +141,7 @@
     @RabbitListener(queues = RabbitMqConfig.QUEUE_CLOSETRADE)
     public void onMessageCloseTrade(Message message, Channel channel) {
         String content = new String(message.getBody());
-        log.info("我收到消息了平仓: {}", content);
+        log.info("==message-price-consumer==我收到消息了平仓: {}", content);
         // 订单
         List<Long> ids = JSONArray.parseArray(content, Long.class);
         orderService.cancelHoldOrder(ids);

--
Gitblit v1.9.1