用户和角色分页修改

purchase-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java

@@ -1,10 +1,20 @@
 package com.ozs.web.controller.system;
 
+import java.net.UnknownHostException;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.base.domain.BasePolicy;
+import com.ozs.base.vo.BasePolicyPageReqVo;
+import com.ozs.common.constant.ModularConstans;
 import com.ozs.common.core.domain.R;
+import com.ozs.common.utils.file.FileUtils;
+import com.ozs.common.vo.EsMessage;
 import com.ozs.system.domain.vo.requestVo.SysMenuIdsRequestVo;
 import com.ozs.system.domain.vo.requestVo.SysRoleRequestVo;
 import com.ozs.system.domain.vo.requestVo.SysStatusRequestVo;
@@ -14,6 +24,7 @@ import org.apache.lucene.search.similarities.Distribution;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -67,14 +78,25 @@ public class SysRoleController extends BaseController
     @Autowired
     private ISysDeptService deptService;
 
+//    @PreAuthorize("@ss.hasPermi('system:role:list')")
+//    @GetMapping("/list")
+//    @ApiOperation("根据条件分页查询角色数据")
+//    public TableDataInfo list(SysRole role)
+//    {
+//        startPage();
+//        List<SysRole> list = roleService.selectRoleList(role);
+//        return getDataTable(list);
+//    }
+
     @PreAuthorize("@ss.hasPermi('system:role:list')")
-    @GetMapping("/list")
+    @PostMapping("/list")
     @ApiOperation("根据条件分页查询角色数据")
-    public TableDataInfo list(SysRole role)
-    {
-        startPage();
-        List<SysRole> list = roleService.selectRoleList(role);
-        return getDataTable(list);
+    public AjaxResult page(@NotEmpty(message = "数据为空")
+                           @RequestBody SysRoleRequestVo vo) {
+        LambdaQueryWrapper<SysRole> lw = new LambdaQueryWrapper<>();
+        IPage<SysRole> page = roleService.page(new Page<>(vo.getPageNum(), vo.getPageSize()), lw);
+        return success(page);
+
     }
 
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)

purchase-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -4,6 +4,10 @@ import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ozs.system.domain.vo.requestVo.SysUserPageRequestVo;
 import com.ozs.system.domain.vo.requestVo.SysUserRequestVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -60,17 +64,30 @@ public class SysUserController extends BaseController
     @Autowired
     private ISysPostService postService;
 
+//    /**
+//     * 获取用户列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('system:user:list')")
+//    @GetMapping("/list")
+//    @ApiOperation("获取用户列表")
+//    public TableDataInfo list(SysUser user)
+//    {
+//        startPage();
+//        List<SysUser> list = userService.selectUserList(user);
+//        return getDataTable(list);
+//    }
+
     /**
      * 获取用户列表
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
-    @GetMapping("/list")
+    @PostMapping("/list")
     @ApiOperation("获取用户列表")
-    public TableDataInfo list(SysUser user)
+    public AjaxResult list(@RequestBody SysUserPageRequestVo sysUserPageRequestVo)
     {
-        startPage();
-        List<SysUser> list = userService.selectUserList(user);
-        return getDataTable(list);
+        LambdaQueryWrapper<SysUser> lw = new LambdaQueryWrapper<>();
+        IPage<SysUser> page = userService.page(new Page<>(sysUserPageRequestVo.getPageNum(), sysUserPageRequestVo.getPageSize()), lw);
+        return success(page);
     }
 
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)

purchase-common/src/main/java/com/ozs/common/core/domain/BaseEntity.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -23,6 +25,7 @@ public class BaseEntity implements Serializable
     /** 搜索值 */
     @JsonIgnore
     @ApiModelProperty("搜索值")
+    @TableField(exist = false)
     private String searchValue;
 
     /** 创建者 */
