From 22e8f5555ab36a021943ad5e5a90e602c4d659d4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 29 四月 2022 10:34:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
index 00118bd..d5adb77 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDiscussServiceImpl.java
@@ -409,7 +409,7 @@
}
});
}
- return R.ok();
+ return R.ok(comActDiscussVOIPage);
}
/**
@@ -1309,11 +1309,13 @@
//组装viewNum key
List<String> viewNumKeys = new ArrayList<>();
Iterator<String> iterator = needWriteDiscussIdSet.iterator();
- List<String> idList = null;
+ List<String> idList = new ArrayList<>();
while (iterator.hasNext()) {
- idList = Arrays.asList(iterator.next().split(","));
- if (nonNull(idList) && !idList.isEmpty()) {
- idList.forEach(discussId -> viewNumKeys.add(String.join("_", DISCUSS_VIEW_NUM_PREFIX, discussId)));
+ String next = iterator.next();
+ String key = String.join("_", DISCUSS_VIEW_NUM_PREFIX, next);
+ if (stringRedisTemplate.hasKey(key)) {
+ idList.add(next);
+ viewNumKeys.add(key);
}
}
@@ -1323,11 +1325,14 @@
//待处理集合，以key-value/discussId-viewNum 存放
HashMap<Long, Integer> needDealMap = new HashMap<>();
if (nonNull(idList) && !idList.isEmpty()) {
+ log.error("一起议id列表：" + idList.toString());
+ log.error("一起议浏览量：" + viewNumList.toString());
for (String discussId : idList) {
try {
needDealMap.put(Long.parseLong(discussId), Integer.parseInt(viewNumList.get(0)));
viewNumList.remove(0);
} catch (IndexOutOfBoundsException e) {
+ log.error("数据异常：" + discussId, e.getMessage());
//数据存在异常了，跳过，继续执行正确的
continue;
}
--
Gitblit v1.7.1