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 | 175 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 130 insertions(+), 45 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 600238f..82f5b33 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
@@ -1,8 +1,7 @@
package com.yeshi.fanli.util;
-import java.lang.reflect.Type;
+import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -11,74 +10,89 @@
import com.alipay.api.response.AlipayFundTransToaccountTransferResponse;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
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.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.push.PushQueueRecord;
-import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
-
-import net.sf.json.JSONObject;
public class CMQManager {
private static String secretId = "AKIDTlpgJhLjOozvd6QI2XnpfGbgV4NQJk25";
private static String secretKey = "xhCSUHo55oHUQ6XicFcmfIgspX0EEzWo";
private static CMQManager cmqManager;
private static CMQUtil cmqUtil;
- // TODO 璁㈠崟澶勭悊闃熷垪
+ // 璁㈠崟澶勭悊闃熷垪
public static String QUEUENAME_ORDER = "fanli-orders";
+
+ // 鍒氬垰浜х敓鐨勮鍗曞鐞嗛槦鍒�
+ public static String QUEUENAME_NEW_ORDER = "fanli-new-orders";
+
// 鎻愮幇缁撴灉澶勭悊闃熷垪
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 {
if (Constant.IS_TEST) {
QUEUENAME_ORDER = "test-" + QUEUENAME_ORDER;
+ QUEUENAME_NEW_ORDER = "test-" + QUEUENAME_NEW_ORDER;
EXTRACT_RESULT = "test-" + EXTRACT_RESULT;
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();
+ QUEUENAME_NEW_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
EXTRACT_RESULT += "-" + Constant.systemCommonConfig.getProjectName();
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
cmqUtil.createQueue(QUEUENAME_ORDER, 1024 * 1024);
+ cmqUtil.createQueue(QUEUENAME_NEW_ORDER, 1024 * 1024);
cmqUtil.createQueue(EXTRACT_RESULT);
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() {
@@ -92,11 +106,9 @@
*
* @param orderMap
*/
- public void addTaoBaoOrderMsg(String orderId, List<TaoBaoOrder> orderList) {
- if (!StringUtil.isNullOrEmpty(orderId) && orderList != null && orderList.size() > 0) {
- JSONObject item = new JSONObject();
- item.put(orderId, new GsonBuilder().create().toJson(orderList));
- cmqUtil.sendMsg(QUEUENAME_ORDER, item.toString());
+ public void addTaoBaoOrderMsg(String orderId) {
+ if (!StringUtil.isNullOrEmpty(orderId)) {
+ cmqUtil.sendMsg(QUEUENAME_ORDER, orderId);
}
}
@@ -105,27 +117,18 @@
*
* @param count
*/
- @SuppressWarnings("unchecked")
- public Map<String, List<TaoBaoOrder>> consumeTaoBaoOrderMsg(int count) {
+ public List<String> consumeTaoBaoOrderMsg(int count) {
+ List<String> resultList = new ArrayList<>();
List<Message> list = cmqUtil.recieveMsg(count, QUEUENAME_ORDER);
- Map<String, List<TaoBaoOrder>> map = new HashMap<>();
if (list != null)
for (Message msg : list) {
String result = msg.msgBody;
- JSONObject data = JSONObject.fromObject(result);
- Iterator<String> its = data.keySet().iterator();
- if (its.hasNext()) {
- String orderId = its.next();
- Type type = new TypeToken<List<TaoBaoOrder>>() {
- }.getType();
- List<TaoBaoOrder> orderList = new Gson().fromJson(data.optJSONArray(orderId).toString(), type);
- map.put(orderId, orderList);
- }
+ resultList.add(result);
// 鍒犻櫎娑堟伅
cmqUtil.deleteMsg(QUEUENAME_ORDER, msg.receiptHandle);
}
- return map;
+ return resultList;
}
/**
@@ -134,7 +137,46 @@
* @param receiptHandle
*/
public void deleteTaoBaoOrderMsg(String receiptHandle) {
- cmqUtil.deleteMsg(EXTRACT_RESULT, receiptHandle);
+ cmqUtil.deleteMsg(QUEUENAME_ORDER, receiptHandle);
+ }
+
+ /**
+ * 鍙戦�佽鍗曟秷鎭紙鍒氬垰浜х敓鐨勮鍗曪級
+ *
+ * @param orderMap
+ */
+ public void addTaoBaoNewOrderMsg(String orderId) {
+ if (!StringUtil.isNullOrEmpty(orderId)) {
+ cmqUtil.sendMsg(QUEUENAME_NEW_ORDER, orderId);
+ }
+ }
+
+ /**
+ * 娑堣垂娣樺疂璁㈠崟娑堟伅锛堝垰鍒氫骇鐢熺殑璁㈠崟锛�
+ *
+ * @param count
+ */
+ public List<String> consumeTaoBaoNewOrderMsg(int count) {
+ List<String> resultList = new ArrayList<>();
+ List<Message> list = cmqUtil.recieveMsg(count, QUEUENAME_NEW_ORDER);
+
+ if (list != null)
+ for (Message msg : list) {
+ String result = msg.msgBody;
+ resultList.add(result);
+ // 鍒犻櫎娑堟伅
+ cmqUtil.deleteMsg(QUEUENAME_NEW_ORDER, msg.receiptHandle);
+ }
+ return resultList;
+ }
+
+ /**
+ * 鍒犻櫎娣樺疂璁㈠崟娑堟伅锛堝垰鍒氫骇鐢熺殑璁㈠崟锛�
+ *
+ * @param receiptHandle
+ */
+ public void deleteTaoBaoNewOrderMsg(String receiptHandle) {
+ cmqUtil.deleteMsg(QUEUENAME_NEW_ORDER, receiptHandle);
}
/**
@@ -228,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);
}
// 缁存潈璁㈠崟
@@ -359,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