From ed734a6a162788a0fa0140e093cdb73a5a18bb1f Mon Sep 17 00:00:00 2001 From: ruibaby Date: Mon, 23 Dec 2019 16:58:42 +0800 Subject: [PATCH] feat: generate summary for sheet. --- .../halo/app/controller/content/ContentSheetController.java | 4 ++-- .../java/run/halo/app/service/impl/SheetServiceImpl.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/run/halo/app/controller/content/ContentSheetController.java b/src/main/java/run/halo/app/controller/content/ContentSheetController.java index eacb222e4..ea59e541f 100644 --- a/src/main/java/run/halo/app/controller/content/ContentSheetController.java +++ b/src/main/java/run/halo/app/controller/content/ContentSheetController.java @@ -133,8 +133,8 @@ public class ContentSheetController { Page 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); diff --git a/src/main/java/run/halo/app/service/impl/SheetServiceImpl.java b/src/main/java/run/halo/app/service/impl/SheetServiceImpl.java index c3ce2dddf..2cefcc25a 100644 --- a/src/main/java/run/halo/app/service/impl/SheetServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/SheetServiceImpl.java @@ -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 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; }