findAll

houko · houko · commit f394881256c6 · 2016-04-06T00:16:36.000+08:00
diff --git a/admin/src/main/java/info/xiaomo/admin/controller/UserController.java b/admin/src/main/java/info/xiaomo/admin/controller/UserController.java
@@ -62,7 +62,7 @@ public HashMap<String, Object> findUserById(@RequestParam("id") Long id) {
      */
     @RequestMapping(value = "findAll", method = RequestMethod.GET)
     public HashMap<String, Object> getAll(@RequestParam("start") int start, @RequestParam("pageSize") int page) {
-        Page<UserModel> pages = service.getUsers(new PageRequest(start - 1, page));
+        Page<UserModel> pages = service.findAll(new PageRequest(start - 1, page));
         result.put(code, success);
         result.put("users", pages);
         return result;
diff --git a/admin/src/test/java/info/xiaomo/admin/test/UserControllerTest.java b/admin/src/test/java/info/xiaomo/admin/test/UserControllerTest.java
@@ -0,0 +1,45 @@
+package info.xiaomo.admin.test;
+
+import info.xiaomo.admin.test.base.BaseTest;
+import info.xiaomo.core.model.UserModel;
+import info.xiaomo.core.service.UserService;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+
+/**
+ * │＼＿＿╭╭╭╭╭＿＿／│
+ * │　　　　　　　　　│
+ * │　　　　　　　　　│
+ * │　－　　　　　　－│
+ * │≡　　　　ｏ　≡   │
+ * │　　　　　　　　　│
+ * ╰——┬Ｏ◤▽◥Ｏ┬——╯
+ * ｜　　ｏ　　｜
+ * ｜╭－－－╮把今天最好的表现当作明天最新的起点．．～
+ * いま 最高の表現 として 明日最新の始発．．～
+ * Today the best performance  as tomorrow newest starter!
+ * Created by IntelliJ IDEA.
+ *
+ * @author: xiaomo
+ * @github: https://github.com/qq83387856
+ * @email: hupengbest@163.com
+ * @QQ_NO: 83387856
+ * @Date: 16/4/5 23:41
+ * @Description: admin测试
+ * @Copyright(©) 2015 by xiaomo.
+ */
+public class UserControllerTest extends BaseTest {
+
+    @Autowired
+    private UserService service;
+
+    @Test
+    public void testFindAll() {
+        Page<UserModel> all = service.findAll(new PageRequest(0, 5));
+        for (UserModel userModel : all) {
+            System.out.println(userModel.getNickName());
+        }
+    }
+}
diff --git a/core/src/main/java/info/xiaomo/core/service/UserService.java b/core/src/main/java/info/xiaomo/core/service/UserService.java
@@ -30,7 +30,7 @@ public interface UserService {
 
     UserModel updateUser(UserModel model) throws UserNotFoundException;
 
-    Page<UserModel> getUsers(Pageable pageable);
+    Page<UserModel> findAll(Pageable pageable);
 
     UserModel deleteUserById(Long id) throws UserNotFoundException;
 
diff --git a/core/src/main/java/info/xiaomo/core/service/impl/UserServiceImpl.java b/core/src/main/java/info/xiaomo/core/service/impl/UserServiceImpl.java
@@ -86,7 +86,7 @@ public UserModel updateUser(UserModel model) throws UserNotFoundException {
     }
 
     @Override
-    public Page<UserModel> getUsers(Pageable pageable) {
+    public Page<UserModel> findAll(Pageable pageable) {
         return dao.findAll(pageable);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public UserModel updateUser(UserModel model) throws UserNotFoundException {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Override`
`89`		`- public Page<UserModel> getUsers(Pageable pageable) {`
	`89`	`+ public Page<UserModel> findAll(Pageable pageable) {`
`90`	`90`	`return dao.findAll(pageable);`
`91`	`91`	`}`
`92`	`92`