neu/backend_new
2
0
Fork 0
forked from RyanGoodwill/backend
Code Pull Requests Activity

Revert "根据warning修改为pagedModel"

Browse Source 
This reverts commit 64d7ae8c59.
This commit is contained in:
高子兴 2024-07-03 13:02:40 +08:00
parent 64d7ae8c59
commit e56db8a92e
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java
View File

@ -5,7 +5,7 @@ import org.cmh.backend.NewsManagement.model.News;
import org.cmh.backend.NewsManagement.service.NewsService;
import org.cmh.backend.Utils.JwtVerify;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.hateoas.PagedModel;
import org.springframework.data.domain.Page;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
@ -21,7 +21,7 @@ public class NewsController {
@GetMapping("/getNewsPage")
@JwtVerify
public ResponseEntity<PagedModel<News>> getNewsPage(@RequestBody GetNewsByPageRequest request) {
public ResponseEntity<Page<News>> getNewsPage(@RequestBody GetNewsByPageRequest request) {
return new ResponseEntity<>(newsService.getNewsByPage(request), HttpStatus.OK);
}

16
src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java
View File

@ -7,7 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.hateoas.PagedModel;
import org.springframework.stereotype.Service;
@Service
@ -15,7 +14,7 @@ public class NewsService {
@Autowired
private NewsRepository newsRepository;
public PagedModel<News> getNewsByPage(GetNewsByPageRequest request) {
public Page<News> getNewsByPage(GetNewsByPageRequest request) {
int pageNo = request.getPageNo();
int pageSize = request.getPageSize();
if (pageNo < 1) {
@ -25,17 +24,6 @@ public class NewsService {
pageSize = 10;
}
Pageable pageable = PageRequest.of(pageNo - 1, pageSize);
Page<News> newsPage = newsRepository.findAllByOrderByIdDesc(pageable);
return toPagedModel(newsPage);
}
private PagedModel<News> toPagedModel(Page<News> page) {
PagedModel.PageMetadata pageMetadata = new PagedModel.PageMetadata(
page.getSize(),
page.getNumber(),
page.getTotalElements(),
page.getTotalPages()
);
return PagedModel.of(page.getContent(), pageMetadata);
return newsRepository.findAllByOrderByIdDesc(pageable);
}
}