合并

src/main/java/com.huiju.welcome/controller/SysUserController.java

@@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.welcome.common.base.BaseController;
 import com.huiju.welcome.common.base.ResponseBean;
-import com.huiju.welcome.model.SysUser;
-import com.huiju.welcome.model.TaPerson;
+import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.ISysUserService;
 import com.huiju.welcome.utils.Encrypt;
 import com.huiju.welcome.utils.StatusUtils;
@@ -240,4 +239,42 @@ public class SysUserController extends BaseController {
 
         return true;
     }
+
+    @ApiOperation(value = "员工管理列表", notes = "员工管理列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "userName", value = "用户姓名"),
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "phone", value = "电话")
+    })
+    @RequestMapping(value = "/userManagement", method = RequestMethod.GET)
+    public ResponseBean userManagement(@RequestParam(defaultValue = "1") int pageNum,
+                                       @RequestParam(defaultValue = "10") int pageSize,
+                                       @RequestParam(value = "userName",required = false) String userName,
+                                       @RequestParam(value = "phone",required = false) String phone) {
+        IPage<SysUserRole> pg = new Page<>(pageNum, pageSize);
+        ResponseBean userManagement= sysUserService.userManagementList(pg,userName,phone);
+        return userManagement;
+    }
+
+    @ApiOperation(value = "树形", notes = "树形")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "SysUser", name = "sysUser", value = "用户详情")
+    })
+    @RequestMapping(value = "/user/tree", method = RequestMethod.GET)
+    public ResponseBean userRoleTree(@RequestBody SysUser sysUser, HttpServletRequest request) {
+        ResponseBean tree= sysUserService.userRoleTree();
+        return tree;
+    }
+
+    @ApiOperation(value = "角色管理列表", notes = "角色管理列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataType = "String", name = "userName", value = "角色名称"),
+})
+    @RequestMapping(value = "/user/roleManagementList", method = RequestMethod.GET)
+    public ResponseBean roleManagementList(@RequestParam(defaultValue = "1") int pageNum,
+                                       @RequestParam(defaultValue = "10") int pageSize,
+                                       @RequestParam(value = "roleName",required = false) String roleName) {
+        IPage<SysRole> pg = new Page<>(pageNum, pageSize);
+        ResponseBean roleManagementList= sysUserService.roleManagementList(pg,roleName);
+        return roleManagementList;
+    }
 }

src/main/java/com.huiju.welcome/mapper/SysMenuMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.welcome.model.SysMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-12
+ */
+@Mapper
+public interface SysMenuMapper extends BaseMapper<SysMenu> {
+
+}

src/main/java/com.huiju.welcome/mapper/SysRoleMapper.java

@@ -0,0 +1,26 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.welcome.model.SysRole;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-12
+ */
+@Mapper
+public interface SysRoleMapper extends BaseMapper<SysRole> {
+
+    /**
+     * 角色列表
+     * @param pg
+     * @param roleName
+     * @return
+     */
+    IPage<SysRole> roleManagementList(IPage<SysRole> pg, String roleName);
+}

src/main/java/com.huiju.welcome/mapper/SysRoleMenuMapper.java

@@ -0,0 +1,18 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.welcome.model.SysRoleMenu;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-12
+ */
+@Mapper
+public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
+
+}

src/main/java/com.huiju.welcome/mapper/SysUserRoleMapper.java

@@ -0,0 +1,31 @@
+package com.huiju.welcome.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.welcome.model.SysRole;
+import com.huiju.welcome.model.SysUserRole;
+import com.huiju.welcome.model.TaVisitorAppointment;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-12
+ */
+@Mapper
+public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
+
+    /**
+     *
+     * @param pg
+     * @param userName
+     * @param phone
+     * @return
+     */
+    IPage<SysUserRole> userManagementList(IPage<SysUserRole> pg, @Param("userName") String userName, @Param("phone") String phone);
+
+}

src/main/java/com.huiju.welcome/model/SysMenu.java

@@ -0,0 +1,43 @@
+package com.huiju.welcome.model;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /*菜单ID*/
+    private String menuId;
+
+    /* 菜单名称*/
+    private String menuName;
+
+    /* 父级菜单*/
+    private String menuPid;
+
+    /*祖父菜单*/
+    private String menuParents;
+
+    /*状态*/
+    private Integer status;
+
+    /*创建*/
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com.huiju.welcome/model/SysRole.java

@@ -0,0 +1,37 @@
+package com.huiju.welcome.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "role_id", type = IdType.AUTO)
+    private Integer roleId;
+
+    /*角色名称*/
+    private String roleName;
+    /*状态*/
+    private Integer status;
+    /*创建*/
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com.huiju.welcome/model/SysRoleMenu.java

