Revert "Revert "合并所有代码""

This reverts commit 24278bbd0c05a557870b801f3371308fb3dc2c50.

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

@@ -251,20 +251,41 @@ public class SysUserController extends BaseController {
                                        @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 = "员工管理角色权限添加")
+    @RequestMapping(value = "/addUserRole", method = RequestMethod.POST)
+    public ResponseBean userManagement(@RequestParam(value = "phone",required = false) String phone,
+                                       @RequestParam(value = "roleId",required = false) List<String> roleId) {
+        ResponseBean userManagement= sysUserService.addUserRole(phone,roleId);
+        return userManagement;
     }
 
+    @ApiOperation(value = "查询当前员工的角色权限", notes = "查询当前员工的角色权限")
+    @RequestMapping(value = "/userRoledetails", method = RequestMethod.GET)
+    public ResponseBean userRoledetails(@RequestParam(value = "userId",required = false) Integer userId) {
+         ResponseBean userRoledetails= sysUserService.userRoledetails(userId);
+        return userRoledetails;
+    }
+    @ApiOperation(value = "修改当前员工的角色权限", notes = "修改当前员工的角色权限")
+    @RequestMapping(value = "/updateUserRolede", method = RequestMethod.POST)
+    public ResponseBean updateUserRolede(@RequestParam(value = "userId",required = false) Integer userId,
+                                         @RequestParam(value = "menuArray",required = false) List<String> menuArray) {
+        ResponseBean updateUserRolede= sysUserService.updateUserRolede(userId,menuArray);
+        return updateUserRolede;
+    }
+    @ApiOperation(value = "获取所有角色权限", notes = "获取所有角色权限")
+    @RequestMapping(value = "/roleAll", method = RequestMethod.GET)
+    public ResponseBean roleAll() {
+        ResponseBean roleAll= sysUserService.roleAll();
+        return roleAll;
+    }
+
+
     @ApiOperation(value = "角色管理列表", notes = "角色管理列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body", dataType = "String", name = "userName", value = "角色名称"),
@@ -277,4 +298,11 @@ public class SysUserController extends BaseController {
         ResponseBean roleManagementList= sysUserService.roleManagementList(pg,roleName);
         return roleManagementList;
     }
+
+    @ApiOperation(value = "删除当前员工的角色权限", notes = "删除当前员工的角色权限")
+    @RequestMapping(value = "/deleteUserRole", method = RequestMethod.POST)
+    public ResponseBean deleteUserRole(@RequestParam(value = "userId",required = false) Integer userId) {
+        ResponseBean deleteUserRole= sysUserService.deleteUserRole(userId);
+        return deleteUserRole;
+    }
 }

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.welcome.model.SysRole;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -23,4 +25,10 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
      * @return
      */
     IPage<SysRole> roleManagementList(IPage<SysRole> pg, String roleName);
+
+    /**
+     * 获取所有角色
+     * @return
+     */
+    List<SysRole> selectroleAll();
 }

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

@@ -8,6 +8,8 @@ import com.huiju.welcome.model.TaVisitorAppointment;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -28,4 +30,10 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
      */
     IPage<SysUserRole> userManagementList(IPage<SysUserRole> pg, @Param("userName") String userName, @Param("phone") String phone);
 
+    /**
+     * 查询当用户的角色
+     * @param userId
+     * @return
+     */
+    List<SysUserRole> selectListSysUserRole(@Param("userId") Integer userId);
 }

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

@@ -1,8 +1,11 @@
 package com.huiju.welcome.model;
 
 import java.io.Serializable;
+import java.util.List;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -15,9 +18,10 @@ import lombok.experimental.Accessors;
  * @author jobob
  * @since 2019-07-12
  */
-@Data
+
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
+@Data
 public class SysUserRole implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -44,6 +48,4 @@ public class SysUserRole implements Serializable {
      */
     @TableField("`roleName`")
     private String roleName;
-
-
 }

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

@@ -8,6 +8,8 @@ import com.huiju.welcome.model.SysUser;
 import com.huiju.welcome.model.SysUserRole;
 import com.huiju.welcome.model.TaVisitorAppointment;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -44,4 +46,39 @@ public interface ISysUserService extends IService<SysUser> {
      * @return
      */
     ResponseBean roleManagementList(IPage<SysRole> pg, String roleName);
+
+    /**
+     * 添加角色权限
+     * @param phone
+     * @param role
+     * @return
+     */
+    ResponseBean addUserRole(String phone, List<String> role);
+
+    /**
+     * 查询当前员工所有权限
+     * @param userId
+     * @return
+     */
+    ResponseBean userRoledetails(Integer userId);
+
+    /**
+     * 修改当前员工的角色权限
+     * @param userId
+     * @return
+     */
+    ResponseBean updateUserRolede(Integer userId,List<String> role);
+
+    /**
+     * 获取所有角色
+     * @return
+     */
+    ResponseBean roleAll();
+
+    /**
+     * 删除当前员工权限
+     * @param userId
+     * @return
+     */
+    ResponseBean deleteUserRole(Integer userId);
 }

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

