分页从1开始

sso-common/src/test/java/test/Test.java

@@ -0,0 +1,36 @@
+package test;
+
+import com.alibaba.fastjson.JSON;
+import com.uas.sso.ResultWrap;
+import com.uas.sso.common.util.HttpUtil;
+import com.uas.sso.entity.UserView;
+import org.springframework.ui.ModelMap;
+
+import static com.alibaba.fastjson.JSON.parseObject;
+
+/**
+ * @author wangmh
+ * @create 2018-02-09 14:03
+ * @desc 测试
+ **/
+public class Test {
+
+    public static void main(String[] args) throws Exception {
+        String url = "http://192.168.253.66:8081/api/user";
+        url = url + "/info";
+        ModelMap data = new ModelMap();
+        data.put("userUU", 10000L);
+        HttpUtil.ResponseWrap res = HttpUtil.doGet(url, data);
+        if (!res.isSuccess()) {
+            throw new Exception(res.getContent());
+        } else {
+            ResultWrap result = parseObject(res.getContent(), ResultWrap.class);
+            if (!result.isSuccess()) {
+                throw new Exception(result.getErrMsg());
+            } else if (result.getContent() != null) {
+                UserView userView =  JSON.parseObject(result.getContent().toString(), UserView.class);
+                System.out.println(userView);
+            }
+        }
+    }
+}

sso-server/src/main/java/com/uas/sso/controller/LoginController.java

@@ -359,7 +359,7 @@ public class LoginController extends BaseController {
         if (StringUtils.isEmpty(username)) {
             return error("用户名不能为空");
         }
-        return success(userService.getPwdErrorCount(username));
+        return success(userService.getPwdErrorCount(username.trim()));
     }
 
     /**

sso-server/src/main/java/com/uas/sso/controller/YunCenterController.java

@@ -81,7 +81,7 @@ public class YunCenterController extends BaseController {
      */
     @RequestMapping(value = "/apply/info", method = RequestMethod.GET)
     @ResponseBody
-    public ModelMap findApplyAll(@RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "20") int size) {
+    public ModelMap findApplyAll(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "20") int size) {
         UserAccount userAccount = SystemSession.getUserAccount();
         if (userAccount.getSpaceUU() == null) {
             return error(Const.SPACEUU_PERSONAL+"", "个人账号");
@@ -99,7 +99,7 @@ public class YunCenterController extends BaseController {
      */
     @RequestMapping(value = "/member/info", method = RequestMethod.GET)
     @ResponseBody
-    public ModelMap findMemberAll(@RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "20") int size) {
+    public ModelMap findMemberAll(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "20") int size) {
         UserAccount userAccount = getLoginUser();
         if (userAccount.getSpaceUU() == null) {
             return error(Const.SPACEUU_PERSONAL+"", "个人账号");

sso-server/src/main/java/com/uas/sso/service/impl/ApplyUserSpaceServiceImpl.java

@@ -80,7 +80,7 @@ public class ApplyUserSpaceServiceImpl implements ApplyUserSpaceService {
 
     @Override
     public Page<ApplyUserSpace> findApplyAll(Integer pageNumber, Integer pageSize, Long spaceUU) {
-        Pageable pageable = new PageRequest(pageNumber, pageSize);
+        Pageable pageable = PageInfo.pageRequest(new PageRequest(pageNumber, pageSize));
         Page<ApplyUserSpace> page = applyUserSpaceDao.findAll(new Specification<ApplyUserSpace>() {
             @Override
             public Predicate toPredicate(Root<ApplyUserSpace> root,
@@ -92,8 +92,7 @@ public class ApplyUserSpaceServiceImpl implements ApplyUserSpaceService {
                 return cb.and(predicates);
             }
         }, pageable);
-
-        return page;
+        return new PageInfo<>(page.getContent(), pageable, page.getTotalElements());
     }
 
     @Override
@@ -108,8 +107,8 @@ public class ApplyUserSpaceServiceImpl implements ApplyUserSpaceService {
 
     @Override
     public Page<ApplyUserSpace> findUserApply(Integer pageNumber, Integer pageSize, Long userUU) {
-        Pageable pageable = new PageRequest(pageNumber, pageSize);
-        return applyUserSpaceDao.findAll(new Specification<ApplyUserSpace>() {
+        Pageable pageable = PageInfo.pageRequest(new PageRequest(pageNumber, pageSize));
+        Page<ApplyUserSpace> page =  applyUserSpaceDao.findAll(new Specification<ApplyUserSpace>() {
             @Override
             public Predicate toPredicate(Root<ApplyUserSpace> root,
                                          CriteriaQuery<?> query, CriteriaBuilder cb) {
@@ -120,6 +119,7 @@ public class ApplyUserSpaceServiceImpl implements ApplyUserSpaceService {
                 return cb.and(predicates);
             }
         }, pageable);
+        return new PageInfo<>(page.getContent(), pageable, page.getTotalElements());
     }
 
     @Override
@@ -182,6 +182,6 @@ public class ApplyUserSpaceServiceImpl implements ApplyUserSpaceService {
                 return cb.and(predicates);
             }
         }, pageable);
-        return pApply;
+        return new PageInfo<>(pApply.getContent(), pageable, pApply.getTotalElements());
     }
 }

sso-server/src/main/java/com/uas/sso/service/impl/UserServiceImpl.java

@@ -332,7 +332,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public Page<User> findMemberBySpaceUU(int page, int size, Long spaceUU) {
-        Pageable pageable = new PageRequest(page, size);
+        Pageable pageable = PageInfo.pageRequest(new PageRequest(page, size));
         Page<User> pUsers = userDao.findAll(new Specification<User>() {
             @Override
             public Predicate toPredicate(Root<User> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
@@ -343,7 +343,7 @@ public class UserServiceImpl implements UserService {
                 return cb.and(predicates);
             }
         }, pageable);
-        return pUsers;
+        return new PageInfo<User>(pUsers.getContent(), pageable, pUsers.getTotalElements());
     }
 
     @Override