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

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

@@ -2,7 +2,6 @@ package com.liquidnet.service.platform.service.impl.kylin;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.common.cache.redisson.util.RedisLockUtil;
 import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.OrderCloseMapping;
@@ -15,16 +14,11 @@ import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketRelationsMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketStatusMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
-import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
 import com.liquidnet.service.platform.utils.DataUtils;
-import com.liquidnet.service.platform.utils.MongoVoUtils;
-import com.liquidnet.service.platform.utils.OrderUtils;
+import com.liquidnet.service.platform.utils.QueueUtils;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.env.Environment;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -54,7 +48,7 @@ public class DMCheckOrderTimeImpl extends ServiceImpl<KylinOrderTicketsMapper, K
     @Autowired
     private MongoConverter mongoConverter;
     @Autowired
-    private RabbitTemplate rabbitTemplate;
+    private QueueUtils queueUtils;
     @Autowired
     private KylinOrderTicketsMapper orderTicketsMapper;
     @Autowired
@@ -143,7 +137,7 @@ public class DMCheckOrderTimeImpl extends ServiceImpl<KylinOrderTicketsMapper, K
                     }
                 }
                 log.debug("MQLIST SIZE  = " + mqList.size());
-                rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE, MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, OrderCloseMapping.get(mqList));
+                queueUtils.sendSqlRabbit(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE, MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, OrderCloseMapping.get(mqList));
             }
         }
         return true;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/KylinRefundsStatusServiceImpl.java

@@ -17,7 +17,6 @@ import com.liquidnet.service.platform.utils.MongoVoUtils;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/QueueUtils.java

+package com.liquidnet.service.platform.utils;
+
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.StreamRecords;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+
+@Component
+public class QueueUtils {
+
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+
+    /**
+     * 发送 SqlMapping Json 字符串
+     *
+     * @param exchange 交换机
+     * @param route    路径
+     * @param sqlStr   Json字符串
+     */
+    public void sendSqlRabbit(String exchange, String route, String sqlStr) {
+        rabbitTemplate.convertAndSend(exchange, route, sqlStr);
+    }
+
+    /**
+     * 给 REDIS 队列发送消息 数据库相关
+     *
+     * @param redisKey RedisKey 消费Key
+     * @param sqlStr   Json字符串
+     * @return
+     */
+    public void sendSqlRedis(String redisKey, String sqlStr) {
+        HashMap<String, String> map = new HashMap<>();
+        map.put("message", sqlStr);
+        MapRecord<String, String, String> record = StreamRecords.mapBacked(map).withStreamKey(redisKey);
+        stringRedisTemplate.opsForStream().add(record);
+    }
+}