From 475e097a4f9bd42545b30ef2830c1a3dad3dbab5 Mon Sep 17 00:00:00 2001 From: OTTO <731554297@qq.com> Date: Fri, 8 Dec 2023 09:54:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=87=E7=AB=A0=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91):=20=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E8=8E=B7=E5=8F=96=E8=B0=83=E6=95=B4=E4=B8=BA?= =?UTF-8?q?=E5=85=AC=E5=BC=80=E6=8E=A5=E5=8F=A3=E5=85=81=E8=AE=B8=E6=89=80?= =?UTF-8?q?=E6=9C=89=E4=BA=BA=E8=AE=BF=E9=97=AE=EF=BC=8C=E4=B8=8D=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=8F=AF=E5=90=A6=E5=88=A0=E9=99=A4=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CmsDocCommentController.java | 19 ++-------- .../cms/doc/controller/OpenController.java | 20 +++++++++++ .../impl/CmsDocCommentServiceImpl.java | 36 +++++++++---------- .../ruoyi/cms/utils/CmsGitLinkRequestUrl.java | 4 +-- 4 files changed, 43 insertions(+), 36 deletions(-) diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/controller/CmsDocCommentController.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/controller/CmsDocCommentController.java index 320d702c8..84a3a3ff7 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/controller/CmsDocCommentController.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/controller/CmsDocCommentController.java @@ -6,7 +6,9 @@ import com.ruoyi.cms.doc.domain.CmsDocCommentUpdateDto; import com.ruoyi.cms.doc.service.ICmsDocCommentService; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; -import io.swagger.annotations.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -63,19 +65,4 @@ public class CmsDocCommentController extends BaseController { return success(result); } - /** - * 获取文章下评论列表 - */ - @GetMapping("/{docId}/list") - @ApiOperation(value = "获取文章下评论列表") - @ApiImplicitParams({ - @ApiImplicitParam(name = "page", value = "页码", paramType = "query", dataType = "Integer"), - @ApiImplicitParam(name = "limit", value = "分页数", paramType = "query", dataType = "Integer"), - }) - public AjaxResult getCommentList( - @ApiParam("文章Id") @PathVariable Long docId, Integer page, Integer limit) { - JSONObject result = cmsDocCommentService.getCommentList(docId, page, limit); - return success(result); - } - } diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/controller/OpenController.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/controller/OpenController.java index 042892414..a83949f8d 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/controller/OpenController.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/controller/OpenController.java @@ -1,6 +1,8 @@ package com.ruoyi.cms.doc.controller; +import com.alibaba.fastjson2.JSONObject; import com.ruoyi.cms.doc.domain.*; +import com.ruoyi.cms.doc.service.ICmsDocCommentService; import com.ruoyi.cms.doc.service.ICmsDocService; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.AjaxResult; @@ -26,6 +28,8 @@ import java.util.List; public class OpenController extends BaseController { @Autowired private ICmsDocService cmsDocService; + @Autowired + private ICmsDocCommentService cmsDocCommentService; /** * 查询栏目列表 @@ -163,5 +167,21 @@ public class OpenController extends BaseController { cmsDocService.syncDocData(deptId,bodyStr); return AjaxResult.success("同步消息发送成功"); } + + + /** + * 公开获取文章下评论列表 + */ + @GetMapping("/{docId}/journalList") + @ApiOperation(value = "公开获取文章下评论列表") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", value = "页码", paramType = "query", dataType = "Integer"), + @ApiImplicitParam(name = "limit", value = "分页数", paramType = "query", dataType = "Integer"), + }) + public AjaxResult getCommentList( + @ApiParam("文章Id") @PathVariable Long docId, Integer page, Integer limit) { + JSONObject result = cmsDocCommentService.getCommentList(docId, page, limit); + return success(result); + } } diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/service/impl/CmsDocCommentServiceImpl.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/service/impl/CmsDocCommentServiceImpl.java index c3dec281e..e16fad751 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/service/impl/CmsDocCommentServiceImpl.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/doc/service/impl/CmsDocCommentServiceImpl.java @@ -82,24 +82,24 @@ public class CmsDocCommentServiceImpl implements ICmsDocCommentService { page, limit )); JSONArray journals = journalDataJson.getJSONArray("journals"); - if (journals != null) { - // 设置评论可删除权限 - for (int i = 0; i < journals.size(); i++) { - JSONObject journal = journals.getJSONObject(i); - setJournalCanDelete(cmsDoc, journal); - journals.set(i, journal); - // 检查评论是否存在回复 - JSONArray childrenJournals = journal.getJSONArray("children_journals"); - if (childrenJournals != null) { - for (int j = 0; j < childrenJournals.size(); j++) { - JSONObject childrenJournal = childrenJournals.getJSONObject(j); - setJournalCanDelete(cmsDoc, childrenJournal); - childrenJournals.set(j, childrenJournal); - } - journal.put("children_journals", childrenJournals); - } - } - } +// if (journals != null) { +// // 设置评论可删除权限 +// for (int i = 0; i < journals.size(); i++) { +// JSONObject journal = journals.getJSONObject(i); +// setJournalCanDelete(cmsDoc, journal); +// journals.set(i, journal); +// // 检查评论是否存在回复 +// JSONArray childrenJournals = journal.getJSONArray("children_journals"); +// if (childrenJournals != null) { +// for (int j = 0; j < childrenJournals.size(); j++) { +// JSONObject childrenJournal = childrenJournals.getJSONObject(j); +// setJournalCanDelete(cmsDoc, childrenJournal); +// childrenJournals.set(j, childrenJournal); +// } +// journal.put("children_journals", childrenJournals); +// } +// } +// } journalDataJson.put("journals", journals); return journalDataJson; } diff --git a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/utils/CmsGitLinkRequestUrl.java b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/utils/CmsGitLinkRequestUrl.java index 2d690ee81..f75276143 100644 --- a/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/utils/CmsGitLinkRequestUrl.java +++ b/ruoyi-modules/ruoyi-cms/src/main/java/com/ruoyi/cms/utils/CmsGitLinkRequestUrl.java @@ -177,11 +177,11 @@ public class CmsGitLinkRequestUrl extends GitLinkRequestUrl { } public static GitLinkRequestUrl GET_ISSUE(String username, String identifier, Long issueId) { - return getGitLinkRequestUrl(String.format("/api/v1/%s/%s/issues/%d", username, identifier, issueId)); + return getOpenGitLinkRequestUrl(String.format("/api/v1/%s/%s/issues/%d", username, identifier, issueId)); } public static GitLinkRequestUrl GET_JOURNALS(String username, String identifier, Long issueId, Integer page, Integer limit) { - return getGitLinkRequestUrl(String.format("/api/v1/%s/%s/issues/%d/journals?category=comment&page=%d&limit=%d", username, identifier, issueId, page, limit)); + return getOpenGitLinkRequestUrl(String.format("/api/v1/%s/%s/issues/%d/journals?category=comment&page=%d&limit=%d", username, identifier, issueId, page, limit)); } public static GitLinkRequestUrl DELETE_AND_UPDATE_JOURNAL(String username, String identifier, Long issueId, Long journalId) {