@@ -0,0 +1,29 @@
+package com.huiju.welcome.model;
+
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysRoleMenu implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /*角色ID*/
+    private Integer roleId;
+    /*菜单ID*/
+    private String menuId;
+
+
+}

src/main/java/com.huiju.welcome/model/SysUserRole.java

@@ -0,0 +1,49 @@
+package com.huiju.welcome.model;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysUserRole implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /* 人员ID*/
+    private Integer userId;
+
+    /*角色ID*/
+    private Integer roleId;
+
+    /**
+     * 人员名称
+     */
+    @TableField("`username`")
+    private String username;
+
+    /**
+     * 手机号
+     */
+    @TableField("`phone`")
+    private String phone;
+
+    /**
+     * 角色名称
+     */
+    @TableField("`roleName`")
+    private String roleName;
+
+
+}

src/main/java/com.huiju.welcome/service/ISysUserService.java

@@ -1,7 +1,12 @@
 package com.huiju.welcome.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.model.SysRole;
 import com.huiju.welcome.model.SysUser;
+import com.huiju.welcome.model.SysUserRole;
+import com.huiju.welcome.model.TaVisitorAppointment;
 
 /**
  * <p>
@@ -16,4 +21,27 @@ public interface ISysUserService extends IService<SysUser> {
     SysUser getDetailByLoginname(String username);
 
     SysUser getByPhone(String phone);
+
+    /**
+     * 树形
+     * @return
+     */
+    ResponseBean userRoleTree();
+
+    /**
+     * 员工管理列表
+     * @param pg
+     * @param userName
+     * @param phone
+     * @return
+     */
+    ResponseBean userManagementList(IPage<SysUserRole> pg, String userName, String phone);
+
+    /**
+     * 角色管理列表
+     * @param pg
+     * @param roleName
+     * @return
+     */
+    ResponseBean roleManagementList(IPage<SysRole> pg, String roleName);
 }

src/main/java/com.huiju.welcome/service/impl/SysUserServiceImpl.java

@@ -1,14 +1,18 @@
 package com.huiju.welcome.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.welcome.mapper.SysUserMapper;
-import com.huiju.welcome.model.SysUser;
+import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.mapper.*;
+import com.huiju.welcome.model.*;
 import com.huiju.welcome.service.ISysUserService;
 import com.huiju.welcome.utils.StatusUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -23,6 +27,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Autowired
     private SysUserMapper sysUserMapper;
 
+    @Autowired
+    private SysMenuMapper sysMenuMapper;
+
+    @Autowired
+    private SysRoleMenuMapper sysRoleMenuMapper;
+
+    @Autowired
+    private SysUserRoleMapper sysUserRoleMapper;
+
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+
     @Override
     public SysUser getDetailByLoginname(String username) {
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
@@ -38,4 +54,25 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         queryWrapper.last("limit 1");
         return sysUserMapper.selectOne(queryWrapper);
     }
+
+    @Override
+    public ResponseBean userRoleTree() {
+        return null;
+    }
+
+    @Override
+    public ResponseBean userManagementList(IPage<SysUserRole> pg,String userName, String phone) {
+        ResponseBean responseBean= new ResponseBean();
+        IPage<SysUserRole> list= sysUserRoleMapper.userManagementList(pg,userName,phone);
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean roleManagementList(IPage<SysRole> pg, String roleName) {
+        ResponseBean responseBean= new ResponseBean();
+        IPage<SysRole> list= sysRoleMapper.roleManagementList(pg,roleName);
+        responseBean.addSuccess(list);
+        return responseBean;
+    }
 }

src/main/resources/mapper/SysMenuMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.welcome.mapper.SysMenuMapper">
+
+</mapper>

src/main/resources/mapper/SysRoleMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.welcome.mapper.SysRoleMapper">
+
+    <select id="roleManagementList" resultType="com.huiju.welcome.model.SysUserRole">
+        select * from sys_role order by create_date desc
+    </select>
+
+</mapper>

src/main/resources/mapper/SysRoleMenuMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.welcome.mapper.SysRoleMenuMapper">
+
+</mapper>

src/main/resources/mapper/SysUserRoleMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.welcome.mapper.SysUserRoleMapper">
+    <select id="userManagementList" resultType="com.huiju.welcome.model.SysUserRole">
+        select
+        u.username,
+        u.phone,
+        r.role_name as roleName
+        from sys_user_role ur
+        left join sys_user u on  ur.user_id = u.user_id
+        left join sys_role r on  ur.role_id = r.role_id
+        <where>
+            <if test="userName !=null and userName !=''">
+                u.username LIKE CONCAT('%',#{userName},'%')
+            </if>
+            <if test="phone !=null and phone !=''">
+                u.phone LIKE CONCAT('%',#{phone},'%')
+            </if>
+        </where>
+    </select>
+</mapper>