@@ -50,6 +53,7 @@ public class BaseEntity implements Serializable
     /** 请求参数 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     @ApiModelProperty("请求参数")
+    @TableField(exist = false)
     private Map<String, Object> params;
 
     public String getSearchValue()

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysMenu.java

@@ -76,7 +76,7 @@ public class SysMenu extends BaseEntity
         this.menuId = menuId;
     }
 
-    @NotBlank(message = "菜单名称不能为空")
+//    @NotBlank(message = "菜单名称不能为空")
     @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符")
     public String getMenuName()
     {
@@ -108,7 +108,7 @@ public class SysMenu extends BaseEntity
         this.parentId = parentId;
     }
 
-    @NotNull(message = "显示顺序不能为空")
+//    @NotNull(message = "显示顺序不能为空")
     public Integer getOrderNum()
     {
         return orderNum;
@@ -171,7 +171,7 @@ public class SysMenu extends BaseEntity
         this.isCache = isCache;
     }
 
-    @NotBlank(message = "菜单类型不能为空")
+//    @NotBlank(message = "菜单类型不能为空")
     public String getMenuType()
     {
         return menuType;

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysRole.java

@@ -4,6 +4,8 @@ import java.util.Set;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ozs.common.annotation.Excel;
@@ -55,15 +57,19 @@ public class SysRole extends BaseEntity
     private String delFlag;
 
     /** 用户是否存在此角色标识 默认不存在 */
+    @TableField(exist = false)
     private boolean flag = false;
 
     /** 菜单组 */
+    @TableField(exist = false)
     private Long[] menuIds;
 
     /** 部门组（数据权限） */
+    @TableField(exist = false)
     private Long[] deptIds;
 
     /** 角色菜单权限 */
+    @TableField(exist = false)
     private Set<String> permissions;
 
     public SysRole()

purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysUser.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ozs.common.config.PurchaseConfig;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -77,18 +78,23 @@ public class SysUser extends BaseEntity
         @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
         @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
     })
+    @TableField(exist = false)
     private SysDept dept;
 
     /** 角色对象 */
+    @TableField(exist = false)
     private List<SysRole> roles;
 
     /** 角色组 */
+    @TableField(exist = false)
     private Long[] roleIds;
 
     /** 岗位组 */
+    @TableField(exist = false)
     private Long[] postIds;
 
     /** 角色ID */
+    @TableField(exist = false)
     private Long roleId;
 
     public SysUser()

purchase-system/src/main/java/com/ozs/system/domain/vo/requestVo/SysRoleRequestVo.java

@@ -1,13 +1,18 @@
 package com.ozs.system.domain.vo.requestVo;
 
+import com.ozs.common.vo.PageVo;
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
  * @author Administrator
  */
-public class SysRoleRequestVo implements Serializable {
+@Data
+public class SysRoleRequestVo extends PageVo implements Serializable {
     private static final long serialVersionUID = 1L;
     private String roleName;
     private String status;
     private String roleRemarks;
+    private Long roleId;
 }

purchase-system/src/main/java/com/ozs/system/domain/vo/requestVo/SysUserPageRequestVo.java

@@ -0,0 +1,16 @@
+package com.ozs.system.domain.vo.requestVo;
+
+import com.ozs.common.vo.PageVo;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class SysUserPageRequestVo extends PageVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String nickName;
+    private Long deptId;
+}

purchase-system/src/main/java/com/ozs/system/domain/vo/requestVo/SysUserRequestVo.java

@@ -1,10 +1,13 @@
 package com.ozs.system.domain.vo.requestVo;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
  * @author Administrator
  */
