Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-common/liquidnet-common-mq/src/main/java/com/liquidnet/common/mq/constant/MQConst.java

@@ -3,12 +3,12 @@ package com.liquidnet.common.mq.constant;
 public class MQConst {
     public static final String EXCHANGES_LIQUIDNET_SQL = "liquidnet.sql";
 
-
     public static final String ROUTING_KEY_SQL = "sql";
-
-
     public static final String QUEUES_SQL_MAIN = "queue.sql.main";
 
+    public static final String ROUTING_KEY_SQL_KYLIN_STATION = "sql.kylin.station";
+    public static final String QUEUES_SQL_KYLIN_STATION = "queue.sql.kylin.station";
+
     //缺票登记
     public static final String EXCHANGES_LIQUIDNET_SQL_PERFORMANCE_LACK = "liquidnet.sql.performance.lack";
     public static final String ROUTING_KEY_SQL_PERFORMANCE_LACK = "performance.lack";

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -3,7 +3,7 @@ liquidnet:
     updating:
       switch: false
   info:
-    port: 80
+    port: 9001
     context:
     name: liquidnet-service-adam
   logfile:

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml

@@ -3,7 +3,7 @@ liquidnet:
     updating:
       switch: false
   info:
-    port: 80
+    port: 9002
     context:
     name: liquidnet-service-kylin
   logfile:

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/processor/ConsumerProcessor.java

@@ -6,6 +6,9 @@ import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.consumer.service.IBaseDao;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.annotation.Exchange;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.QueueBinding;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Component;
 import org.springframework.amqp.core.Message;
@@ -25,17 +28,12 @@ public class ConsumerProcessor {
     @Resource
     IBaseDao baseDao;
 
-//    @RabbitListener(bindings = @QueueBinding(
-//            exchange = @Exchange("queue.sql"),
-//            key = "rk",
-//            value = @Queue("queue.sql.main")
-//    ))
-//    @RabbitHandler
-//    public void consumerSql(Message message) {
-//        log.info("consumer sql:{}", message);
-//    }
-
-    @RabbitListener(queues = MQConst.QUEUES_SQL_MAIN)
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL),
+            key = MQConst.ROUTING_KEY_SQL,
+            value = @Queue(MQConst.QUEUES_SQL_MAIN)
+    ))
+//    @RabbitListener(queues = MQConst.QUEUES_SQL_MAIN)
     public void consumerSql(Message msg, Channel channel) {
         SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
         log.debug("consumer sql ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
@@ -60,7 +58,12 @@ public class ConsumerProcessor {
     }
 
     // 订单创建
-    @RabbitListener(queues = MQConst.QUEUES_SQL_ORDER_CREATE)
+//    @RabbitListener(queues = MQConst.QUEUES_SQL_ORDER_CREATE)
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE),
+            key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
+    ))
     public void consumerOrderCreate(Message msg, Channel channel) {
         log.info("===   CONSUMER_ORDER_CREATE   ===");
         SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
@@ -86,7 +89,12 @@ public class ConsumerProcessor {
     }
 
     //订单再次支付
-    @RabbitListener(queues = MQConst.QUEUES_SQL_ORDER_AGAIN)
+//    @RabbitListener(queues = MQConst.QUEUES_SQL_ORDER_AGAIN)
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_AGAIN),
+            key = MQConst.ROUTING_KEY_SQL_ORDER_AGAIN,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_AGAIN)
+    ))
     public void consumerOrderPayAgain(Message msg, Channel channel) {
         log.info("===   CONSUMER_ORDER_PAY_AGAIN   ===");
         SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
@@ -112,7 +120,12 @@ public class ConsumerProcessor {
     }
 
     //订单关闭
-    @RabbitListener(queues = MQConst.QUEUES_SQL_ORDER_CLOSE)
+//    @RabbitListener(queues = MQConst.QUEUES_SQL_ORDER_CLOSE)
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE),
+            key = MQConst.ROUTING_KEY_SQL_ORDER_CLOSE,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_CLOSE)
+    ))
     public void consumerOrderClose(Message msg, Channel channel) {
         log.info("===   CONSUMER_ORDER_CLOSE   ===");
         SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
@@ -138,7 +151,12 @@ public class ConsumerProcessor {
     }
 
     //订单支付
-    @RabbitListener(queues = MQConst.QUEUES_SQL_ORDER_PAY)
+//    @RabbitListener(queues = MQConst.QUEUES_SQL_ORDER_PAY)
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY),
+            key = MQConst.ROUTING_KEY_SQL_ORDER_PAY,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_PAY)
+    ))
     public void consumerOrderPay(Message msg, Channel channel) {
         log.info("===   CONSUMER_ORDER_PAY   ===");
         SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
@@ -164,7 +182,12 @@ public class ConsumerProcessor {
     }
 
     //缺票登记
-    @RabbitListener(queues = MQConst.QUEUES_SQL_PERFORMANCE_LACK)
+//    @RabbitListener(queues = MQConst.QUEUES_SQL_PERFORMANCE_LACK)
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_PERFORMANCE_LACK),
+            key = MQConst.ROUTING_KEY_SQL_PERFORMANCE_LACK,
+            value = @Queue(MQConst.QUEUES_SQL_PERFORMANCE_LACK)
+    ))
     public void consumerPerformanceLack(Message msg, Channel channel) {
         log.info("===   CONSUMER_PERFORMANCE_LACK   ===");
         SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketEntitiesServiceImpl.java

 package com.liquidnet.service.kylin.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.kylin.dto.param.KylinStationCheckOrderParam;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
@@ -83,10 +85,7 @@ public class KylinOrderTicketEntitiesServiceImpl extends ServiceImpl<KylinOrderT
         BulkWriteResult bulkWriteResult = mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).bulkWrite(list);
         log.info("bulkWriteResult:{}", JsonUtils.toJson(bulkWriteResult));
 
-
-
-        // TODO: 2021/6/1 sql to mq
-//        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-//                SqlMapping.get("kylin_order_ticket_entities.updateStatusByStation", paramsList));
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL_KYLIN_STATION,
+                SqlMapping.get("kylin_order_ticket_entities.updateStatusByStation", paramsList));
     }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -326,6 +326,10 @@ public class DataUtils {
             try {
                 //删除redis
                 redisUtil.del(KylinRedisConst.PERFORMANCES + performanceIds);
+                // 大龙相关 演出列表
+                redisUtil.del(KylinRedisConst.PERFORMANCES_LIST_CITYNAME  + vo.getCityName());
+                redisUtil.del(KylinRedisConst.PERFORMANCES_LIST_RECOMMEND);
+                redisUtil.del(KylinRedisConst.PERFORMANCES_ROADLIST + vo.getRoadShowId());
             } catch (Exception e) {
                 e.printStackTrace();
             }