From e56db8a92e7f6480d116a13ed93b7bda68c3bf8b Mon Sep 17 00:00:00 2001
From: heshunme <heshunme@outlook.com>
Date: Wed, 3 Jul 2024 13:02:40 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=A0=B9=E6=8D=AEwarning=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BApagedModel"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 64d7ae8c593f60e3a923ddae99389abc0a532257.
---
 .../controller/NewsController.java               |  4 ++--
 .../NewsManagement/service/NewsService.java      | 16 ++--------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java b/src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java
index 969d774..30d0f45 100644
--- a/src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java
+++ b/src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java
@@ -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);
     }
 
diff --git a/src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java b/src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java
index 2b7aa03..3f42e2c 100644
--- a/src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java
+++ b/src/main/java/org/cmh/backend/NewsManagement/service/NewsService.java
@@ -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);
     }
 }