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/manager/PushExcuteResultManager.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/service-push/src/main/java/com/ks/push/manager/PushExcuteResultManager.java b/service-push/src/main/java/com/ks/push/manager/PushExcuteResultManager.java
index 4a72fd9..56b79e8 100644
--- a/service-push/src/main/java/com/ks/push/manager/PushExcuteResultManager.java
+++ b/service-push/src/main/java/com/ks/push/manager/PushExcuteResultManager.java
@@ -6,6 +6,8 @@
 import com.ks.push.pojo.DO.BPushTask;
 import com.ks.push.pojo.DO.BPushTaskExcuteResult;
 import com.ks.push.pojo.DO.PushPlatform;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -16,11 +18,15 @@
 
 @Component
 public class PushExcuteResultManager {
+
+    private Logger logger = LoggerFactory.getLogger(PushExcuteResultManager.class);
+
     @Resource
     private BPushTaskExcuteResultMapper bPushTaskExcuteResultMapper;
 
+
     @Resource
-    private RedisTemplate<String, Object> redisTemplate;
+    private RedisTemplate<String, String> redisTemplate;
 
     @Resource
     private BPushTaskDao bPushTaskDao;
@@ -37,7 +43,6 @@
         result.setId(BPushTaskExcuteResult.createId(taskId, pushPlatform));
         //鍒濆鍖�
         bPushTaskExcuteResultMapper.insertSelective(result);
-
         String key = getRedisKey(taskId, pushPlatform);
         redisTemplate.delete(key);
         return result;
@@ -70,10 +75,12 @@
      */
     public void batchPushFinish(BPushDeviceDataSet dataSet, PushPlatform pushPlatform) {
         String key = getRedisKey(dataSet.getTaskId(), pushPlatform);
-        redisTemplate.opsForSet().remove(key, dataSet.getBatchId());
         Long size = redisTemplate.opsForSet().size(key);
+        redisTemplate.opsForSet().remove(key, dataSet.getBatchId());
+        Long afterSize = redisTemplate.opsForSet().size(key);
+        logger.info("{}鎺ㄩ�佸墿浣欐暟閲� taskId-{} size-{} afterSize-{}", pushPlatform.name(), dataSet.getTaskId(), size + "", afterSize + "");
         //鍒ゆ柇鏄惁鎺ㄩ�佸畬鎴�
-        if (size == null || size == 0L) {
+        if (afterSize == null || afterSize == 0L) {
             //宸茬粡鎺ㄩ�佸畬浜�
             String id = BPushTaskExcuteResult.createId(dataSet.getTaskId(), pushPlatform);
             BPushTaskExcuteResult update = new BPushTaskExcuteResult();
@@ -92,6 +99,7 @@
                 updateTask.setStateDesc("鎺ㄩ�佸畬鎴�");
                 updateTask.setUpdateTime(new Date());
                 bPushTaskDao.updateSelective(updateTask);
+                logger.info("{}鎺ㄩ�佸畬鎴� taskId-{}", pushPlatform.name(), dataSet.getTaskId());
             }
         }
     }

--
Gitblit v1.8.0