|
|
@@ -135,16 +135,17 @@ public class ForegroundController extends BaseController {
|
|
|
@GetMapping("/archive")
|
|
|
public String archive() {
|
|
|
List<ArchiveArticle> results = articleQuery.getArchiveArticles();
|
|
|
- return WebResult.success(results);
|
|
|
+ List<ArticleLink> articleLinkList = articleQuery.getArticleLinks();
|
|
|
+ return WebResult.success(articleLinkList);
|
|
|
}
|
|
|
|
|
|
@Operation(summary = "文章搜索结果列表页面", description = "N")
|
|
|
@GetMapping("/search")
|
|
|
public String search(@RequestParam("kw") String kw, @RequestParam("pn") int pageNumber) {
|
|
|
PageRequest pageRequest = PageRequest.of(pageNumber, pageSize, Sort.by(Sort.Direction.ASC, "createTime"));
|
|
|
- /*Page<UserArticle> page = hibernateQuery.searchArticle(kw, pageRequest);
|
|
|
- PageList<UserArticle> pageList = getPageList(page);*/
|
|
|
- return WebResult.success("pageList");
|
|
|
+ Page<UserArticle> page = hibernateQuery.search(kw, pageRequest);
|
|
|
+ PageList<UserArticle> pageList = getPageList(page);
|
|
|
+ return WebResult.success(pageList);
|
|
|
}
|
|
|
|
|
|
@Operation(summary = "关于页面", description = "N")
|