接口优化

2025-09-08 17:54:12 +08:00
parent e20030f10d
commit d42d689bd7
84 changed files with 6403 additions and 4310 deletions
@@ -5,18 +5,24 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.emotion.common.BasePageRequest;
+import com.emotion.common.PageResult;
+import com.emotion.dto.request.DiaryCommentCreateRequest;
+import com.emotion.dto.request.DiaryCommentPageRequest;
+import com.emotion.dto.response.DiaryCommentResponse;
 import com.emotion.entity.DiaryComment;
 import com.emotion.mapper.DiaryCommentMapper;
 import com.emotion.service.DiaryCommentService;
+import com.emotion.util.SnowflakeIdGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

-import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.stream.Collectors;

@@ -29,207 +35,105 @@ import java.util.stream.Collectors;
@Service
 public class DiaryCommentServiceImpl extends ServiceImpl<DiaryCommentMapper, DiaryComment> implements DiaryCommentService {

+    @Autowired
+    private SnowflakeIdGenerator snowflakeIdGenerator;
+
    @Autowired
    private ObjectMapper objectMapper;

+    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
    @Override
-    public IPage<DiaryComment> getPage(BasePageRequest request) {
+    public PageResult<DiaryCommentResponse> getPageWithResponse(DiaryCommentPageRequest request) {
        Page<DiaryComment> page = new Page<>(request.getCurrent(), request.getSize());
        LambdaQueryWrapper<DiaryComment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DiaryComment::getIsDeleted, 0)
-               .orderByDesc(DiaryComment::getIsTop)
+
+        // 基础查询条件
+        wrapper.eq(DiaryComment::getIsDeleted, 0);
+
+        // 根据请求参数添加查询条件
+        if (StringUtils.hasText(request.getDiaryId())) {
+            wrapper.eq(DiaryComment::getDiaryId, request.getDiaryId());
+        }
+        if (StringUtils.hasText(request.getUserId())) {
+            wrapper.eq(DiaryComment::getUserId, request.getUserId());
+        }
+        if (StringUtils.hasText(request.getCommentType())) {
+            wrapper.eq(DiaryComment::getCommentType, request.getCommentType());
+        }
+        if (request.getTopLevelOnly() != null && request.getTopLevelOnly()) {
+            wrapper.isNull(DiaryComment::getParentCommentId);
+        }
+
+        // 排序
+        wrapper.orderByDesc(DiaryComment::getIsTop)
               .orderByDesc(DiaryComment::getPublishTime);
-        return this.page(page, wrapper);
+
+        IPage<DiaryComment> resultPage = this.page(page, wrapper);
+        return convertPageToResponse(resultPage);
    }

    @Override
-    public IPage<DiaryComment> getPageByDiaryId(String diaryId, BasePageRequest request) {
-        Page<DiaryComment> page = new Page<>(request.getCurrent(), request.getSize());
-        LambdaQueryWrapper<DiaryComment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DiaryComment::getDiaryId, diaryId)
-               .eq(DiaryComment::getIsDeleted, 0)
-               .orderByDesc(DiaryComment::getIsTop)
-               .orderByDesc(DiaryComment::getPublishTime);
-        return this.page(page, wrapper);
+    public DiaryCommentResponse getCommentResponseById(String id) {
+        DiaryComment comment = this.getById(id);
+        if (comment == null) {
+            return null;
+        }
+        return convertToResponse(comment);
    }

    @Override
-    public IPage<DiaryComment> getPageByUserId(String userId, BasePageRequest request) {
-        Page<DiaryComment> page = new Page<>(request.getCurrent(), request.getSize());
-        LambdaQueryWrapper<DiaryComment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DiaryComment::getUserId, userId)
-               .eq(DiaryComment::getIsDeleted, 0)
-               .orderByDesc(DiaryComment::getPublishTime);
-        return this.page(page, wrapper);
+    public List<DiaryCommentResponse> getCommentTreeWithResponse(String diaryId) {
+        List<DiaryComment> comments = this.getCommentTree(diaryId);
+        return comments.stream()
+                .map(this::convertToResponse)
+                .collect(Collectors.toList());
    }

    @Override
-    public List<DiaryComment> getRepliesByParentId(String parentCommentId) {
-        LambdaQueryWrapper<DiaryComment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DiaryComment::getParentCommentId, parentCommentId)
-               .eq(DiaryComment::getIsDeleted, 0)
-               .orderByAsc(DiaryComment::getPublishTime);
-        return this.list(wrapper);
-    }
-
-    @Override
-    public List<DiaryComment> getByCommentType(String commentType) {
-        LambdaQueryWrapper<DiaryComment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DiaryComment::getCommentType, commentType)
-               .eq(DiaryComment::getIsDeleted, 0)
-               .orderByDesc(DiaryComment::getPublishTime);
-        return this.list(wrapper);
-    }
-
-    @Override
-    public List<DiaryComment> getByDiaryIdAndCommentType(String diaryId, String commentType) {
-        LambdaQueryWrapper<DiaryComment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DiaryComment::getDiaryId, diaryId)
-               .eq(DiaryComment::getCommentType, commentType)
-               .eq(DiaryComment::getIsDeleted, 0)
-               .orderByDesc(DiaryComment::getPublishTime);
-        return this.list(wrapper);
-    }
-
-    @Override
-    public boolean incrementLikeCount(String commentId) {
-        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(DiaryComment::getId, commentId)
-               .setSql("like_count = like_count + 1");
-        return this.update(wrapper);
-    }
-
-    @Override
-    public boolean decrementLikeCount(String commentId) {
-        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(DiaryComment::getId, commentId)
-               .setSql("like_count = GREATEST(like_count - 1, 0)");
-        return this.update(wrapper);
-    }
-
-    @Override
-    public boolean incrementReplyCount(String commentId) {
-        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(DiaryComment::getId, commentId)
-               .setSql("reply_count = reply_count + 1");
-        return this.update(wrapper);
-    }
-
-    @Override
-    public boolean decrementReplyCount(String commentId) {
-        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(DiaryComment::getId, commentId)
-               .setSql("reply_count = GREATEST(reply_count - 1, 0)");
-        return this.update(wrapper);
-    }
-
-    @Override
-    public boolean updateLastReplyTime(String commentId) {
-        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(DiaryComment::getId, commentId)
-               .set(DiaryComment::getLastReplyTime, LocalDateTime.now());
-        return this.update(wrapper);
-    }
-
-    @Override
-    public boolean setTop(String commentId, Integer isTop) {
-        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(DiaryComment::getId, commentId)
-               .set(DiaryComment::getIsTop, isTop);
-        return this.update(wrapper);
-    }
-
-    @Override
-    public Long countByDiaryId(String diaryId) {
-        LambdaQueryWrapper<DiaryComment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DiaryComment::getDiaryId, diaryId)
-               .eq(DiaryComment::getIsDeleted, 0);
-        return this.count(wrapper);
-    }
-
-    @Override
-    public Long countByUserId(String userId) {
-        LambdaQueryWrapper<DiaryComment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DiaryComment::getUserId, userId)
-               .eq(DiaryComment::getIsDeleted, 0);
-        return this.count(wrapper);
-    }
-
-    @Override
-    public Long countByCommentType(String commentType) {
-        LambdaQueryWrapper<DiaryComment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DiaryComment::getCommentType, commentType)
-               .eq(DiaryComment::getIsDeleted, 0);
-        return this.count(wrapper);
-    }
-
-    @Override
-    public Long countReplies(String parentCommentId) {
-        LambdaQueryWrapper<DiaryComment> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DiaryComment::getParentCommentId, parentCommentId)
-               .eq(DiaryComment::getIsDeleted, 0);
-        return this.count(wrapper);
-    }
-
-    @Override
-    public DiaryComment createComment(String diaryId, String userId, String content, List<String> images, 
-                                     String parentCommentId, Integer isAnonymous) {
+    public DiaryCommentResponse createCommentWithResponse(DiaryCommentCreateRequest request) {
        DiaryComment comment = DiaryComment.builder()
-                .diaryId(diaryId)
-                .userId(userId)
-                .content(content)
-                .images(convertListToJson(images))
-                .parentCommentId(parentCommentId)
+                .id(snowflakeIdGenerator.nextIdAsString()) // 使用雪花算法生成ID
+                .diaryId(request.getDiaryId())
+                .userId(request.getUserId())
+                .content(request.getContent())
+                .images(convertListToJson(request.getImages()))
+                .parentCommentId(request.getParentCommentId())
                .commentType("user")
                .likeCount(0)
                .replyCount(0)
-                .isAnonymous(isAnonymous)
+                .isAnonymous(request.getIsAnonymous())
                .isTop(0)
                .status("published")
                .publishTime(LocalDateTime.now())
                .build();
-        
+
        this.save(comment);
-        
+
        // 如果有父评论，更新父评论的回复数
-        if (StringUtils.hasText(parentCommentId)) {
-            this.incrementReplyCount(parentCommentId);
-            this.updateLastReplyTime(parentCommentId);
+        if (StringUtils.hasText(request.getParentCommentId())) {
+            this.incrementReplyCount(request.getParentCommentId());
+            this.updateLastReplyTime(request.getParentCommentId());
        }
-        
-        return comment;
+
+        return convertToResponse(comment);
    }

    @Override
-    public DiaryComment createAiComment(String diaryId, String content, String aiCommentSource, 
-                                       BigDecimal emotionScore, BigDecimal sentimentScore) {
-        DiaryComment comment = DiaryComment.builder()
-                .diaryId(diaryId)
-                .userId("system") // AI评论使用system用户ID
-                .content(content)
-                .commentType("ai")
-                .aiCommentSource(aiCommentSource)
-                .likeCount(0)
-                .replyCount(0)
-                .isAnonymous(0)
-                .isTop(0)
-                .status("published")
-                .publishTime(LocalDateTime.now())
-                .emotionScore(emotionScore)
-                .sentimentScore(sentimentScore)
-                .build();
-        
-        this.save(comment);
-        return comment;
-    }
-
-    @Override
-    public boolean updateComment(String commentId, String content, List<String> images) {
+    public DiaryCommentResponse updateCommentWithResponse(DiaryCommentCreateRequest request) {
        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.eq(DiaryComment::getId, commentId)
-               .set(StringUtils.hasText(content), DiaryComment::getContent, content)
-               .set(images != null, DiaryComment::getImages, convertListToJson(images));
-        return this.update(wrapper);
+        wrapper.eq(DiaryComment::getId, request.getId())
+                .set(StringUtils.hasText(request.getContent()), DiaryComment::getContent, request.getContent())
+                .set(request.getImages() != null, DiaryComment::getImages, convertListToJson(request.getImages()))
+                .set(DiaryComment::getUpdateTime, LocalDateTime.now());
+
+        boolean updated = this.update(wrapper);
+        if (!updated) {
+            return null;
+        }
+
+        DiaryComment updatedComment = this.getById(request.getId());
+        return updatedComment != null ? convertToResponse(updatedComment) : null;
    }

    @Override
@@ -241,7 +145,8 @@ public class DiaryCommentServiceImpl extends ServiceImpl<DiaryCommentMapper, Dia
    public boolean softDeleteComment(String commentId) {
        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
        wrapper.eq(DiaryComment::getId, commentId)
-               .set(DiaryComment::getIsDeleted, 1);
+                .set(DiaryComment::getIsDeleted, 1)
+                .set(DiaryComment::getUpdateTime, LocalDateTime.now());
        return this.update(wrapper);
    }

@@ -249,22 +154,52 @@ public class DiaryCommentServiceImpl extends ServiceImpl<DiaryCommentMapper, Dia
    public boolean restoreComment(String commentId) {
        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
        wrapper.eq(DiaryComment::getId, commentId)
-               .set(DiaryComment::getIsDeleted, 0);
+                .set(DiaryComment::getIsDeleted, 0)
+                .set(DiaryComment::getUpdateTime, LocalDateTime.now());
        return this.update(wrapper);
    }

    @Override
-    public List<DiaryComment> getCommentTree(String diaryId) {
+    public boolean incrementLikeCount(String commentId) {
+        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(DiaryComment::getId, commentId)
+                .setSql("like_count = like_count + 1")
+                .set(DiaryComment::getUpdateTime, LocalDateTime.now());
+        return this.update(wrapper);
+    }
+
+    @Override
+    public boolean decrementLikeCount(String commentId) {
+        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(DiaryComment::getId, commentId)
+                .setSql("like_count = GREATEST(like_count - 1, 0)")
+                .set(DiaryComment::getUpdateTime, LocalDateTime.now());
+        return this.update(wrapper);
+    }
+
+    @Override
+    public boolean setTop(String commentId, Integer isTop) {
+        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(DiaryComment::getId, commentId)
+                .set(DiaryComment::getIsTop, isTop)
+                .set(DiaryComment::getUpdateTime, LocalDateTime.now());
+        return this.update(wrapper);
+    }
+
+    /**
+     * 获取评论树结构
+     */
+    private List<DiaryComment> getCommentTree(String diaryId) {
        // 获取所有顶级评论（没有父评论的评论）
        LambdaQueryWrapper<DiaryComment> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(DiaryComment::getDiaryId, diaryId)
-               .isNull(DiaryComment::getParentCommentId)
-               .eq(DiaryComment::getIsDeleted, 0)
-               .orderByDesc(DiaryComment::getIsTop)
-               .orderByDesc(DiaryComment::getPublishTime);
-        
+                .isNull(DiaryComment::getParentCommentId)
+                .eq(DiaryComment::getIsDeleted, 0)
+                .orderByDesc(DiaryComment::getIsTop)
+                .orderByDesc(DiaryComment::getPublishTime);
+
        List<DiaryComment> topComments = this.list(wrapper);
-        
+
        // 为每个顶级评论加载回复
        return topComments.stream()
                .peek(comment -> {
@@ -274,6 +209,103 @@ public class DiaryCommentServiceImpl extends ServiceImpl<DiaryCommentMapper, Dia
                .collect(Collectors.toList());
    }

+    /**
+     * 根据父评论ID查询回复列表
+     */
+    private List<DiaryComment> getRepliesByParentId(String parentCommentId) {
+        LambdaQueryWrapper<DiaryComment> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DiaryComment::getParentCommentId, parentCommentId)
+                .eq(DiaryComment::getIsDeleted, 0)
+                .orderByAsc(DiaryComment::getPublishTime);
+        return this.list(wrapper);
+    }
+
+    /**
+     * 增加回复数
+     */
+    private boolean incrementReplyCount(String commentId) {
+        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(DiaryComment::getId, commentId)
+                .setSql("reply_count = reply_count + 1")
+                .set(DiaryComment::getUpdateTime, LocalDateTime.now());
+        return this.update(wrapper);
+    }
+
+    /**
+     * 减少回复数
+     */
+    private boolean decrementReplyCount(String commentId) {
+        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(DiaryComment::getId, commentId)
+                .setSql("reply_count = GREATEST(reply_count - 1, 0)")
+                .set(DiaryComment::getUpdateTime, LocalDateTime.now());
+        return this.update(wrapper);
+    }
+
+    /**
+     * 更新最后回复时间
+     */
+    private boolean updateLastReplyTime(String commentId) {
+        LambdaUpdateWrapper<DiaryComment> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(DiaryComment::getId, commentId)
+                .set(DiaryComment::getLastReplyTime, LocalDateTime.now())
+                .set(DiaryComment::getUpdateTime, LocalDateTime.now());
+        return this.update(wrapper);
+    }
+
+    /**
+     * 转换为响应对象
+     */
+    private DiaryCommentResponse convertToResponse(DiaryComment comment) {
+        DiaryCommentResponse response = new DiaryCommentResponse();
+        BeanUtils.copyProperties(comment, response);
+
+        // 转换时间格式
+        if (comment.getPublishTime() != null) {
+            response.setPublishTime(comment.getPublishTime().format(DATE_TIME_FORMATTER));
+        }
+        if (comment.getLastReplyTime() != null) {
+            response.setLastReplyTime(comment.getLastReplyTime().format(DATE_TIME_FORMATTER));
+        }
+        if (comment.getCreateTime() != null) {
+            response.setCreateTime(comment.getCreateTime().format(DATE_TIME_FORMATTER));
+        }
+        if (comment.getUpdateTime() != null) {
+            response.setUpdateTime(comment.getUpdateTime().format(DATE_TIME_FORMATTER));
+        }
+
+        // 转换JSON字段
+        try {
+            if (comment.getImages() != null) {
+                response.setImages(objectMapper.readValue(comment.getImages(), new TypeReference<List<String>>() {
+                }));
+            }
+            if (comment.getMetadata() != null) {
+                response.setMetadata(objectMapper.readValue(comment.getMetadata(), Object.class));
+            }
+        } catch (JsonProcessingException e) {
+            // 忽略JSON解析错误
+        }
+
+        return response;
+    }
+
+    /**
+     * 转换分页对象为响应对象
+     */
+    private PageResult<DiaryCommentResponse> convertPageToResponse(IPage<DiaryComment> page) {
+        PageResult<DiaryCommentResponse> responsePage = new PageResult<>();
+        responsePage.setCurrent(page.getCurrent());
+        responsePage.setSize(page.getSize());
+        responsePage.setTotal(page.getTotal());
+        responsePage.setPages(page.getPages());
+        responsePage.setRecords(
+                page.getRecords().stream()
+                        .map(this::convertToResponse)
+                        .collect(Collectors.toList()));
+        return responsePage;
+    }
+
    /**
     * 将List转换为JSON字符串
     */
@@ -287,4 +319,4 @@ public class DiaryCommentServiceImpl extends ServiceImpl<DiaryCommentMapper, Dia
            return null;
        }
    }
-} 
+}