diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java index d728b40a..2a4f62b0 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiPageContent.java @@ -69,6 +69,16 @@ public class WikiPageContent implements Serializable { */ private String preview; + /** + * 空间ID + */ + private Long spaceId; + + /** + * 名字 + */ + private String name; + public Long getId() { return id; } @@ -155,4 +165,20 @@ public class WikiPageContent implements Serializable { public void setPreview(String preview) { this.preview = preview; } + + public Long getSpaceId() { + return spaceId; + } + + public void setSpaceId(Long spaceId) { + this.spaceId = spaceId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java index e730520f..0b13dda2 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiPageContentMapper.java @@ -2,6 +2,10 @@ package com.zyplayer.doc.data.repository.manage.mapper; import com.zyplayer.doc.data.repository.manage.entity.WikiPageContent; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zyplayer.doc.data.repository.manage.param.SearchByEsParam; +import com.zyplayer.doc.data.repository.manage.vo.SpaceNewsVo; + +import java.util.List; /** *

@@ -12,5 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @since 2019-02-24 */ public interface WikiPageContentMapper extends BaseMapper { - + + List getNewsList(SearchByEsParam param); } diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/param/SearchByEsParam.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/param/SearchByEsParam.java similarity index 63% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/param/SearchByEsParam.java rename to zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/param/SearchByEsParam.java index fc614f85..3e484a9d 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/param/SearchByEsParam.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/param/SearchByEsParam.java @@ -1,10 +1,14 @@ -package com.zyplayer.doc.wiki.controller.param; +package com.zyplayer.doc.data.repository.manage.param; + +import java.util.List; public class SearchByEsParam { private Long spaceId; private String keywords; private Integer pageNum; private Integer pageSize; + private Integer newsType; + private List spaceIds; public Integer getPageNum() { return pageNum; @@ -41,4 +45,20 @@ public class SearchByEsParam { public void setKeywords(String keywords) { this.keywords = keywords; } + + public Integer getNewsType() { + return newsType; + } + + public void setNewsType(Integer newsType) { + this.newsType = newsType; + } + + public List getSpaceIds() { + return spaceIds; + } + + public void setSpaceIds(List spaceIds) { + this.spaceIds = spaceIds; + } } diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/SpaceNewsVo.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/SpaceNewsVo.java similarity index 97% rename from zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/SpaceNewsVo.java rename to zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/SpaceNewsVo.java index ba5a4c7d..76f0692d 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/SpaceNewsVo.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/vo/SpaceNewsVo.java @@ -1,4 +1,4 @@ -package com.zyplayer.doc.wiki.controller.vo; +package com.zyplayer.doc.data.repository.manage.vo; import java.util.Date; diff --git a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageContentMapper.xml b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageContentMapper.xml index 604c8e71..937b7bb6 100644 --- a/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageContentMapper.xml +++ b/zyplayer-doc-data/src/main/resources/mapper/manage/WikiPageContentMapper.xml @@ -1,5 +1,28 @@ + + diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/DocSystemController.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/DocSystemController.java index bec118cb..cd91a969 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/DocSystemController.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/web/manage/DocSystemController.java @@ -19,7 +19,7 @@ public class DocSystemController { @AuthMan @GetMapping("/doc-wiki") public ModelAndView wiki() { - return new ModelAndView("/doc-wiki-v2.html"); + return new ModelAndView("/doc-wiki.html"); } @AuthMan diff --git a/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.3.sql b/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.3.sql index 645ee243..a1546538 100644 --- a/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.3.sql +++ b/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.3.sql @@ -26,4 +26,14 @@ insert into user_auth(`user_id`, `auth_id`, `create_uid`, `del_flag`, `creation_ select a.id, b.id, a.id, 0, now() from user_info a,auth_info b where a.user_no='zyplayer' and b.auth_name='DB_DATASOURCE_MANAGE'; +ALTER TABLE `wiki_page_content` ADD COLUMN `space_id` bigint(20) NULL COMMENT '空间ID'; +ALTER TABLE `wiki_page_content` ADD COLUMN `name` varchar(100) DEFAULT NULL COMMENT '名字'; +ALTER TABLE `wiki_page` MODIFY COLUMN `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名字'; + +update wiki_page_content a join wiki_page b on b.id=a.page_id set a.space_id=b.space_id; + + -- ------------------------全新的库：------------------------ + + + diff --git a/zyplayer-doc-ui/wiki-ui/src/App.vue b/zyplayer-doc-ui/wiki-ui/src/App.vue index e1e911f3..7ab2a7ac 100644 --- a/zyplayer-doc-ui/wiki-ui/src/App.vue +++ b/zyplayer-doc-ui/wiki-ui/src/App.vue @@ -20,8 +20,8 @@

创建文档
- - + + +
+
+
+ + + + + + 搜索一下 + + +
+
暂无数据
+
+
+ {{item.createUserName}} 发布于 {{item.spaceName}} +
+
+
{{item.pageTitle}}
+
{{item.previewContent}}
+
+ {{item.zanNum}}　 + {{item.viewNum}}　 + {{item.updateTime||item.createTime}} +
+
+
+
+ + +
+
+
+ + + + + diff --git a/zyplayer-doc-ui/wiki-ui/src/views/user/Login.vue b/zyplayer-doc-ui/wiki-ui/src/views/user/Login.vue index 26f02718..d4070285 100644 --- a/zyplayer-doc-ui/wiki-ui/src/views/user/Login.vue +++ b/zyplayer-doc-ui/wiki-ui/src/views/user/Login.vue @@ -3,10 +3,10 @@