From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java | 93 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 74 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java b/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
index 29cb823..82f5b33 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
@@ -12,6 +12,7 @@
import com.google.gson.GsonBuilder;
import com.qcloud.cmq.Message;
import com.yeshi.fanli.dto.HongBao;
+import com.yeshi.fanli.dto.mq.UidDateDTO;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -24,7 +25,7 @@
private static String secretKey = "xhCSUHo55oHUQ6XicFcmfIgspX0EEzWo";
private static CMQManager cmqManager;
private static CMQUtil cmqUtil;
- // TODO 璁㈠崟澶勭悊闃熷垪
+ // 璁㈠崟澶勭悊闃熷垪
public static String QUEUENAME_ORDER = "fanli-orders";
// 鍒氬垰浜х敓鐨勮鍗曞鐞嗛槦鍒�
@@ -32,21 +33,26 @@
// 鎻愮幇缁撴灉澶勭悊闃熷垪
public static String EXTRACT_RESULT = "extract-result";
- // TODO IOS鎺ㄩ�侀槦鍒�
+ // IOS鎺ㄩ�侀槦鍒�
public static String PUSH_IOS = "push-ios";
- // TODO 杩斿埄闃熷垪
+ // 杩斿埄闃熷垪
public static String FANLI_ORDER = "fanli-order";
- // TODO 杩斿埄闃熷垪
+ // 杩斿埄闃熷垪
public static String FANLI_ORDER_NEW = "fanli-order-new";
- // TODO 鎻愭垚璁㈠崟
- public static String FANLI_TICHENG_ORDER = "fanli-ticheng-order";
- // TODO 缁存潈璁㈠崟
+
+
+ // 鍒嗕韩璁㈠崟鏀剁泭
+ public static String FANLI_SHARE_ORDER = "fanli-share-order";
+
+ // 缁存潈璁㈠崟
public static String ORDER_WEIQUAN = "weiquan-order";
public static String GOODS_UPDATE = "goods_update_queue";
+ // 閲嶈鏁版嵁鏇存柊
+ public static String IMPORTANT_GOODS_UPDATE = "imp_goods_update_queue";
static {
@@ -57,8 +63,10 @@
PUSH_IOS = "test-" + PUSH_IOS;
FANLI_ORDER = "test-" + FANLI_ORDER;
FANLI_ORDER_NEW = "test-" + FANLI_ORDER_NEW;
- FANLI_TICHENG_ORDER = "test-" + FANLI_TICHENG_ORDER;
+
ORDER_WEIQUAN = "test-" + ORDER_WEIQUAN;
+ IMPORTANT_GOODS_UPDATE = "test-" + IMPORTANT_GOODS_UPDATE;
+ FANLI_SHARE_ORDER = "test-" + FANLI_SHARE_ORDER;
}
QUEUENAME_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
@@ -67,8 +75,9 @@
PUSH_IOS += "-" + Constant.systemCommonConfig.getProjectName();
FANLI_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
FANLI_ORDER_NEW += "-" + Constant.systemCommonConfig.getProjectName();
- FANLI_TICHENG_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
ORDER_WEIQUAN += "-" + Constant.systemCommonConfig.getProjectName();
+ IMPORTANT_GOODS_UPDATE += "-" + Constant.systemCommonConfig.getProjectName();
+ FANLI_SHARE_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
cmqUtil = CMQUtil.getInstance(secretId, secretKey);
// 鏈�澶ф秷鎭负1M
@@ -78,9 +87,12 @@
cmqUtil.createQueue(PUSH_IOS);
cmqUtil.createQueue(FANLI_ORDER);
cmqUtil.createQueue(FANLI_ORDER_NEW);
- cmqUtil.createQueue(FANLI_TICHENG_ORDER);
+
cmqUtil.createQueue(ORDER_WEIQUAN);
cmqUtil.createQueue(GOODS_UPDATE);
+ cmqUtil.createQueue(IMPORTANT_GOODS_UPDATE);
+
+ cmqUtil.createQueue(FANLI_SHARE_ORDER);
}
public static CMQManager getInstance() {
@@ -258,26 +270,29 @@
cmqUtil.deleteMsg(FANLI_ORDER_NEW, receiptHandle);
}
- // 鎻愭垚杩斿埄
- public void addFanLiTiChengMsg(Long uid) {
- cmqUtil.sendMsg(FANLI_TICHENG_ORDER, uid + "");
+
+
+ // 鍒嗕韩璁㈠崟鏀剁泭
+ public void addFanLiShareMsg(UidDateDTO dto) {
+ cmqUtil.sendMsg(FANLI_SHARE_ORDER, new Gson().toJson(dto));
}
- public Map<String, Long> consumeFanLiTiChengMsg(int count) {
- List<Message> list = cmqUtil.recieveMsg(count, FANLI_TICHENG_ORDER);
- Map<String, Long> map = new HashMap<>();
+ public Map<String, UidDateDTO> consumeFanLiShareMsg(int count) {
+ List<Message> list = cmqUtil.recieveMsg(count, FANLI_SHARE_ORDER);
+ Map<String, UidDateDTO> map = new HashMap<>();
if (list != null)
for (Message msg : list) {
String result = msg.msgBody;
+ UidDateDTO dto = new Gson().fromJson(result, UidDateDTO.class);
if (!StringUtil.isNullOrEmpty(result)) {
- map.put(msg.receiptHandle, Long.parseLong(result));
+ map.put(msg.receiptHandle, dto);
}
}
return map;
}
- public void deleteFanLiTiChengMsg(String receiptHandle) {
- cmqUtil.deleteMsg(FANLI_TICHENG_ORDER, receiptHandle);
+ public void deleteFanLiShareMsg(String receiptHandle) {
+ cmqUtil.deleteMsg(FANLI_SHARE_ORDER, receiptHandle);
}
// 缁存潈璁㈠崟
@@ -389,4 +404,44 @@
cmqUtil.deleteMsg(GOODS_UPDATE, receiptHandle);
}
+ /**
+ * 娣诲姞娣樺疂閲嶈鍟嗗搧鏇存柊
+ *
+ * @param actionId
+ */
+ public void addTBImpGoodsUpdate(Long actionId) {
+ cmqUtil.sendMsg(IMPORTANT_GOODS_UPDATE, actionId + "");
+ }
+
+ /**
+ * 璇诲彇閲嶈鍟嗗搧鏇存柊闃熷垪
+ *
+ * @param count
+ * @return
+ */
+ public Map<String, Long> consumeTBImpGoodsUpdateMsg(int count) {
+ List<Message> list = cmqUtil.recieveMsg(count, IMPORTANT_GOODS_UPDATE);
+ if (list == null) {
+ return null;
+ }
+
+ Map<String, Long> map = new HashMap<>();
+ for (Message msg : list) {
+ String result = msg.msgBody;
+ if (!StringUtil.isNullOrEmpty(result)) {
+ map.put(msg.receiptHandle, Long.parseLong(result));
+ }
+ }
+ return map;
+ }
+
+ /**
+ * 鍒犻櫎闃熷垪娑堟伅
+ *
+ * @param receiptHandle
+ */
+ public void deleteTBImpGoodsUpdateMsg(String receiptHandle) {
+ cmqUtil.deleteMsg(IMPORTANT_GOODS_UPDATE, receiptHandle);
+ }
+
}
--
Gitblit v1.8.0