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

wiki优化

Browse Source
This commit is contained in:
暮光：城中城
2020-08-02 18:02:37 +08:00
parent e281b5d47d
commit 6d2e24f455
19 changed files with 1407 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/elasticsearch/support/EsAbstractService.java
View File

@@ -37,6 +37,7 @@ import java.util.concurrent.TimeUnit;
/**
* es抽象类
*
* @author 暮光：城中城
* @since 2019-07-07
*/
@@ -101,6 +102,7 @@ public abstract class EsAbstractService<T> {
/**
* 多条件 模糊查询，查询前100条
*
* @param condition 查询条件
*/
public List<T> getDataByCondition(List<EsQueryColumn> condition) {
@@ -109,9 +111,10 @@ public abstract class EsAbstractService<T> {
/**
* 多条件 模糊查询
* @param condition 查询条件
*
* @param condition 查询条件
* @param startIndex 开始行
* @param pageSize 每页数量
* @param pageSize 每页数量
*/
public EsPage<T> getDataByCondition(List<EsQueryColumn> condition, String[] fields, Integer startIndex, Integer pageSize) {
BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
@@ -147,11 +150,13 @@ public abstract class EsAbstractService<T> {
});
return this.getDataByQuery(boolQueryBuilder, fields, startIndex, pageSize);
}
/**
* 多条件 模糊查询
*
* @param queryBuilders 查询条件
* @param startIndex 开始行
* @param pageSize 每页数量
* @param startIndex 开始行
* @param pageSize 每页数量
*/
public EsPage<T> getDataByQuery(QueryBuilder queryBuilders, String[] fields, Integer startIndex, Integer pageSize) {
// 设置高亮标签
@@ -208,5 +213,5 @@ public abstract class EsAbstractService<T> {
esPage.setData(tableList);
return esPage;
}
}

7
zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiPageServiceImpl.java
View File

@@ -52,10 +52,11 @@ public class WikiPageServiceImpl extends ServiceImpl<WikiPageMapper, WikiPage> i
}
this.updateById(wikiPage);
// 给相关人发送消息
WikiPage wikiPageSel = this.getById(wikiPage.getId());
DocUserDetails currentUser = DocUserUtil.getCurrentUser();
UserMessage userMessage = userMessageService.createUserMessage(currentUser, wikiPage.getId(), wikiPage.getName(), UserMsgSysType.WIKI, UserMsgType.WIKI_PAGE_PARENT);
userMessage.setAffectUserId(wikiPage.getCreateUserId());
userMessage.setAffectUserName(wikiPage.getCreateUserName());
UserMessage userMessage = userMessageService.createUserMessage(currentUser, wikiPageSel.getId(), wikiPageSel.getName(), UserMsgSysType.WIKI, UserMsgType.WIKI_PAGE_PARENT);
userMessage.setAffectUserId(wikiPageSel.getCreateUserId());
userMessage.setAffectUserName(wikiPageSel.getCreateUserName());
userMessageService.addWikiMessage(userMessage);
}