Merge branch 'v2.3.1' of http://47.100.44.39:10001/tp-backend/tanpu-community into v2.3.1

community-api/src/main/java/com/tanpu/community/api/beans/qo/TopicFollowQo.java

@@ -45,6 +45,9 @@ public class TopicFollowQo {
     @ApiModelProperty(value = "最近一条讨论")
     public String lastTheme;
 
+    @ApiModelProperty(value = "最近一条讨论发表时间")
+    public long lastThemeSecond;
+
     @ApiModelProperty(value = "最近一条讨论发表时间-格式化")
     public String lastThemeTime;
 

community-service/src/main/java/com/tanpu/community/manager/ThemeManager.java

@@ -528,10 +528,10 @@ public class ThemeManager {
                 fansList.add(userId); // 保证fansList不为空
 
                 // 权限控制，筛选出当前用户关注的话题
-                Set<String> userPermitTopics = topicService.getUserPermitTopics(userId);
+                Set<String> userFollowTopics = topicService.getUserFollowTopics(userId);
 
                 // 查库
-                themes = themeService.queryByUserIdsCreateDesc(fansList, pageStart, pageSize, userPermitTopics);
+                themes = themeService.queryByUserIdsCreateDesc(fansList, pageStart, pageSize, userFollowTopics);
 
                 if (CollectionUtils.isEmpty(excludeIds) && !themes.isEmpty()) {
                     // 说明是从头开始刷,则直接把最新的lastId放到redis中,保留一个月

community-service/src/main/java/com/tanpu/community/manager/TopicManager.java

@@ -111,7 +111,7 @@ public class TopicManager {
 
         // 排序
         List<TopicFollowQo> res = topicFollowQos.stream().filter(o -> o.checkTopicName(keyword)).sorted(Comparator.comparing(TopicFollowQo::getSpecialPermission, Comparator.reverseOrder()).
-                thenComparing(TopicFollowQo::getLastThemeTime, Comparator.nullsFirst(String::compareTo).reversed()))
+                thenComparing(TopicFollowQo::getLastThemeSecond, Comparator.nullsFirst(Long::compareTo).reversed()))
                 .collect(Collectors.toList());
 
         return res;

community-service/src/main/java/com/tanpu/community/service/ThemeService.java

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.time.ZoneOffset;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
@@ -223,15 +224,15 @@ public class ThemeService {
      * @param userIds
      * @param pageStart
      * @param pageSize
-     * @param userPermitTopics
+     * @param userFollowTopics
      * @return
      */
-    public List<ThemeEntity> queryByUserIdsCreateDesc(List<String> userIds, Integer pageStart, Integer pageSize, Set<String> userPermitTopics) {
-        if (CollectionUtils.isEmpty(userIds) && CollectionUtils.isEmpty(userPermitTopics)) {
+    public List<ThemeEntity> queryByUserIdsCreateDesc(List<String> userIds, Integer pageStart, Integer pageSize, Set<String> userFollowTopics) {
+        if (CollectionUtils.isEmpty(userIds) && CollectionUtils.isEmpty(userFollowTopics)) {
             return Collections.emptyList();
         }
-        userPermitTopics.remove("");
-        return themeMapper.queryFollowList(userIds, userPermitTopics, pageStart, pageSize);
+        userFollowTopics.remove("");
+        return themeMapper.queryFollowList(userIds, userFollowTopics, pageStart, pageSize);
 
     }
 
@@ -361,6 +362,7 @@ public class ThemeService {
 
                 topic.setLastTheme(getUserName(themeQo.getAuthorId()) + ":" + themeQo.content.get(0).getValue());
                 topic.setLastThemeTime(TimeUtils.formatTopicListTime(themeEntity.getUpdateTime()));
+                topic.setLastThemeSecond(themeEntity.getUpdateTime().toEpochSecond(ZoneOffset.of("+8")));
 
             }
 

community-service/src/main/java/com/tanpu/community/service/TopicService.java

@@ -169,6 +169,11 @@ public class TopicService {
         }
     }
 
+    /**
+     * 逐个校验是否有权限
+     * @param content
+     * @param userId
+     */
     public void batchCheckPermission(List<TopicRankQo> content, String userId) {
         Set<String> userPermitTopics = getUserPermitTopics(userId);
         content.forEach(o -> {
@@ -343,6 +348,11 @@ public class TopicService {
 
     }
 
+    /**
+     * 获取用户有权限的话题（专属的+所有的公开话题）
+     * @param userId
+     * @return
+     */
     public Set<String> getUserPermitTopics(String userId) {
         // 公开权限的话题
         List<TopicEntity> openTopics = topicMapper.selectList(new LambdaQueryWrapper<TopicEntity>()
@@ -364,4 +374,19 @@ public class TopicService {
         res.addAll(openTopicIds);
         return res;
     }
+
+    /**
+     * 获取用户关注的话题（专属的+关注的公开话题）
+     * @param userId
+     * @return
+     */
+    public Set<String> getUserFollowTopics(String userId) {
+        if (StringUtils.isBlank(userId)) {
+            return new HashSet<>();
+        }
+        // 拥有权限的话题
+        List<String> followTopics = topicFollowRelMapper.selectTopicIdByUserId(userId);
+        HashSet<String> res = new HashSet<>(followTopics);
+        return res;
+    }
 }