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

Add type field for JournalDTO.

pull/296/head
ruibaby 2019-09-06 12:26:24 +08:00
parent e6c6624680
commit 96c74369d6
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/run/halo/app/controller/admin/api/JournalController.java
View File

@ -51,7 +51,7 @@ public class JournalController {
@GetMapping @GetMapping
@ApiOperation("Lists journals") @ApiOperation("Lists journals")
public Page<JournalWithCmtCountDTO> pageBy(@PageableDefault(sort = "updateTime", direction = DESC) Pageable pageable, public Page<JournalWithCmtCountDTO> pageBy(@PageableDefault(sort = "createTime", direction = DESC) Pageable pageable,
JournalQuery journalQuery) { JournalQuery journalQuery) {
Page<Journal> journalPage = journalService.pageBy(journalQuery, pageable); Page<Journal> journalPage = journalService.pageBy(journalQuery, pageable);
return journalService.convertToCmtCountDto(journalPage); return journalService.convertToCmtCountDto(journalPage);

3
src/main/java/run/halo/app/model/dto/JournalDTO.java
View File

@ -3,6 +3,7 @@ package run.halo.app.model.dto;
import lombok.Data; import lombok.Data;
import run.halo.app.model.dto.base.OutputConverter; import run.halo.app.model.dto.base.OutputConverter;
import run.halo.app.model.entity.Journal; import run.halo.app.model.entity.Journal;
import run.halo.app.model.enums.JournalType;
import java.util.Date; import java.util.Date;
@ -22,4 +23,6 @@ public class JournalDTO implements OutputConverter<JournalDTO, Journal> {
private Long likes; private Long likes;
private Date createTime; private Date createTime;
private JournalType type;
} }