From 4e383b659843f0f85d6eec04edca9bef4b35ad48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= <zh56462271@qq.com>
Date: Mon, 25 May 2020 22:48:57 +0800
Subject: [PATCH] =?UTF-8?q?Service=E5=B1=82=E4=BF=AE=E6=94=B9=20=20?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/celess/blog/service/VisitorService.java |  3 ++-
 .../service/serviceimpl/VisitorServiceImpl.java     |  7 +++----
 .../blog/controller/VisitorControllerTest.java      | 13 ++++++-------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/cn/celess/blog/service/VisitorService.java b/src/main/java/cn/celess/blog/service/VisitorService.java
index 8f6f595..cd3348a 100644
--- a/src/main/java/cn/celess/blog/service/VisitorService.java
+++ b/src/main/java/cn/celess/blog/service/VisitorService.java
@@ -1,5 +1,6 @@
 package cn.celess.blog.service;
 
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.model.VisitorModel;
 import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;
@@ -20,7 +21,7 @@ public interface VisitorService {
      * @param showLocation 是否显示位置信息 开启改选项数据响应超慢
      * @return 分页数据
      */
-    PageInfo<VisitorModel> visitorPage(int page, int count, boolean showLocation);
+    PageData<VisitorModel> visitorPage(int page, int count, boolean showLocation);
 
     /**
      * 新增访客
diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java
index d1d7fc3..dbfac93 100644
--- a/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java
+++ b/src/main/java/cn/celess/blog/service/serviceimpl/VisitorServiceImpl.java
@@ -2,6 +2,7 @@ package cn.celess.blog.service.serviceimpl;
 
 import cn.celess.blog.enmu.ResponseEnum;
 import cn.celess.blog.entity.Visitor;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.model.VisitorModel;
 import cn.celess.blog.exception.MyException;
 import cn.celess.blog.mapper.VisitorMapper;
@@ -45,12 +46,10 @@ public class VisitorServiceImpl implements VisitorService {
     }
 
     @Override
-    public PageInfo<VisitorModel> visitorPage(int page, int count, boolean showLocation) {
+    public PageData<VisitorModel> visitorPage(int page, int count, boolean showLocation) {
         PageHelper.startPage(page, count);
         List<Visitor> visitorList = visitorMapper.findAll();
-        PageInfo pageInfo = new PageInfo(visitorList);
-        pageInfo.setList(list2List(visitorList, showLocation));
-        return pageInfo;
+        return new PageData<VisitorModel>(new PageInfo<Visitor>(visitorList), list2List(visitorList, showLocation));
     }
 
     @Override
diff --git a/src/test/java/cn/celess/blog/controller/VisitorControllerTest.java b/src/test/java/cn/celess/blog/controller/VisitorControllerTest.java
index fa13818..c65d27d 100644
--- a/src/test/java/cn/celess/blog/controller/VisitorControllerTest.java
+++ b/src/test/java/cn/celess/blog/controller/VisitorControllerTest.java
@@ -1,6 +1,7 @@
 package cn.celess.blog.controller;
 
 import cn.celess.blog.BaseTest;
+import cn.celess.blog.entity.model.PageData;
 import cn.celess.blog.entity.model.VisitorModel;
 import com.github.pagehelper.PageInfo;
 import net.sf.json.JSONObject;
@@ -31,13 +32,11 @@ public class VisitorControllerTest extends BaseTest {
                     JSONObject object = JSONObject.fromObject(result.getResponse().getContentAsString());
                     assertEquals(SUCCESS.getCode(), object.getInt(Code));
                     JSONObject resultJson = JSONObject.fromObject(object.getJSONObject(Result));
-                    PageInfo pageInfo = (PageInfo) JSONObject.toBean(resultJson, PageInfo.class);
-                    assertNotEquals(0, pageInfo.getTotal());
-                    assertNotEquals(0, pageInfo.getStartRow());
-                    assertNotEquals(0, pageInfo.getEndRow());
-                    assertEquals(1, pageInfo.getPageNum());
-                    assertEquals(10, pageInfo.getPageSize());
-                    for (Object ver : pageInfo.getList()) {
+                    PageData<VisitorModel> pageData = (PageData<VisitorModel>) JSONObject.toBean(resultJson, PageData.class);
+                    assertNotEquals(0, pageData.getTotal());
+                    assertEquals(1, pageData.getPageNum());
+                    assertEquals(10, pageData.getPageSize());
+                    for (Object ver : pageData.getList()) {
                         VisitorModel v = (VisitorModel) JSONObject.toBean(JSONObject.fromObject(ver), VisitorModel.class);
                         assertNotEquals(0, v.getId());
                         assertNotNull(v.getDate());