From a2c56bd6b79d2b8ca2c4c44a254ad2958fb72bca Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 17 九月 2021 15:21:45 +0800
Subject: [PATCH] 推送服务完善

---
 service-push/src/main/java/com/ks/push/consumer/mq/PushTaskConsumer.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/service-push/src/main/java/com/ks/push/consumer/mq/PushTaskConsumer.java b/service-push/src/main/java/com/ks/push/consumer/mq/PushTaskConsumer.java
index d5b4cb7..d0e00c0 100644
--- a/service-push/src/main/java/com/ks/push/consumer/mq/PushTaskConsumer.java
+++ b/service-push/src/main/java/com/ks/push/consumer/mq/PushTaskConsumer.java
@@ -42,13 +42,13 @@
         if (platform == null) {
             return;
         }
-        logger.info("娑堣垂娑堟伅寮�濮�:{}  Thread:{}", platform.name(),Thread.currentThread().getId());
+//        logger.info("娑堣垂娑堟伅寮�濮�:{}  Thread:{}", platform.name(), Thread.currentThread().getId());
         List<CMQManager.MQMsgConsumeResult> resultList = null;
         try {
             resultList = CMQManager.getInstance().consumePushQueue(platform, 1);
         } catch (Exception e) {
         }
-        logger.info("娑堣垂娑堟伅缁撴潫:{} Thread:{}", platform.name(),Thread.currentThread().getId());
+//        logger.info("娑堣垂娑堟伅缁撴潫:{} Thread:{}", platform.name(), Thread.currentThread().getId());
         if (resultList != null) {
             for (CMQManager.MQMsgConsumeResult result : resultList) {
                 try {
@@ -59,10 +59,12 @@
                             BPushPlatformAppInfo platformAppInfo = bPushPlatformAppInfoManager.selectByAppCodeAndPlatform(task.getAppCode(), platform);
                             if (platformAppInfo != null) {
                                 try {
-                                    PushUtil.pushNotifyCation(platform, platformAppInfo.getPushAppInfo(), task.getMessage(), dataSet.getDeviceTokenList());
-                                    logger.info("鎺ㄩ�佷换鍔℃墽琛屾垚鍔�,taskId-{},batchId-{}", dataSet.getTaskId(), dataSet.getBatchId());
+                                    PushUtil.pushNotifyCation(platform, platformAppInfo.getPushAppInfo(), task.getMessage(), task.getId() + "#" + dataSet.getBatchId(), dataSet.getDeviceTokenList());
+                                    logger.info("{}鎺ㄩ�佷换鍔℃墽琛屾垚鍔�,taskId-{},batchId-{}", platform.name(), dataSet.getTaskId(), dataSet.getBatchId());
                                 } catch (Exception e) {
+                                    e.printStackTrace();
                                     logger.error("鎺ㄩ�佸嚭閿欙細ttaskId-{},batchId-{}锛岄敊璇師鍥狅細{}", task.getId(), dataSet.getBatchId(), e.getMessage());
+                                    logger.error("鎺ㄩ�佸嚭閿�", e);
                                 }
                             }
                         } else {
@@ -77,11 +79,12 @@
                         logger.error("浠诲姟涓虹┖锛宼askId-{},batchId-{}", dataSet.getTaskId(), dataSet.getBatchId());
                     }
                     //鍒犻櫎娑堟伅
-                    logger.info("鎺ㄩ�佷换鍔℃墽琛屽畬鎴�,taskId-{},batchId-{}", dataSet.getTaskId(), dataSet.getBatchId());
                     CMQManager.getInstance().deleteMsg(result.getQueueName(), result.getReceiptHandle());
                     pushExcuteResultManager.batchPushFinish(dataSet, platform);
+                    logger.info("{}鎺ㄩ�佷换鍔℃墽琛岀粨鏉�,taskId-{},batchId-{}", platform.name(), dataSet.getTaskId(), dataSet.getBatchId());
                 } catch (Exception e) {
 //                    e.printStackTrace();
+                    logger.error("鎺ㄩ�佸嚭閿�:", e);
                 }
             }
 

--
Gitblit v1.8.0