From 371c5a4ad43d2c365d96f7871ca87c959acc9dc9 Mon Sep 17 00:00:00 2001 From: Sh1yu <41428433@qq.com> Date: Thu, 24 Aug 2023 14:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E6=9D=BF=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/entity/WikiPageTemplate.java | 8 ++++++++ .../manage/mapper/WikiPageTemplateMapper.java | 18 ++++++++++++++--- .../manage/vo/WikiPageTemplateInfoVo.java | 9 ++++++++- .../manage/vo/WikiTemplateTagVo.java | 9 +++++++++ .../manage/WikiPageTemplateService.java | 20 ++++++++++++++++--- .../impl/WikiPageTemplateServiceImpl.java | 10 ++++++++-- .../WikiPageTemplateController.java | 7 ++++--- 7 files changed, 69 insertions(+), 12 deletions(-) diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageTemplate.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageTemplate.java index 5b712e62..0a0f0bf7 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageTemplate.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageTemplate.java @@ -8,6 +8,14 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +/** + *

+ * ģϢ + *

+ * + * @author Sh1yu + * @since 2023-08-24 + */ @Data @TableName("wiki_page_template") public class WikiPageTemplate implements Serializable { diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageTemplateMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageTemplateMapper.java index 92a5e594..2bfea3eb 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageTemplateMapper.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageTemplateMapper.java @@ -13,18 +13,30 @@ import java.util.List; /** *

- * Mapper 接口 + * 模板的mapper接口 *

* - * @author 暮光:城中城 - * @since 2019-03-09 + * @author sh1yu + * @since 2023-08-24 */ public interface WikiPageTemplateMapper extends BaseMapper { + /** + *

+ * 查询所有的模板 + *

+ */ List getAllTemplate(@Param("user") Long user, @Param("name") String name, @Param("share") boolean share, @Param("tags") List tags, @Param("pageNum") Long pageNum); + /* + * 查询所有标签 + */ List getAllTags(@Param("user") Long user,@Param("open") boolean open); + + /* + * 查询模板总数4分页 + */ Long getAllTemplateCount(@Param("user") Long user, @Param("name") String name, @Param("share") boolean share, @Param("tags") List tags); } diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiPageTemplateInfoVo.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiPageTemplateInfoVo.java index f36a4a23..c48b04e7 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiPageTemplateInfoVo.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiPageTemplateInfoVo.java @@ -5,7 +5,14 @@ import lombok.Data; import java.util.Date; import java.util.List; - +/** + *

+ * 模板与文档信息的Vo + *

+ * + * @author Sh1yu + * @since 2023-08-24 + */ @Data public class WikiPageTemplateInfoVo{ diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiTemplateTagVo.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiTemplateTagVo.java index fce46f88..2d386774 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiTemplateTagVo.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/WikiTemplateTagVo.java @@ -4,6 +4,15 @@ import lombok.Data; import java.util.Date; + +/** + *

+ * 标签信息的Vo + *

+ * + * @author Sh1yu + * @since 2023-08-24 + */ @Data public class WikiTemplateTagVo { diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageTemplateService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageTemplateService.java index fcbf9fbf..a9e0a17d 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageTemplateService.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiPageTemplateService.java @@ -11,18 +11,32 @@ import java.util.List; /** *

- * 服务类 + * 模板服务接口 *

* - * @author 暮光:城中城 - * @since 2019-03-09 + * @author Sh1yu + * @since 2023-08-24 */ public interface WikiPageTemplateService extends IService { + + /** + * 根据模板的公开情况获取模板标签 + */ public List getAllTags( Long user, boolean open); + /** + * 根据条件获取模板 + */ WikiPageTemplate getWikiPageTemplateBySpaceAndPage(Long spaceId, Long pageId); + + /** + * 根据条件获取模板信息 + */ List filterAll(Long user, String name, boolean open, List tags, Long pageNum); + /** + * 根据条件获取总条数 + */ Long total(Long user, String name, boolean open, List tags); } diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageTemplateServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageTemplateServiceImpl.java index 2633e766..8287cf95 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageTemplateServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageTemplateServiceImpl.java @@ -8,11 +8,17 @@ import com.zyplayer.doc.data.repository.manage.vo.WikiPageTemplateInfoVo; import com.zyplayer.doc.data.repository.manage.vo.WikiTemplateTagVo; import com.zyplayer.doc.data.service.manage.WikiPageTemplateService; import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import java.util.List; - +/** + *

+ * 模板服务实现类 + *

+ * + * @author Sh1yu + * @since 2023-08-24 + */ @Service public class WikiPageTemplateServiceImpl extends ServiceImpl implements WikiPageTemplateService { @Override diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageTemplateController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageTemplateController.java index ed2a8e17..bc3e980b 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageTemplateController.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageTemplateController.java @@ -48,11 +48,12 @@ import java.util.*; import java.util.stream.Collectors; /** - * 文档控制器 + *

+ * 模板控制器 + *

* - * @author 暮光:城中城 * @author Sh1yu - * @since 2019年2月17日 + * @since 2023-08-24 */ @Slf4j @AuthMan