From bd885c7015446c6c0495d3299ef64068a4c9b30e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 16 十月 2024 15:00:34 +0800
Subject: [PATCH] CMQ改造为rabbitmq
---
service-push/src/main/java/com/ks/push/manager/PushExcuteResultManager.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 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 f4d9a1c..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());
}
}
}
@@ -153,5 +161,18 @@
bPushTaskExcuteResultMapper.updateByPrimaryKeySelective(update);
}
+ /**
+ * 鏍规嵁浠诲姟ID鏌ヨ鎺ㄩ�佺粨鏋�
+ *
+ * @param taskId
+ * @return
+ */
+ public List<BPushTaskExcuteResult> listByTaskId(String taskId) {
+ BPushTaskExcuteResultMapper.DaoQuery daoQuery = new BPushTaskExcuteResultMapper.DaoQuery();
+ daoQuery.taskId = taskId;
+ daoQuery.count = 100;
+ return bPushTaskExcuteResultMapper.list(daoQuery);
+ }
+
}
--
Gitblit v1.8.0