Merge remote-tracking branch 'origin/pre' into master_pre

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/handler/TextMsgHandler.java

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

@@ -226,7 +226,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
     public HashMap<String, Object> ticketTimesPartner(String performancesId, Integer isAgent) {
         KylinPerformanceVo vo = dataUtils.getPerformanceVo(performancesId);
         vo = checkAppStatusInfo(vo);
-//        queueUtils.pushPvUv(CurrentUtil.getCurrentUid(), KylinTableStatusConst.PvUv.TK_TICKET.getKey(), performancesId, null, null, CurrentUtil.getCliIpAddr());
+        queueUtils.pushPvUv(CurrentUtil.getCurrentUid(), KylinTableStatusConst.PvUv.TK_TICKET.getKey(), performancesId, null, null, CurrentUtil.getCliIpAddr());
         List<KylinTicketTimesVo> ticketTimesList = vo.getTicketTimeList();
         if (null != ticketTimesList) {
 
@@ -396,7 +396,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         KylinTicketVo ticketVo = null;
         KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);
         performancesInfo = checkAppStatusInfo(performancesInfo);
-//        queueUtils.pushPvUv(CurrentUtil.getCurrentUid(), KylinTableStatusConst.PvUv.TK_ORDER.getKey(), performancesId, null, null, CurrentUtil.getCliIpAddr());
+        queueUtils.pushPvUv(CurrentUtil.getCurrentUid(), KylinTableStatusConst.PvUv.TK_ORDER.getKey(), performancesId, null, null, CurrentUtil.getCliIpAddr());
         for (int i = 0; i < performancesInfo.getTicketTimeList().size(); i++) {
             for (int x = 0; x < performancesInfo.getTicketTimeList().get(i).getTicketList().size(); x++) {
                 KylinTicketVo ticketItem = performancesInfo.getTicketTimeList().get(i).getTicketList().get(x);

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

@@ -45,21 +45,21 @@ public class QueueUtils {
         stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
     }
 
-//    public void pushPvUv(String uid, String accessType, String performanceId, String orderId, String orderCode, String ipAddress) {
-//        try {
-//            KylinIpAreaVo vo = dataUtils.getKylinIpAreaVo(ipAddress);
-//            String area = vo.getArea();
-//            String areaProvince = vo.getProvince();
-//            String areaCity = vo.getCity();
-//            String areaCounty = vo.getCounty();
-//            sendMsgByRedis(MQConst.KylinQueue.SQL_PERFORMANCE_LACK.getKey(),
-//                    SqlMapping.get("bi_ticket_access_records.insert", new Object[]{
-//                            uid, accessType, performanceId, orderId, orderCode,
-//                            ipAddress, area, areaProvince, areaCity, areaCounty,
-//                            LocalDateTime.now(),
-//                    }));
-//        } catch (Exception e) {
-//
-//        }
-//    }
+    public void pushPvUv(String uid, String accessType, String performanceId, String orderId, String orderCode, String ipAddress) {
+        try {
+            KylinIpAreaVo vo = dataUtils.getKylinIpAreaVo(ipAddress);
+            String area = vo.getArea();
+            String areaProvince = vo.getProvince();
+            String areaCity = vo.getCity();
+            String areaCounty = vo.getCounty();
+            sendMsgByRedis(MQConst.KylinQueue.SQL_PERFORMANCE_LACK.getKey(),
+                    SqlMapping.get("bi_ticket_access_records.insert", new Object[]{
+                            uid, accessType, performanceId, orderId, orderCode,
+                            ipAddress, area, areaProvince, areaCity, areaCounty,
+                            LocalDateTime.now(),
+                    }));
+        } catch (Exception e) {
+
+        }
+    }
 }

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

@@ -103,7 +103,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         try {
             String orderTicketId = IDGenerator.nextSnowId();
             String orderCode = IDGenerator.ticketOrderCode(orderTicketId);
-//            queueUtils.pushPvUv(uid, KylinTableStatusConst.PvUv.TK_PAY.getKey(), payOrderParam.getPerformanceId(), orderTicketId, orderCode, CurrentUtil.getCliIpAddr());
+            queueUtils.pushPvUv(uid, KylinTableStatusConst.PvUv.TK_PAY.getKey(), payOrderParam.getPerformanceId(), orderTicketId, orderCode, CurrentUtil.getCliIpAddr());
             if (payOrderParam.getVoucherType() != null && payOrderParam.getVoucherType().equals(3)) {
                 isPay = false;
                 if (payOrderParam.getNumber() > 1) {

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

@@ -44,21 +44,21 @@ public class QueueUtils {
         stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
     }
 
-//    public void pushPvUv(String uid, String accessType, String performanceId, String orderId, String orderCode, String ipAddress) {
-//        try {
-//            KylinIpAreaVo vo = dataUtils.getKylinIpAreaVo(ipAddress);
-//            String area = vo.getArea();
-//            String areaProvince = vo.getProvince();
-//            String areaCity = vo.getCity();
-//            String areaCounty = vo.getCounty();
-//            sendMsgByRedis(MQConst.KylinQueue.SQL_PERFORMANCE_LACK.getKey(),
-//                    SqlMapping.get("bi_ticket_access_records.insert", new Object[]{
-//                            uid, accessType, performanceId, orderId, orderCode,
-//                            ipAddress, area, areaProvince, areaCity, areaCounty,
-//                            LocalDateTime.now(),
-//                    }));
-//        } catch (Exception e) {
-//
-//        }
-//    }
+    public void pushPvUv(String uid, String accessType, String performanceId, String orderId, String orderCode, String ipAddress) {
+        try {
+            KylinIpAreaVo vo = dataUtils.getKylinIpAreaVo(ipAddress);
+            String area = vo.getArea();
+            String areaProvince = vo.getProvince();
+            String areaCity = vo.getCity();
+            String areaCounty = vo.getCounty();
+            sendMsgByRedis(MQConst.KylinQueue.SQL_PERFORMANCE_LACK.getKey(),
+                    SqlMapping.get("bi_ticket_access_records.insert", new Object[]{
+                            uid, accessType, performanceId, orderId, orderCode,
+                            ipAddress, area, areaProvince, areaCity, areaCounty,
+                            LocalDateTime.now(),
+                    }));
+        } catch (Exception e) {
+
+        }
+    }
 }