github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

feat: generate summary for sheet.

pull/471/head^2
ruibaby 2019-12-23 16:58:42 +08:00
parent 32701ab7bd
commit ed734a6a16
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/run/halo/app/controller/content/ContentSheetController.java
View File

@ -133,8 +133,8 @@ public class ContentSheetController {
Page<BaseCommentVO> comments = sheetCommentService.pageVosBy(sheet.getId(), PageRequest.of(cp, optionService.getCommentPageSize(), sort));
// sheet and post all can use
model.addAttribute("sheet", sheetService.convertToDetail(sheet));
model.addAttribute("post", sheetService.convertToDetail(sheet));
model.addAttribute("sheet", sheetService.convertToDetailVo(sheet));
model.addAttribute("post", sheetService.convertToDetailVo(sheet));
model.addAttribute("is_sheet", true);
model.addAttribute("comments", comments);

5
src/main/java/run/halo/app/service/impl/SheetServiceImpl.java
View File

@ -2,6 +2,7 @@ package run.halo.app.service.impl;
import cn.hutool.core.text.StrBuilder;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@ -280,6 +281,10 @@ public class SheetServiceImpl extends BasePostServiceImpl<Sheet> implements Shee
// Get sheet meta ids
sheetDetailVO.setSheetMetaIds(sheetMetaIds);
sheetDetailVO.setSheetMetas(sheetMetaService.convertTo(sheetMetas));
if (StringUtils.isBlank(sheetDetailVO.getSummary())) {
sheetDetailVO.setSummary(generateSummary(sheet.getFormatContent()));
}
return sheetDetailVO;
}