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

开放文档排序和增加阅读数

Browse Source
This commit is contained in:
暮光：城中城
2019-06-15 15:57:03 +08:00
parent 8a94b6e426
commit 40f594f1ff
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package com.zyplayer.doc.wiki.controller; package com.zyplayer.doc.wiki.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zyplayer.doc.core.json.DocResponseJson; import com.zyplayer.doc.core.json.DocResponseJson;
import com.zyplayer.doc.core.json.ResponseJson; import com.zyplayer.doc.core.json.ResponseJson;
@@ -13,6 +14,7 @@ import com.zyplayer.doc.data.service.manage.WikiPageService;
import com.zyplayer.doc.data.service.manage.WikiSpaceService; import com.zyplayer.doc.data.service.manage.WikiSpaceService;
import com.zyplayer.doc.wiki.controller.vo.WikiPageContentVo; import com.zyplayer.doc.wiki.controller.vo.WikiPageContentVo;
import com.zyplayer.doc.wiki.controller.vo.WikiPageVo; import com.zyplayer.doc.wiki.controller.vo.WikiPageVo;
import org.apache.commons.collections.CollectionUtils;
import org.dozer.Mapper; import org.dozer.Mapper;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -21,9 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.*;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@@ -70,12 +70,16 @@ public class WikiOpenApiController {
if (wikiSpace == null || wikiSpace.getOpenDoc() != 1) { if (wikiSpace == null || wikiSpace.getOpenDoc() != 1) {
return DocResponseJson.warn("未找到该文档"); return DocResponseJson.warn("未找到该文档");
} }
UpdateWrapper<WikiPage> wrapper = new UpdateWrapper<>(); QueryWrapper<WikiPage> wrapper = new QueryWrapper<>();
wrapper.eq("del_flag", 0); wrapper.eq("del_flag", 0);
wrapper.eq("space_id", wikiSpace.getId()); wrapper.eq("space_id", wikiSpace.getId());
List<WikiPage> authList = wikiPageService.list(wrapper); List<WikiPage> wikiPageList = wikiPageService.list(wrapper);
Map<Long, List<WikiPageVo>> listMap = authList.stream().map(val -> mapper.map(val, WikiPageVo.class)).collect(Collectors.groupingBy(WikiPageVo::getParentId)); 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));
List<WikiPageVo> nodePageList = listMap.get(0L); List<WikiPageVo> nodePageList = listMap.get(0L);
nodePageList = nodePageList.stream().sorted(Comparator.comparingInt(WikiPage::getSeqNo)).collect(Collectors.toList());
this.setChildren(listMap, nodePageList); this.setChildren(listMap, nodePageList);
return DocResponseJson.ok(nodePageList); return DocResponseJson.ok(nodePageList);
} }
@@ -104,6 +108,14 @@ public class WikiOpenApiController {
for (WikiPageFile pageFile : pageFiles) { for (WikiPageFile pageFile : pageFiles) {
pageFile.setFileUrl("zyplayer-doc-wiki/common/file?uuid=" + pageFile.getUuid()); pageFile.setFileUrl("zyplayer-doc-wiki/common/file?uuid=" + pageFile.getUuid());
} }
// 高并发下会有覆盖问题，但不重要~
Integer viewNum = Optional.ofNullable(wikiPageSel.getViewNum()).orElse(0);
WikiPage wikiPageUp = new WikiPage();
wikiPageUp.setId(wikiPageSel.getId());
wikiPageUp.setViewNum(viewNum + 1);
wikiPageService.updateById(wikiPageUp);
// 修改返回值里的查看数+1
wikiPageSel.setViewNum(viewNum + 1);
WikiPageContentVo vo = new WikiPageContentVo(); WikiPageContentVo vo = new WikiPageContentVo();
vo.setWikiPage(wikiPageSel); vo.setWikiPage(wikiPageSel);
vo.setPageContent(pageContent); vo.setPageContent(pageContent);
@@ -118,6 +130,7 @@ public class WikiOpenApiController {
for (WikiPageVo page : nodePageList) { for (WikiPageVo page : nodePageList) {
List<WikiPageVo> wikiPageVos = listMap.get(page.getId()); List<WikiPageVo> wikiPageVos = listMap.get(page.getId());
if (wikiPageVos != null && wikiPageVos.size() > 0) { if (wikiPageVos != null && wikiPageVos.size() > 0) {
wikiPageVos = wikiPageVos.stream().sorted(Comparator.comparingInt(WikiPage::getSeqNo)).collect(Collectors.toList());
page.setChildren(wikiPageVos); page.setChildren(wikiPageVos);
this.setChildren(listMap, wikiPageVos); this.setChildren(listMap, wikiPageVos);
} }