+@Data
 public class SysUserRequestVo implements Serializable {
     private static final long serialVersionUID = 1L;
     private String nickName;

purchase-system/src/main/java/com/ozs/system/mapper/SysRoleMapper.java

@@ -1,6 +1,9 @@
 package com.ozs.system.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.base.domain.BasePolicy;
 import com.ozs.common.core.domain.entity.SysRole;
 
 /**
@@ -8,7 +11,7 @@ import com.ozs.common.core.domain.entity.SysRole;
  *
  * @author ruoyi
  */
-public interface SysRoleMapper
+public interface SysRoleMapper extends BaseMapper<SysRole>
 {
     /**
      * 根据条件分页查询角色数据

purchase-system/src/main/java/com/ozs/system/mapper/SysUserMapper.java

@@ -1,6 +1,9 @@
 package com.ozs.system.mapper;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.common.core.domain.entity.SysRole;
 import org.apache.ibatis.annotations.Param;
 import com.ozs.common.core.domain.entity.SysUser;
 
@@ -9,7 +12,7 @@ import com.ozs.common.core.domain.entity.SysUser;
  *
  * @author ruoyi
  */
-public interface SysUserMapper
+public interface SysUserMapper extends BaseMapper<SysUser>
 {
     /**
      * 根据条件分页查询用户列表

purchase-system/src/main/java/com/ozs/system/service/ISysRoleService.java

@@ -3,7 +3,7 @@ package com.ozs.system.service;
 import java.util.List;
 import java.util.Set;
 
-import com.ozs.common.core.domain.AjaxResult;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.common.core.domain.entity.SysRole;
 import com.ozs.system.domain.SysUserRole;
 import com.ozs.system.domain.vo.requestVo.SysMenuIdsRequestVo;
@@ -14,7 +14,7 @@ import com.ozs.system.domain.vo.requestVo.SysStatusRequestVo;
  *
  * @author ruoyi
  */
-public interface ISysRoleService
+public interface ISysRoleService extends IService<SysRole>
 {
     /**
      * 根据条件分页查询角色数据

purchase-system/src/main/java/com/ozs/system/service/ISysUserService.java

@@ -1,6 +1,9 @@
 package com.ozs.system.service;
 
 import java.util.List;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ozs.common.core.domain.entity.SysRole;
 import com.ozs.common.core.domain.entity.SysUser;
 
 /**
@@ -8,7 +11,7 @@ import com.ozs.common.core.domain.entity.SysUser;
  *
  * @author ruoyi
  */
-public interface ISysUserService
+public interface ISysUserService extends IService<SysUser>
 {
     /**
      * 根据条件分页查询用户列表

purchase-system/src/main/java/com/ozs/system/service/impl/SysRoleServiceImpl.java

@@ -6,6 +6,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ozs.base.domain.BasePolicy;
+import com.ozs.base.mapper.BasePolicyMapper;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.system.domain.SysRoleDept;
 import com.ozs.system.domain.SysRoleMenu;
@@ -35,7 +38,7 @@ import com.ozs.system.mapper.SysUserRoleMapper;
  * @author ruoyi
  */
 @Service
-public class SysRoleServiceImpl implements ISysRoleService {
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
     @Autowired
     private SysRoleMapper roleMapper;
 

purchase-system/src/main/java/com/ozs/system/service/impl/SysUserServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ozs.system.domain.SysPost;
 import com.ozs.system.domain.SysUserPost;
 import com.ozs.system.domain.SysUserRole;
@@ -37,7 +38,7 @@ import com.ozs.system.mapper.SysUserRoleMapper;
  * @author ruoyi
  */
 @Service
-public class SysUserServiceImpl implements ISysUserService
+public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService 
 {
     private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
 

purchase-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -111,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="roleId != null and roleId != 0">#{roleId},</if>
  			<if test="roleName != null and roleName != ''">#{roleName},</if>
  			<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
-		    <if test="roleRemarks != null and roleRemarks != ''">#{role_remarks},</if>
+		    <if test="roleRemarks != null and roleRemarks != ''">#{roleRemarks},</if>
  			<if test="roleSort != null">#{roleSort},</if>
  			<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
  			<if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
@@ -128,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		<set>
  			<if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
  			<if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
+			<if test="roleRemarks != null and roleRemarks != ''">role_remarks = #{roleRemarks},</if>
  			<if test="roleSort != null">role_sort = #{roleSort},</if>
  			<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
  			<if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>