manager/zyplayer-doc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#I636K1 全局搜索优化

Browse Source
This commit is contained in:
暮光：城中城
2022-12-07 20:23:38 +08:00
parent c62d733869
commit f7cfce0bd8
12 changed files with 556 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiOpenApiController.java
View File

@@ -2,9 +2,6 @@ package com.zyplayer.doc.wiki.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.dozermapper.core.Mapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
@@ -53,8 +50,6 @@ public class WikiOpenApiController {
WikiPageFileService wikiPageFileService;
@Resource
WikiPageContentMapper wikiPageContentMapper;
@Resource
Mapper mapper;
@PostMapping("/space/info")
public ResponseJson<WikiSpace> spaceInfo(String space) {
@@ -77,9 +72,7 @@ public class WikiOpenApiController {
}
// 分页查询
param.setSpaceIds(Collections.singletonList(wikiSpace.getId()));
PageHelper.startPage(param.getPageNum(), param.getPageSize(), true);
List<SpaceNewsVo> spaceNewsVoList = wikiPageContentMapper.getNewsList(param);
PageInfo<SpaceNewsVo> pageListPageInfo = new PageInfo<>(spaceNewsVoList);
if (CollectionUtils.isNotEmpty(spaceNewsVoList)) {
spaceNewsVoList.forEach(val -> {
val.setSpace(wikiSpace.getUuid());
@@ -101,7 +94,7 @@ public class WikiOpenApiController {
val.setPageTitle(pageTitle);
});
}
return DocResponseJson.ok(pageListPageInfo);
return DocResponseJson.ok(spaceNewsVoList);
}
@PostMapping("/page/list")
@@ -117,10 +110,10 @@ public class WikiOpenApiController {
if (CollectionUtils.isEmpty(wikiPageList)) {
return DocResponseJson.ok();
}
Map<Long, List<WikiPageVo>> listMap = wikiPageList.stream().map(val -> mapper.map(val, WikiPageVo.class)).collect(Collectors.groupingBy(WikiPageVo::getParentId));
Map<Long, List<WikiPageVo>> listMap = wikiPageList.stream().map(WikiPageVo::new).collect(Collectors.groupingBy(WikiPageVo::getParentId));
List<WikiPageVo> nodePageList = listMap.get(0L);
if (CollectionUtils.isNotEmpty(nodePageList)) {
nodePageList = nodePageList.stream().sorted(Comparator.comparingInt(WikiPage::getSeqNo)).collect(Collectors.toList());
nodePageList = nodePageList.stream().sorted(Comparator.comparingInt(WikiPageVo::getSeqNo)).collect(Collectors.toList());
this.setChildren(listMap, nodePageList);
}
return DocResponseJson.ok(nodePageList);
@@ -169,7 +162,7 @@ public class WikiOpenApiController {
for (WikiPageVo page : nodePageList) {
List<WikiPageVo> wikiPageVos = listMap.get(page.getId());
if (CollectionUtils.isNotEmpty(wikiPageVos)) {
wikiPageVos = wikiPageVos.stream().sorted(Comparator.comparingInt(WikiPage::getSeqNo)).collect(Collectors.toList());
wikiPageVos = wikiPageVos.stream().sorted(Comparator.comparingInt(WikiPageVo::getSeqNo)).collect(Collectors.toList());
page.setChildren(wikiPageVos);
this.setChildren(listMap, wikiPageVos);
}

45
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageController.java
View File

@@ -2,8 +2,6 @@ package com.zyplayer.doc.wiki.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.zyplayer.doc.core.annotation.AuthMan;
import com.zyplayer.doc.core.exception.ConfirmException;
import com.zyplayer.doc.core.json.DocResponseJson;
@@ -27,9 +25,7 @@ import com.zyplayer.doc.wiki.service.common.WikiPageAuthService;
import com.zyplayer.doc.wiki.service.git.GitService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import com.github.dozermapper.core.Mapper;
import org.apache.poi.poifs.filesystem.DirectoryEntry;
import org.apache.poi.poifs.filesystem.DocumentEntry;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +37,6 @@ import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.*;
import java.util.stream.Collectors;
@@ -78,8 +73,6 @@ public class WikiPageController {
UserMessageService userMessageService;
@Resource
GitService gitService;
@Resource
Mapper mapper;
@PostMapping("/list")
public ResponseJson<List<WikiPageVo>> list(WikiPage wikiPage) {
@@ -92,21 +85,12 @@ public class WikiPageController {
UpdateWrapper<WikiPage> wrapper = new UpdateWrapper<>();
wrapper.eq("del_flag", 0);
wrapper.eq("space_id", wikiPage.getSpaceId());
wrapper.eq(wikiPage.getParentId() != null, "parent_id", wikiPage.getParentId());
List<WikiPage> wikiPageList = wikiPageService.list(wrapper);
Map<Long, List<WikiPageVo>> listMap = wikiPageList.stream().map(val -> mapper.map(val, WikiPageVo.class)).collect(Collectors.groupingBy(WikiPageVo::getParentId));
List<WikiPageVo> nodePageList;
if (wikiPage.getParentId() == null) {
nodePageList = listMap.get(0L);
if (CollectionUtils.isNotEmpty(nodePageList)) {
nodePageList = nodePageList.stream().sorted(Comparator.comparingInt(WikiPage::getSeqNo)).collect(Collectors.toList());
this.setChildren(listMap, nodePageList, "");
}
} else {
nodePageList = listMap.get(wikiPage.getParentId());
if (CollectionUtils.isNotEmpty(nodePageList)) {
nodePageList = nodePageList.stream().sorted(Comparator.comparingInt(WikiPage::getSeqNo)).collect(Collectors.toList());
}
Map<Long, List<WikiPageVo>> listMap = wikiPageList.stream().map(WikiPageVo::new).collect(Collectors.groupingBy(WikiPageVo::getParentId));
List<WikiPageVo> nodePageList = listMap.get(0L);
if (CollectionUtils.isNotEmpty(nodePageList)) {
nodePageList = nodePageList.stream().sorted(Comparator.comparingInt(WikiPageVo::getSeqNo)).collect(Collectors.toList());
this.setChildren(listMap, nodePageList, "");
}
return DocResponseJson.ok(nodePageList);
}
@@ -253,6 +237,7 @@ public class WikiPageController {
UserMessage userMessage = userMessageService.createUserMessage(currentUser, wikiPageSel.getId(), wikiPageSel.getName(), DocSysType.WIKI, UserMsgType.WIKI_PAGE_UPDATE);
userMessageService.addWikiMessage(userMessage);
} else {
Long parentId = Optional.ofNullable(wikiPage.getParentId()).orElse(0L);
WikiSpace wikiSpaceSel = wikiSpaceService.getById(wikiPage.getSpaceId());
if (wikiSpaceSel == null) {
return DocResponseJson.warn("未找到指定的空间！");
@@ -265,20 +250,22 @@ public class WikiPageController {
if (SpaceType.isOthersPersonal(wikiSpaceSel.getType(), currentUser.getUserId(), wikiSpaceSel.getCreateUserId())) {
return DocResponseJson.warn("您没有权限新增该空间的文章！");
}
if (wikiPage.getParentId() != null && wikiPage.getParentId() > 0) {
WikiPage wikiPageParent = wikiPageService.getById(wikiPage.getParentId());
if (parentId> 0) {
WikiPage wikiPageParent = wikiPageService.getById(parentId);
if (!Objects.equals(wikiPage.getSpaceId(), wikiPageParent.getSpaceId())) {
return DocResponseJson.warn("当前空间和父页面的空间不一致，请重新选择父页面！");
}
}
Integer lastSeq = wikiPageMapper.getLastSeq(wikiPage.getParentId());
lastSeq = Optional.ofNullable(lastSeq).orElse(0);
Integer lastSeq = wikiPageMapper.getLastSeq(wikiPage.getSpaceId(), parentId);
lastSeq = Optional.ofNullable(lastSeq).orElse(99999);
wikiPage.setSeqNo(lastSeq + 1);
wikiPage.setCreateTime(new Date());
wikiPage.setUpdateTime(new Date());
wikiPage.setCreateUserId(currentUser.getUserId());
wikiPage.setCreateUserName(currentUser.getUsername());
wikiPageService.save(wikiPage);
// 重置当前分支的所有节点seq值
wikiPageMapper.updateChildrenSeq(wikiPage.getSpaceId(), parentId);
// 详情
pageContent.setPageId(wikiPage.getId());
pageContent.setCreateTime(new Date());
@@ -385,11 +372,9 @@ public class WikiPageController {
param.setKeywords("%" + keywords + "%");
}
// 分页查询
PageHelper.startPage(param.getPageNum(), param.getPageSize(), true);
List<SpaceNewsVo> spaceNewsVoList = wikiPageContentMapper.getNewsList(param);
PageInfo<SpaceNewsVo> pageListPageInfo = new PageInfo<>(spaceNewsVoList);
if (spaceNewsVoList == null || spaceNewsVoList.isEmpty()) {
return DocResponseJson.ok(pageListPageInfo);
return DocResponseJson.ok();
}
spaceNewsVoList.forEach(val -> {
val.setSpaceName(wikiSpaceMap.get(val.getSpaceId()).getName());
@@ -409,7 +394,7 @@ public class WikiPageController {
}
val.setPageTitle(pageTitle);
});
return DocResponseJson.ok(pageListPageInfo);
return DocResponseJson.ok(spaceNewsVoList);
}
private Map<Long, WikiSpace> getCanVisitWikiSpace(Long spaceId) {
@@ -440,7 +425,7 @@ public class WikiPageController {
page.setPath(nowPath);
List<WikiPageVo> wikiPageVos = listMap.get(page.getId());
if (CollectionUtils.isNotEmpty(wikiPageVos)) {
wikiPageVos = wikiPageVos.stream().sorted(Comparator.comparingInt(WikiPage::getSeqNo)).collect(Collectors.toList());
wikiPageVos = wikiPageVos.stream().sorted(Comparator.comparingInt(WikiPageVo::getSeqNo)).collect(Collectors.toList());
page.setChildren(wikiPageVos);
this.setChildren(listMap, wikiPageVos, nowPath);
}

5
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java
View File

@@ -23,7 +23,6 @@ import com.zyplayer.doc.wiki.controller.vo.UserSpaceAuthVo;
import com.zyplayer.doc.wiki.controller.vo.WikiSpaceVo;
import com.zyplayer.doc.wiki.framework.consts.WikiAuthType;
import org.apache.commons.collections.CollectionUtils;
import com.github.dozermapper.core.Mapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.PostMapping;
@@ -54,8 +53,6 @@ public class WikiSpaceController {
WikiSpaceFavoriteService wikiSpaceFavoriteService;
@Resource
UserSettingService userSettingService;
@Resource
Mapper mapper;
@PostMapping("/list")
public ResponseJson<List<WikiSpaceVo>> list(WikiSpace wikiSpace, Integer ignoreFavorite) {
@@ -65,7 +62,7 @@ public class WikiSpaceController {
wrapper.eq(wikiSpace.getId() != null, "id", wikiSpace.getId());
wrapper.and(con -> con.and(conSub -> conSub.eq("type", 3).eq("create_user_id", currentUser.getUserId())).or().in("type", 1, 2));
List<WikiSpace> spaceList = wikiSpaceService.list(wrapper);
List<WikiSpaceVo> spaceVoList = spaceList.stream().map(item -> mapper.map(item, WikiSpaceVo.class)).collect(Collectors.toList());
List<WikiSpaceVo> spaceVoList = spaceList.stream().map(WikiSpaceVo::new).collect(Collectors.toList());
// 收藏
QueryWrapper<WikiSpaceFavorite> favoriteWrapper = new QueryWrapper<>();
favoriteWrapper.eq("user_id", currentUser.getUserId());

263
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageVo.java
View File

@@ -2,6 +2,7 @@ package com.zyplayer.doc.wiki.controller.vo;
import com.zyplayer.doc.data.repository.manage.entity.WikiPage;
import java.util.Date;
import java.util.List;
/**
@@ -10,16 +11,260 @@ import java.util.List;
* @author 暮光：城中城
* @since 2019-03-11
*/
public class WikiPageVo extends WikiPage {
public class WikiPageVo {
private Long id;
/**
* 空间ID
*/
private Long spaceId;
/**
* 名字
*/
private String name;
/**
* 父ID
*/
private Long parentId;
/**
* 节点类型 0=有子节点 1=终节点
*/
private Integer nodeType;
/**
* 赞的数量
*/
private Integer zanNum;
/**
* 编辑类型 0=可编辑 1=不允许编辑
*/
private Integer editType;
/**
* 是否收藏 0=否 1=是
*/
private Integer favorite;
/**
* 创建人ID
*/
private Long createUserId;
/**
* 创建人名字
*/
private String createUserName;
/**
* 创建时间
*/
private Date createTime;
/**
* 修改人ID
*/
private Long updateUserId;
/**
* 修改人名字
*/
private String updateUserName;
/**
* 修改时间
*/
private Date updateTime;
/**
* 0=有效 1=删除
*/
private Integer delFlag;
/**
* 阅读数
*/
private Integer viewNum;
/**
* 顺序
*/
private Integer seqNo;
/**
* 编辑框类型 1=HTML 2=Markdown
*/
private Integer editorType;
private String path;
private List<WikiPageVo> children;
public List<WikiPageVo> getChildren() {
return children;
public WikiPageVo(WikiPage wikiPage) {
this.id = wikiPage.getId();
this.spaceId = wikiPage.getSpaceId();
this.name = wikiPage.getName();
this.parentId = wikiPage.getParentId();
this.nodeType = wikiPage.getNodeType();
this.zanNum = wikiPage.getZanNum();
this.editType = wikiPage.getEditType();
this.createUserId = wikiPage.getCreateUserId();
this.createUserName = wikiPage.getCreateUserName();
this.createTime = wikiPage.getCreateTime();
this.updateUserId = wikiPage.getUpdateUserId();
this.updateUserName = wikiPage.getUpdateUserName();
this.updateTime = wikiPage.getUpdateTime();
this.delFlag = wikiPage.getDelFlag();
this.viewNum = wikiPage.getViewNum();
this.seqNo = wikiPage.getSeqNo();
this.editorType = wikiPage.getEditorType();
}
public void setChildren(List<WikiPageVo> children) {
this.children = children;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
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;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public Integer getNodeType() {
return nodeType;
}
public void setNodeType(Integer nodeType) {
this.nodeType = nodeType;
}
public Integer getZanNum() {
return zanNum;
}
public void setZanNum(Integer zanNum) {
this.zanNum = zanNum;
}
public Integer getEditType() {
return editType;
}
public void setEditType(Integer editType) {
this.editType = editType;
}
public Integer getFavorite() {
return favorite;
}
public void setFavorite(Integer favorite) {
this.favorite = favorite;
}
public Long getCreateUserId() {
return createUserId;
}
public void setCreateUserId(Long createUserId) {
this.createUserId = createUserId;
}
public String getCreateUserName() {
return createUserName;
}
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Long getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(Long updateUserId) {
this.updateUserId = updateUserId;
}
public String getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(String updateUserName) {
this.updateUserName = updateUserName;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getDelFlag() {
return delFlag;
}
public void setDelFlag(Integer delFlag) {
this.delFlag = delFlag;
}
public Integer getViewNum() {
return viewNum;
}
public void setViewNum(Integer viewNum) {
this.viewNum = viewNum;
}
public Integer getSeqNo() {
return seqNo;
}
public void setSeqNo(Integer seqNo) {
this.seqNo = seqNo;
}
public Integer getEditorType() {
return editorType;
}
public void setEditorType(Integer editorType) {
this.editorType = editorType;
}
public String getPath() {
@@ -29,4 +274,12 @@ public class WikiPageVo extends WikiPage {
public void setPath(String path) {
this.path = path;
}
public List<WikiPageVo> getChildren() {
return children;
}
public void setChildren(List<WikiPageVo> children) {
this.children = children;
}
}

140
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiSpaceVo.java
View File

@@ -2,16 +2,154 @@ package com.zyplayer.doc.wiki.controller.vo;
import com.zyplayer.doc.data.repository.manage.entity.WikiSpace;
import java.util.Date;
/**
* wiki空间信息
*
* @author 暮光：城中城
* @since 2021-02-09
*/
public class WikiSpaceVo extends WikiSpace {
public class WikiSpaceVo {
/**
* 主键自增ID
*/
private Long id;
/**
* 空间名
*/
private String name;
/**
* 空间类型 1=公开 2=个人
*/
private Integer type;
/**
* 描述
*/
private String spaceExplain;
/**
* 目录延迟加载 0=否 1=是
*/
private Integer treeLazyLoad;
/**
* 是否是开放文档 0=否 1=是
*/
private Integer openDoc;
/**
* 唯一UUID
*/
private String uuid;
/**
* 创建人ID
*/
private Long createUserId;
/**
* 创建人名字
*/
private String createUserName;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建时间
*/
private Integer favorite;
public WikiSpaceVo(WikiSpace space) {
this.id = space.getId();
this.name = space.getName();
this.type = space.getType();
this.spaceExplain = space.getSpaceExplain();
this.treeLazyLoad = space.getTreeLazyLoad();
this.openDoc = space.getOpenDoc();
this.uuid = space.getUuid();
this.createUserId = space.getCreateUserId();
this.createUserName = space.getCreateUserName();
this.createTime = space.getCreateTime();
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
public String getSpaceExplain() {
return spaceExplain;
}
public void setSpaceExplain(String spaceExplain) {
this.spaceExplain = spaceExplain;
}
public Integer getTreeLazyLoad() {
return treeLazyLoad;
}
public void setTreeLazyLoad(Integer treeLazyLoad) {
this.treeLazyLoad = treeLazyLoad;
}
public Integer getOpenDoc() {
return openDoc;
}
public void setOpenDoc(Integer openDoc) {
this.openDoc = openDoc;
}
public String getUuid() {
return uuid;
}
public void setUuid(String uuid) {
this.uuid = uuid;
}
public Long getCreateUserId() {
return createUserId;
}
public void setCreateUserId(Long createUserId) {
this.createUserId = createUserId;
}
public String getCreateUserName() {
return createUserName;
}
public void setCreateUserName(String createUserName) {
this.createUserName = createUserName;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Integer getFavorite() {
return favorite;
}

2
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/framework/config/CheckWikiFileSavePath.java
View File

@@ -1,6 +1,6 @@
package com.zyplayer.doc.wiki.framework.config;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;

2
zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/service/git/GitService.java
View File

@@ -7,7 +7,7 @@ import com.zyplayer.doc.data.config.security.DocUserUtil;
import com.zyplayer.doc.data.repository.manage.entity.WikiPageHistory;
import com.zyplayer.doc.data.service.manage.WikiPageHistoryService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.Status;
import org.eclipse.jgit.internal.storage.file.FileRepository;