feat:分页查询
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
package com.xiang.xservice.auth.server.controller;
|
package com.xiang.xservice.auth.server.controller;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
|
import com.github.pagehelper.PageInfo;
|
||||||
import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
|
import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
|
||||||
import com.xiang.xservice.auth.api.dto.req.user.UserDeptUpdateRequest;
|
import com.xiang.xservice.auth.api.dto.req.user.UserDeptUpdateRequest;
|
||||||
import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest;
|
import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest;
|
||||||
@@ -32,7 +33,7 @@ public class UserController {
|
|||||||
private final XUserService userService;
|
private final XUserService userService;
|
||||||
|
|
||||||
@PostMapping("/private/user/list")
|
@PostMapping("/private/user/list")
|
||||||
public Result<UserResp> getUserList(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserQueryRequest request) {
|
public Result<PageInfo<UserResp>> getUserList(@RequestBody @Valid @NotNull(message = "请求参数不能为空") UserQueryRequest request) {
|
||||||
return Result.success(userService.getUserList(request));
|
return Result.success(userService.getUserList(request));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.xiang.xservice.auth.service.convert;
|
package com.xiang.xservice.auth.service.convert;
|
||||||
|
|
||||||
|
import com.github.pagehelper.PageInfo;
|
||||||
import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
|
import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
|
||||||
import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest;
|
import com.xiang.xservice.auth.api.dto.req.user.UserQueryRequest;
|
||||||
import com.xiang.xservice.auth.api.dto.req.user.UserUpdateRequest;
|
import com.xiang.xservice.auth.api.dto.req.user.UserUpdateRequest;
|
||||||
@@ -8,8 +9,6 @@ import com.xiang.xservice.auth.service.entity.XUser;
|
|||||||
import org.mapstruct.Mapper;
|
import org.mapstruct.Mapper;
|
||||||
import org.mapstruct.factory.Mappers;
|
import org.mapstruct.factory.Mappers;
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Mapper(componentModel = "spring")
|
@Mapper(componentModel = "spring")
|
||||||
public interface XUserConvert {
|
public interface XUserConvert {
|
||||||
XUserConvert INSTANCE = Mappers.getMapper(XUserConvert.class);
|
XUserConvert INSTANCE = Mappers.getMapper(XUserConvert.class);
|
||||||
@@ -18,7 +17,7 @@ public interface XUserConvert {
|
|||||||
XUser toDO (UserAddRequest request);
|
XUser toDO (UserAddRequest request);
|
||||||
XUser toDO (UserUpdateRequest request);
|
XUser toDO (UserUpdateRequest request);
|
||||||
|
|
||||||
List<UserResp> toRespList(List<XUser> list);
|
PageInfo<UserResp> toPage(PageInfo<XUser> list);
|
||||||
|
|
||||||
UserResp toResp(XUser user);
|
UserResp toResp(XUser user);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.xiang.xservice.auth.service.service;
|
package com.xiang.xservice.auth.service.service;
|
||||||
|
|
||||||
|
import com.github.pagehelper.PageInfo;
|
||||||
import com.xiang.xservice.auth.api.dto.req.LoginRequest;
|
import com.xiang.xservice.auth.api.dto.req.LoginRequest;
|
||||||
import com.xiang.xservice.auth.api.dto.req.RegisterRequest;
|
import com.xiang.xservice.auth.api.dto.req.RegisterRequest;
|
||||||
import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
|
import com.xiang.xservice.auth.api.dto.req.user.UserAddRequest;
|
||||||
@@ -22,7 +23,7 @@ public interface XUserService {
|
|||||||
|
|
||||||
RegisterResp userRegister(RegisterRequest request);
|
RegisterResp userRegister(RegisterRequest request);
|
||||||
|
|
||||||
List<UserResp> getUserList(UserQueryRequest request);
|
PageInfo<UserResp> getUserList(UserQueryRequest request);
|
||||||
|
|
||||||
UserResp getUserInfo(Long id);
|
UserResp getUserInfo(Long id);
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.xiang.xservice.auth.service.service.impl;
|
package com.xiang.xservice.auth.service.service.impl;
|
||||||
|
|
||||||
import com.github.pagehelper.PageHelper;
|
import com.github.pagehelper.PageHelper;
|
||||||
|
import com.github.pagehelper.PageInfo;
|
||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
import com.xiang.xservice.auth.api.code.Code01UserErrorCode;
|
import com.xiang.xservice.auth.api.code.Code01UserErrorCode;
|
||||||
import com.xiang.xservice.auth.api.code.Code02RoleErrorCode;
|
import com.xiang.xservice.auth.api.code.Code02RoleErrorCode;
|
||||||
@@ -181,13 +182,14 @@ public class XUserServiceImpl implements XUserService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<UserResp> getUserList(UserQueryRequest request) {
|
public PageInfo<UserResp> getUserList(UserQueryRequest request) {
|
||||||
PageHelper.startPage(request.getCurrent(), request.getPageSize());
|
PageHelper.startPage(request.getCurrent(), request.getPageSize());
|
||||||
List<XUser> userList = userMapper.getUserList(userConvert.toDO(request));
|
List<XUser> userList = userMapper.getUserList(userConvert.toDO(request));
|
||||||
if (CollectionUtils.isEmpty(userList)) {
|
if (CollectionUtils.isEmpty(userList)) {
|
||||||
return Lists.newArrayList();
|
return new PageInfo<>();
|
||||||
}
|
}
|
||||||
return userConvert.toRespList(userList);
|
PageInfo<XUser> pageInfo = new PageInfo<>(userList);
|
||||||
|
return userConvert.toPage(pageInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user