@@ -11,6 +11,8 @@ import com.huiju.welcome.utils.StatusUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -75,4 +77,85 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         responseBean.addSuccess(list);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean addUserRole(String phone, List<String> role) {
+        ResponseBean responseBean = new ResponseBean<>();
+        String[] strArray = role.toArray(new String[role.size()]);
+        /*查询当前号码是否存在*/
+        QueryWrapper<SysUser> sysUserQueryWrapper= new QueryWrapper<>();
+        sysUserQueryWrapper.eq("phone",phone);
+        SysUser sysUser = sysUserMapper.selectOne(sysUserQueryWrapper);
+        if (null == sysUser){
+            responseBean.addError("此号码不存在");
+            return responseBean;
+        }
+        // 查询当前人员角色权限是否存在
+        List<SysUserRole> sysUserRole= sysUserRoleMapper.selectListSysUserRole(sysUser.getUserId());
+        if (sysUserRole!=null && !sysUserRole.isEmpty()){
+            responseBean.addError("此用户已存在权限，请点击修改");
+            return responseBean;
+        }
+        for (String id:strArray){
+            SysUserRole userRole= new SysUserRole();
+            userRole.setUserId(sysUser.getUserId()).setRoleId(Integer.valueOf(id));
+            sysUserRoleMapper.insert(userRole);
+        }
+        responseBean.addSuccess(sysUser);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean userRoledetails(Integer userId) {
+        ResponseBean responseBean= new ResponseBean<>();
+        List<Integer> arrayList= new ArrayList<>();
+        SysUser user= sysUserMapper.selectById(userId);
+        List<SysRole> sysRole= sysRoleMapper.selectroleAll();
+        List<SysUserRole> sysUserRoleList= sysUserRoleMapper.selectListSysUserRole(userId);
+        for (SysUserRole sysUserRole:sysUserRoleList){
+            arrayList.add(sysUserRole.getRoleId());
+        }
+        HashMap<Object,Object> map = new HashMap<>();
+        map.put("arrayList",arrayList);
+        map.put("user",user);
+        map.put("sysRole",sysRole);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean updateUserRolede(Integer userId,List<String> role) {
+        ResponseBean responseBean= new ResponseBean<>();
+        // 查出当前用户的所有权限，先删除后添加
+        List<SysUserRole> sysUserRoleList= sysUserRoleMapper.selectListSysUserRole(userId);
+        for (SysUserRole sysUserRole:sysUserRoleList){
+            sysUserRoleMapper.delete(new QueryWrapper<SysUserRole>().eq("user_id",userId));
+        }
+        String[] array = role.toArray(new String[role.size()]);
+        for (String id:array){
+            SysUserRole sysRole= new SysUserRole();
+            sysRole.setRoleId(Integer.valueOf(id)).setUserId(userId);
+            sysUserRoleMapper.insert(sysRole);
+        }
+        responseBean.addSuccess("成功");
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean roleAll() {
+       ResponseBean responseBean=  new ResponseBean<>();
+        List<SysRole> sysRole= sysRoleMapper.selectroleAll();
+        responseBean.addSuccess(sysRole);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean deleteUserRole(Integer userId) {
+        ResponseBean responseBean= new ResponseBean<>();
+        QueryWrapper<SysUserRole> sysUserRoleQueryWrapper = new QueryWrapper<>();
+        sysUserRoleQueryWrapper.eq("user_id",userId);
+        int sysUserRole=  sysUserRoleMapper.delete(sysUserRoleQueryWrapper);
+        responseBean.addSuccess(sysUserRole);
+        return responseBean;
+    }
 }

src/main/resources/mapper/SysRoleMapper.xml

@@ -6,4 +6,8 @@
         select * from sys_role order by create_date desc
     </select>
 
+    <select id="selectroleAll" resultType="com.huiju.welcome.model.SysUserRole">
+        select * from  sys_role
+    </select>
+
 </mapper>

src/main/resources/mapper/SysUserRoleMapper.xml

@@ -5,7 +5,8 @@
         select
         u.username,
         u.phone,
-        r.role_name as roleName
+        u.user_id as userId,
+        GROUP_CONCAT(r.role_name) 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
@@ -17,5 +18,11 @@
                 u.phone LIKE CONCAT('%',#{phone},'%')
             </if>
         </where>
+        GROUP BY
+        ur.user_id
+    </select>
+    
+    <select id="selectListSysUserRole" resultType="com.huiju.welcome.model.SysUserRole">
+        select * from sys_user_role where  user_id = #{userId};
     </select>
 </mapper>