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

项目整合，增加测试项目，es改为rest客户端接口查询

Browse Source
This commit is contained in:
暮光：城中城
2019-07-18 23:21:07 +08:00
parent bf2bf47f53
commit 5084b4ce6a
36 changed files with 986 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zyplayer-doc-wiki/pom.xml
View File

@@ -35,7 +35,7 @@
<zyplayer.doc.version>1.0.2</zyplayer.doc.version>
<!-- 打包跳过单元测试 -->
<skipTests>true</skipTests>
<elasticsearch.version>6.8.0</elasticsearch.version>
<elasticsearch.version>7.2.0</elasticsearch.version>
<destDir>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</destDir>
</properties>

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

@@ -272,12 +272,12 @@ public class WikiPageController {
wikiPageContentService.save(pageContent);
}
// 保存到es
if (esWikiPageService != null) {
if (esWikiPageService.isOpen()) {
WikiPage wikiPageSel = wikiPageService.getById(wikiPage.getId());
EsWikiPage esWikiPage = mapper.map(wikiPageSel, EsWikiPage.class);
esWikiPage.setContent(content);
esWikiPage.setPreview(preview);
esWikiPageService.create(esWikiPage);
esWikiPageService.upsert(esWikiPage);
} else {
logger.warn("未开启elasticsearch服务，建议开启");
}
@@ -313,7 +313,7 @@ public class WikiPageController {
@PostMapping("/searchByEs")
public ResponseJson<Object> searchByEs(SearchByEsParam param) {
if (esWikiPageService != null) {
if (esWikiPageService.isOpen()) {
Map<Long, WikiSpace> wikiSpaceMap = this.getCanVisitWikiSpace(param.getSpaceId());
if (wikiSpaceMap.isEmpty()) {
return DocResponseJson.ok();
@@ -329,6 +329,9 @@ public class WikiPageController {
boolQueryBuilder.must(QueryBuilders.termQuery("delFlag", "0"));
boolQueryBuilder.must(QueryBuilders.termsQuery("spaceId", wikiSpaceMap.keySet().toArray()));
EsPage<EsWikiPage> wikiPageEsPage = esWikiPageService.getDataByQuery(boolQueryBuilder, fields, param.getStartIndex(), param.getPageSize());
if (wikiPageEsPage == null || wikiPageEsPage.getTotal() == null) {
return DocResponseJson.ok();
}
// 组装数据
List<EsWikiPage> esWikiPageList = wikiPageEsPage.getData();
List<SpaceNewsVo> pageVoList = new LinkedList<>();