snowy-main/src/main/java/vip/xiaonuo/modular/blogarticlecomment/controller/BlogArticleCommentOutsideController.java

@@ -28,6 +28,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.PageUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.template.Template;
import cn.hutool.extra.template.TemplateConfig;
@@ -71,7 +72,7 @@
    private BlogArticleService blogArticleService;

    @Resource
    private BlogArticleCommentService blogArticleCommentService;
    private BlogArticleCommentService commentService;


    @Resource
@@ -112,14 +113,19 @@
        insert.setIsEnable(MyConstant.Yes);
        insert.setIsReceiveCallback(addDto.getIsReceiveMail());

        blogArticleCommentService.save(insert);
        //自己留言已读
        if (MyConstant.myIds.contains(addDto.getVisitorNickName())) {
            insert.setIsRead(MyConstant.Yes);
        }

        commentService.save(insert);

        if (addDto.getReplyId() == null || addDto.getReplyId() == 0L) {
            //这里为根节点,预留通知我
            return new SuccessResponseData();
        }

        BlogArticleComment lastComment = blogArticleCommentService.getById(addDto.getReplyId());
        BlogArticleComment lastComment = commentService.getById(addDto.getReplyId());

        if (lastComment == null) {
            return new SuccessResponseData();
@@ -136,7 +142,7 @@
            TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("templates", TemplateConfig.ResourceMode.CLASSPATH));
            Template template = engine.getTemplate("emailReplyModel.ftl");

            String title = "碎碎念";
            String title = MyConstant.msgTitle;
            String address;
            //跳转地址
            if (addDto.getCommentType().equals(MyConstant.CommentType.type_1)) {
@@ -179,7 +185,7 @@
        Page queryPage = new Page<>(queryDto.getPageNo(), queryDto.getPageSize());


        List<BlogArticleComment> commentList = blogArticleCommentService.lambdaQuery()
        List<BlogArticleComment> commentList = commentService.lambdaQuery()
                .eq(queryDto.getArticleId() != null, BlogArticleComment::getArticleId, queryDto.getArticleId())
                .eq(BlogArticleComment::getCommentType, queryDto.getArticleId() == null ? MyConstant.CommentType.type_1 : MyConstant.CommentType.type_2)
                .eq(BlogArticleComment::getIsCheck, MyConstant.Yes)
@@ -193,7 +199,7 @@
                    BlogCommentVo vo = new BlogCommentVo();
                    BeanUtil.copyProperties(e, vo);
                    vo.setIsHasNext(MyConstant.No);
                    List<BlogCommentVo> replyList = blogArticleCommentService.getReplyListById(e.getId(), limitCount);
                    List<BlogCommentVo> replyList = commentService.getReplyListById(e.getId(), limitCount);
                    vo.setReplyList(replyList);

                    if (e.getAuthStatus().equals(MyConstant.AuthStatus.privateCode)) {
@@ -201,7 +207,7 @@
                    }

                    if (CollUtil.isNotEmpty(replyList)
                            && blogArticleCommentService.lambdaQuery()
                            && commentService.lambdaQuery()
                            .eq(BlogArticleComment::getParentId, e.getId())
                            .eq(BlogArticleComment::getIsCheck, MyConstant.Yes)
                            .eq(BlogArticleComment::getIsEnable, MyConstant.Yes)
@@ -219,12 +225,12 @@
    @GetMapping("/blogComment/queryBlogCommentSubList")
    @BusinessLog(title = "外部blog系统_blog留言/评论子列表_查询", opType = LogAnnotionOpTypeEnum.QUERY)
    public ResponseData queryBlogCommentSubList(BlogCommentQueryDto queryDto) {
        if (queryDto.getArticleId() != null && blogArticleCommentService.getById(queryDto.getCommentId()) == null) {
        if (queryDto.getArticleId() != null && commentService.getById(queryDto.getCommentId()) == null) {
            throw new BlogException("查询不到相关评论");
        }


        List<BlogCommentVo> replyList = blogArticleCommentService.getReplyListById(queryDto.getCommentId(), null);
        List<BlogCommentVo> replyList = commentService.getReplyListById(queryDto.getCommentId(), null);
//        for (BlogCommentVo vo : replyList) {
//            vo.setIsHasNext(MyConstant.No);
//            if (vo.getAuthStatus().equals(MyConstant.AuthStatus.privateCode)) {
@@ -235,6 +241,67 @@
        return new SuccessResponseData(replyList);
    }

    @GetMapping("/blogComment/history")
    @BusinessLog(title = "外部blog系统_blog留言/最近留言查询", opType = LogAnnotionOpTypeEnum.QUERY)
    public ResponseData history(BlogCommentQueryDto queryDto) {
        Page queryPage = new Page<>(queryDto.getPageNo(), queryDto.getPageSize());

        //查询最近未读留言,无穷分页,(注意*号隐蔽,登录可见)
        int unreadCommentListCount = commentService.lambdaQuery()
                .eq(BlogArticleComment::getIsCheck, MyConstant.Yes)
                .eq(BlogArticleComment::getIsEnable, MyConstant.Yes)
                .eq(BlogArticleComment::getIsRead, MyConstant.No)
                .count();

        //取出所有未读消息+最多10条已读消息
        long limitTotal = unreadCommentListCount + MyConstant.limitRead;

        //最大页数不能超出限制
        if (PageUtil.getEnd(queryDto.getPageNo() - 1, queryDto.getPageSize()) > limitTotal
                && PageUtil.getEnd(queryDto.getPageNo() - 2, queryDto.getPageSize()) > limitTotal) {
            queryPage.setMaxLimit(limitTotal);
            return new SuccessResponseData(queryPage);
        }

        //当前页超出起始页,未达尾页, 限制当前查询个数
        long limitSize = queryDto.getPageSize();
        if (PageUtil.getEnd(queryDto.getPageNo() - 1, queryDto.getPageSize()) > limitTotal) {
            limitSize = limitTotal % queryDto.getPageSize();
        }

        List<BlogArticleComment> commentList = commentService.lambdaQuery()
                .eq(BlogArticleComment::getIsCheck, MyConstant.Yes)
                .eq(BlogArticleComment::getIsEnable, MyConstant.Yes)
                .orderByAsc(BlogArticleComment::getIsRead)
                .orderByDesc(BlogArticleComment::getCreateDate)
                .page(queryPage).getRecords();

        //queryPage.setTotal(limitTotal - (limitTotal % queryDto.getPageSize()));
        queryPage.setTotal(limitTotal);
        List<BlogCommentVo> res = commentList.stream()
                .limit(limitSize)
                .map(e -> {
                            BlogCommentVo vo = new BlogCommentVo();
                            BeanUtil.copyProperties(e, vo);
                            if (e.getAuthStatus().equals(MyConstant.AuthStatus.privateCode)) {
                                vo.setCommentContent(MyConstant.privateComment);
                            }
                            if (MyConstant.CommentType.type_2 == e.getCommentType()) {
                                vo.setArticleTitle(blogArticleService.lambdaQuery()
                                        .eq(BlogArticle::getId, e.getArticleId())
                                        .select(BlogArticle::getTitle).one().getTitle());
                            } else {
                                vo.setArticleTitle(MyConstant.msgTitle);
                            }

                            return vo;
                        }
                ).collect(Collectors.toList());

        queryPage.setRecords(res);
        return new SuccessResponseData(queryPage);
    }

    //    @GetMapping("/blogComment/test")
    public ResponseData test() {