src/main/java/cn/celess/blog/controller/ArticleController.java

@@ -3,6 +3,7 @@ package cn.celess.blog.controller;
 import cn.celess.blog.enmu.ResponseEnum;
 import cn.celess.blog.entity.Response;
 import cn.celess.blog.entity.model.ArticleModel;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.request.ArticleReq;
 import cn.celess.blog.service.ArticleService;
 import cn.celess.blog.util.RedisUserUtil;
@@ -11,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author : xiaohai
@@ -110,8 +113,9 @@ public class ArticleController {
      */
     @GetMapping("/admin/articles")
     public Response adminArticles(@RequestParam(name = "page", defaultValue = "1") int page,
-                                  @RequestParam(name = "count", defaultValue = "10") int count) {
+                                  @RequestParam(name = "count", defaultValue = "10") int count,
-        return Response.success(articleService.adminArticles(count, page));
+                                  @RequestParam(name = "deleted", defaultValue = "false") boolean deleted) {
+        return Response.success(articleService.adminArticles(count, page, deleted));
     }
 
     /**

src/main/java/cn/celess/blog/service/ArticleService.java

@@ -52,7 +52,7 @@ public interface ArticleService {
      * @param page  数据页
      * @return 分页数据
      */
-    PageData<ArticleModel> adminArticles(int count, int page);
+    PageData<ArticleModel> adminArticles(int count, int page, boolean deleted);
 
     /**
      * 获取文章状态为开放的文章

src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java

@@ -22,10 +22,12 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import sun.security.krb5.internal.PAData;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -273,21 +275,24 @@ public class ArticleServiceImpl implements ArticleService {
 
     /**
      * @param count 数目
-     * @param page  页面 默认减1
+     * @param page  页面
      * @return PageInfo
      */
     @Override
-    public PageData<ArticleModel> adminArticles(int count, int page) {
+    public PageData<ArticleModel> adminArticles(int count, int page, boolean deleted) {
-        PageHelper.startPage(page, count, "articleId desc");
         List<Article> articleList = articleMapper.findAll();
-        PageData<ArticleModel> pageData = new PageData<ArticleModel>(new PageInfo<Article>(articleList));
+
-        List<ArticleModel> articleModelList = new ArrayList<>();
+        PageData<ArticleModel> pageData = new PageData<>(null, 0, count, page);
-        articleList.forEach(article -> {
+        List<Article> collect = articleList.stream().filter(article -> article.isDeleted() == deleted).collect(Collectors.toList());
-            ArticleModel articleModel = ModalTrans.article(article);
+        pageData.setTotal(collect.size());
-            articleModel.setMdContent(null);
+        List<ArticleModel> articleModels = collect.stream()
-            articleModelList.add(articleModel);
+                .peek(article -> article.setMdContent(null))
-        });
+                .map(ModalTrans::article)
-        pageData.setList(articleModelList);
+                .skip((page - 1) * count)
+                .limit(count)
+                .collect(Collectors.toList());
+        pageData.setList(articleModels);
+
         return pageData;
     }
 

src/main/resources/mapper/articleMapper.xml

@@ -154,7 +154,7 @@
     <select id="findAll" resultMap="articleViewResultMap">
         select *
         from articleView
-        where isDelete = false
+        order by articleId desc
     </select>
 
 

src/test/java/cn/celess/blog/controller/ArticleControllerTest.java

@@ -272,9 +272,12 @@ public class ArticleControllerTest extends BaseTest {
             getMockData("/admin/articles?page=1&count=10", userLogin()).andDo(result ->
                     assertEquals(PERMISSION_ERROR.getCode(), mapper.readValue(result.getResponse().getContentAsString(), Response.class).getCode())
             );
+            for (int i = 0; i < 2; i++) {
                 // admin权限登陆
-            getMockData("/admin/articles?page=1&count=10", adminLogin()).andDo(result -> {
+                int finalI = i;
-                Response<PageData<ArticleModel>> response = mapper.readValue(result.getResponse().getContentAsString(), new TypeReference<Response<PageData<ArticleModel>>>(){});
+                getMockData("/admin/articles?page=1&count=10&deleted=" + (i == 1), adminLogin()).andDo(result -> {
+                    Response<PageData<ArticleModel>> response = mapper.readValue(result.getResponse().getContentAsString(), new TypeReference<Response<PageData<ArticleModel>>>() {
+                    });
                     assertEquals(SUCCESS.getCode(), response.getCode());
                     assertNotNull(response.getResult());
                     // 判断pageInfo是否包装完全
@@ -292,9 +295,11 @@ public class ArticleControllerTest extends BaseTest {
                         assertNotNull(a.getReadingNumber());
                         assertNotNull(a.getLikeCount());
                         assertNotNull(a.getDislikeCount());
+                        assertEquals((finalI == 1),a.isDeleted());
                         assertNull(a.getMdContent());
                     }
                 });
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }