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

liquidnet-bus-do/liquidnet-service-dragon-do/src/main/java/com/liquidnet/service/dragon/entity/DragonOrders.java

@@ -19,10 +19,9 @@ import java.time.LocalDateTime;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class DragonOrders implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class DragonOrders implements Serializable, Cloneable {
 
+    private static final long serialVersionUID = -4897000205961106873L;
     @TableId(value = "mid", type = IdType.AUTO)
     private Long mid;
 
@@ -116,5 +115,15 @@ public class DragonOrders implements Serializable {
      */
     private LocalDateTime deletedAt;
 
+    private static final DragonOrders obj = new DragonOrders();
+
+    public static DragonOrders getNew() {
+        try {
+            return (DragonOrders) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new DragonOrders();
+        }
+    }
+
 
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/biz/DragonServiceCommonBiz.java

@@ -38,7 +38,7 @@ public class DragonServiceCommonBiz {
 
     public DragonOrders buildPayOrders(DragonPayBaseReqDto dragonPayBaseReqDto, DragonPayBaseRespDto respDto){
         //构造订单
-        DragonOrders orders = new DragonOrders();
+        DragonOrders orders = DragonOrders.getNew();
 //        orders.setMid();
         orders.setOrderId(IDGenerator.nextTimeId());
         orders.setStatus(Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_UNPAID.getCode()));

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/MqHandleUtil.java

@@ -32,7 +32,7 @@ public class MqHandleUtil {
      */
     public boolean sendNotifyErrorQueue(PayNotifyReqBo payNotifyReqBo,String queueKey) {
         try {
-            HashMap<String, String> map = new HashMap<>();
+            HashMap<String, String> map = ObjectUtil.hashMapStringAndString;
             map.put("message", payNotifyReqBo.toString());
             MapRecord<String, String, String> record = StreamRecords.mapBacked(map).withStreamKey(queueKey);
             stringRedisTemplate.opsForStream().add(record);
@@ -52,13 +52,13 @@ public class MqHandleUtil {
      */
     public boolean sendMySqlRedis(String sql, Object[] data , String redisKey) {
         try {
-            LinkedList<String> sqls = new LinkedList<>();
+            LinkedList<String> sqls = ObjectUtil.cloneLinkedListStr();
             sqls.add(sql);
-            LinkedList<Object[]> sqlsData = new LinkedList();
+            LinkedList<Object[]> sqlsData = ObjectUtil.cloneLinkedListObj();
             sqlsData.add(data);
             String sqlData = SqlMapping.gets(sqls, sqlsData);
 
-            HashMap<String, String> map = new HashMap<>();
+            HashMap<String, String> map = ObjectUtil.cloneHashMapStringAndString();
             map.put("message", sqlData);
             MapRecord<String, String, String> record = StreamRecords.mapBacked(map).withStreamKey(redisKey);
             stringRedisTemplate.opsForStream().add(record);

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/ObjectUtil.java

+package com.liquidnet.service.dragon.utils;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: ObjectUtil
+ * @Package com.liquidnet.service.dragon.utils
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/21 16:00
+ */
+@Component
+public class ObjectUtil {
+    public static final LinkedList<Object[]> linkedListObj = new LinkedList<Object[]>();
+    public static final LinkedList<String> linkedListStr = new LinkedList<String>();
+    public static final HashMap<String, String> hashMapStringAndString = new HashMap<String, String>();
+
+    public static LinkedList<Object[]> cloneLinkedListObj() {
+        linkedListObj.clear();
+        return linkedListObj;
+    }
+
+    public static LinkedList<String> cloneLinkedListStr() {
+        linkedListStr.clear();
+        return linkedListStr;
+    }
+
+    public static HashMap<String, String> cloneHashMapStringAndString() {
+        hashMapStringAndString.clear();
+        return hashMapStringAndString;
+    }
+}

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

@@ -53,14 +53,16 @@ public class DataUtils {
     }
 
     public List<KylinOrderListVo> getOrderList(String userId) {
-        if (redisUtil.hasKey(KylinRedisConst.ORDER_LIST + userId)) {
+        Object obj = redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
+        if (obj!=null) {
+            return (List<KylinOrderListVo>)obj;
         } else {
             List<KylinOrderListVo> voList = mongoTemplate.find(Query.query(Criteria.where("userId").is(userId))
                             .with(Sort.by(Sort.Direction.DESC, "createdAt")).limit(40),
                     KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
             redisUtil.set(KylinRedisConst.ORDER_LIST + userId, voList);
+            return voList;
         }
-        return (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
     }
 
     /**
@@ -70,14 +72,16 @@ public class DataUtils {
      * @return
      */
     public KylinOrderTicketVo getOrderTicketVo(String orderId) {
-        if (redisUtil.hasKey(KylinRedisConst.ORDER + orderId)) {
+        Object obj = redisUtil.get(KylinRedisConst.ORDER + orderId);
+        if (obj!=null) {
+            return (KylinOrderTicketVo) obj;
         } else {
             KylinOrderTicketVo ticketData = mongoTemplate.findOne(Query.query(Criteria.where("orderTicketsId").is(orderId)), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
             List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderId)), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
             ticketData.setEntitiesVoList(kylinOrderTicketEntitiesVoList);
             redisUtil.set(KylinRedisConst.ORDER + orderId, ticketData);
+            return ticketData;
         }
-        return (KylinOrderTicketVo) redisUtil.get(KylinRedisConst.ORDER + orderId);
     }
 
     /**
@@ -190,12 +194,14 @@ public class DataUtils {
      * @return
      */
     public KylinPerformanceVo getPerformanceVo(String performanceId) {
-        if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES + performanceId)) {
+        Object obj = redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
+        if (obj!=null) {
+            return (KylinPerformanceVo)obj;
         } else {
             KylinPerformanceVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
             redisUtil.set(KylinRedisConst.PERFORMANCES + performanceId, performanceData);
+            return performanceData;
         }
-        return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
     }
 
     public void delOrderRefundVoByOrderId(String orderId) {