add:分页插件
This commit is contained in:
@@ -49,7 +49,17 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.github.pagehelper</groupId>
|
||||||
|
<artifactId>pagehelper-spring-boot-starter</artifactId>
|
||||||
|
<version>1.2.12</version>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.mybatis</groupId>
|
||||||
|
<artifactId>mybatis</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
<!--Spring boot Web容器-->
|
<!--Spring boot Web容器-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ public class UserController {
|
|||||||
@ApiOperation("查询用户")
|
@ApiOperation("查询用户")
|
||||||
@GetMapping
|
@GetMapping
|
||||||
public ResponseEntity<Object> query(UserQuery query, PageQuery page){
|
public ResponseEntity<Object> query(UserQuery query, PageQuery page){
|
||||||
return new ResponseEntity(TableDataInfo.build(userService.getUserDetail(query, page)),HttpStatus.OK);
|
return new ResponseEntity(userService.getUserDetail(query, page),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Log("新增用户")
|
@Log("新增用户")
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package org.nl.system.service.user;
|
package org.nl.system.service.user;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
import org.nl.common.TableDataInfo;
|
||||||
import org.nl.common.domain.query.PageQuery;
|
import org.nl.common.domain.query.PageQuery;
|
||||||
import org.nl.system.service.user.dao.SysUser;
|
import org.nl.system.service.user.dao.SysUser;
|
||||||
import org.nl.system.service.user.dto.SysUserDetail;
|
import org.nl.system.service.user.dto.SysUserDetail;
|
||||||
@@ -23,7 +24,7 @@ public interface ISysUserService extends IService<SysUser> {
|
|||||||
|
|
||||||
Map<String, String> updateAvatar(MultipartFile avatar);
|
Map<String, String> updateAvatar(MultipartFile avatar);
|
||||||
|
|
||||||
List<SysUserDetail> getUserDetail(UserQuery query, PageQuery pageQuery);
|
TableDataInfo<SysUserDetail> getUserDetail(UserQuery query, PageQuery pageQuery);
|
||||||
|
|
||||||
void create(Map userDetail);
|
void create(Map userDetail);
|
||||||
|
|
||||||
|
|||||||
@@ -5,10 +5,13 @@ import cn.hutool.core.util.ObjectUtil;
|
|||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import com.github.pagehelper.Page;
|
||||||
|
import com.github.pagehelper.PageHelper;
|
||||||
import lombok.SneakyThrows;
|
import lombok.SneakyThrows;
|
||||||
import org.apache.commons.beanutils.BeanUtils;
|
import org.apache.commons.beanutils.BeanUtils;
|
||||||
import org.apache.commons.beanutils.ConvertUtils;
|
import org.apache.commons.beanutils.ConvertUtils;
|
||||||
import org.apache.commons.beanutils.Converter;
|
import org.apache.commons.beanutils.Converter;
|
||||||
|
import org.nl.common.TableDataInfo;
|
||||||
import org.nl.common.domain.query.PageQuery;
|
import org.nl.common.domain.query.PageQuery;
|
||||||
import org.nl.common.utils.IdUtil;
|
import org.nl.common.utils.IdUtil;
|
||||||
import org.nl.common.utils.SecurityUtils;
|
import org.nl.common.utils.SecurityUtils;
|
||||||
@@ -69,9 +72,12 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<SysUserDetail> getUserDetail(UserQuery query, PageQuery pageQuery) {
|
public TableDataInfo<SysUserDetail> getUserDetail(UserQuery query, PageQuery pageQuery) {
|
||||||
|
Page<Object> page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize());
|
||||||
List<SysUserDetail> userDetail = sysUserMapper.getUserDetail(query, pageQuery);
|
List<SysUserDetail> userDetail = sysUserMapper.getUserDetail(query, pageQuery);
|
||||||
return userDetail;
|
TableDataInfo<SysUserDetail> build = TableDataInfo.build(userDetail);
|
||||||
|
build.setTotalElements(page.getTotal());
|
||||||
|
return build;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user