头像上传

pcbms/src/main/java/com/hssx/pcbms/controller/RoleController.java

@@ -1,80 +0,0 @@
-package com.hssx.pcbms.controller;
-
-
-import com.hssx.pcbms.entity.Permission;
-import com.hssx.pcbms.entity.Role;
-import com.hssx.pcbms.service.RoleService;
-import com.hssx.pcbms.util.HttpRespMsg;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author 吴涛涛
- * @since 2019-10-24
- */
-@Controller
-@RequestMapping("/role")
-public class RoleController {
-    @Autowired
-    private RoleService roleService;
-
-    /**
-     * 角色添加/修改
-     * 参数：name：角色名称
-     * @return
-     */
-    @ApiOperation(value = "角色添加/修改", notes = "角色添加/修改方法")
-    @RequestMapping("/add")
-    @ResponseBody
-    public HttpRespMsg add(Role role) {
-        HttpRespMsg msg = roleService.add(role);
-        return msg;
-    }
-
-    /**
-     * 角色删除
-     * 参数：id：角色id
-     * @return
-     */
-    @ApiOperation(value = "角色删除", notes = "角色删除方法")
-    @RequestMapping("/del")
-    @ResponseBody
-    public HttpRespMsg del(Role role) {
-        HttpRespMsg msg = roleService.del(role);
-        return msg;
-    }
-
-    /**
-     * 角色列表
-     * @return
-     */
-    @ApiOperation(value = "角色列表", notes = "角色列表方法")
-    @RequestMapping("/list")
-    @ResponseBody
-    public HttpRespMsg list(Role role) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = roleService.list();
-        return msg;
-    }
-//!!!!!!!!没写完
-    /**
-     * 角色分配权限
-     * id:角色id
-     * @return
-     */
-    @ApiOperation(value = "角色分配权限", notes = "角色分配权限方法")
-    @RequestMapping("/handOutpermissions")
-    @ResponseBody
-    public HttpRespMsg handOutpermissions(Role role) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = roleService.list();
-        return msg;
-    }
-
-}
-

pcbms/src/main/java/com/hssx/pcbms/controller/UserController.java

@@ -105,5 +105,18 @@ public class UserController {
         return msg;
     }
 
+    /**
+     * 用户分配权限
+     * id:用户id permissionIds:权限对应的ids集合字符串（"1,2,3"）
+     * @return
+     */
+    @ApiOperation(value = "角色分配权限", notes = "角色分配权限方法")
+    @RequestMapping("/handOutpermissions")
+    @ResponseBody
+    public HttpRespMsg handOutpermissions(User user, String permissionIds) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg = userService.handOutpermissions(user,permissionIds);
+        return msg;
+    }
 }
 

pcbms/src/main/java/com/hssx/pcbms/entity/Permission.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-24
+ * @since 2019-10-25
  */
 public class Permission extends Model<Permission> {
 

pcbms/src/main/java/com/hssx/pcbms/entity/Role.java

@@ -1,78 +0,0 @@
-package com.hssx.pcbms.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-10-24
- */
-public class Role extends Model<Role> {
-
-    private static final long serialVersionUID=1L;
-
-    /**
-     * 角色表主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    /**
-     * 角色名称
-     */
-    @TableField("name")
-    private String name;
-
-    /**
-     * 创建时间
-     */
-    @TableField("indate")
-    private LocalDateTime indate;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public LocalDateTime getIndate() {
-        return indate;
-    }
-
-    public void setIndate(LocalDateTime indate) {
-        this.indate = indate;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "Role{" +
-        "id=" + id +
-        ", name=" + name +
-        ", indate=" + indate +
-        "}";
-    }
-}

pcbms/src/main/java/com/hssx/pcbms/entity/User.java

@@ -13,7 +13,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-24
+ * @since 2019-10-25
  */
 public class User extends Model<User> {
 
@@ -49,12 +49,6 @@ public class User extends Model<User> {
     @TableField("dept_id")
     private Integer deptId;
 
-    /**
-     * 角色id
-     */
-    @TableField("role_id")
-    private Integer roleId;
-
     /**
      * 审核是否通过 0-未通过 1-通过
      */
@@ -73,6 +67,12 @@ public class User extends Model<User> {
     @TableField("password")
     private String password;
 
+    /**
+     * 角色名称
+     */
+    @TableField("role_name")
+    private String roleName;
+
 
     public Integer getId() {
         return id;
@@ -114,14 +114,6 @@ public class User extends Model<User> {
         this.deptId = deptId;
     }
 
-    public Integer getRoleId() {
-        return roleId;
-    }
-
-    public void setRoleId(Integer roleId) {
-        this.roleId = roleId;
-    }
-
     public Integer getIsPass() {
         return isPass;
     }
@@ -146,6 +138,14 @@ public class User extends Model<User> {
         this.password = password;
     }
 
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -159,10 +159,10 @@ public class User extends Model<User> {
         ", name=" + name +
         ", phone=" + phone +
         ", deptId=" + deptId +
-        ", roleId=" + roleId +
         ", isPass=" + isPass +
         ", indate=" + indate +
         ", password=" + password +
+        ", roleName=" + roleName +
         "}";
     }
 }

pcbms/src/main/java/com/hssx/pcbms/entity/RolePermission.java

@@ -12,9 +12,9 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-24
+ * @since 2019-10-25
  */
-public class RolePermission extends Model<RolePermission> {
+public class UserPermission extends Model<UserPermission> {
 
     private static final long serialVersionUID=1L;
 
@@ -25,10 +25,10 @@ public class RolePermission extends Model<RolePermission> {
     private Integer id;
 
     /**
-     * 角色id
+     * 用户id
      */
-    @TableField("role_id")
-    private Integer roleId;
+    @TableField("user_id")
+    private Integer userId;
 
     /**
      * 权限id
@@ -45,12 +45,12 @@ public class RolePermission extends Model<RolePermission> {
         this.id = id;
     }
 
-    public Integer getRoleId() {
-        return roleId;
+    public Integer getUserId() {
+        return userId;
     }
 
-    public void setRoleId(Integer roleId) {
-        this.roleId = roleId;
+    public void setUserId(Integer userId) {
+        this.userId = userId;
     }
 
     public Integer getPermissionId() {
@@ -68,9 +68,9 @@ public class RolePermission extends Model<RolePermission> {
 
     @Override
     public String toString() {
-        return "RolePermission{" +
+        return "UserPermission{" +
         "id=" + id +
-        ", roleId=" + roleId +
+        ", userId=" + userId +
         ", permissionId=" + permissionId +
         "}";
     }

pcbms/src/main/java/com/hssx/pcbms/entity/vo/UserVO.java

@@ -1,7 +1,6 @@
 package com.hssx.pcbms.entity.vo;
 
 import com.hssx.pcbms.entity.Permission;
-import com.hssx.pcbms.entity.Role;
 import com.hssx.pcbms.entity.User;
 import lombok.Data;
 
@@ -16,5 +15,4 @@ import java.util.List;
 @Data
 public class UserVO extends User {
     private List<Permission> permissions;
-    private List<Role> roles;
 }

pcbms/src/main/java/com/hssx/pcbms/mapper/RoleMapper.java

@@ -1,16 +0,0 @@
-package com.hssx.pcbms.mapper;
-
-import com.hssx.pcbms.entity.Role;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-10-24
- */
-public interface RoleMapper extends BaseMapper<Role> {
-
-}

pcbms/src/main/java/com/hssx/pcbms/mapper/RolePermissionMapper.java

@@ -1,6 +1,6 @@
 package com.hssx.pcbms.mapper;
 
-import com.hssx.pcbms.entity.RolePermission;
+import com.hssx.pcbms.entity.UserPermission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-24
+ * @since 2019-10-25
  */
-public interface RolePermissionMapper extends BaseMapper<RolePermission> {
+public interface UserPermissionMapper extends BaseMapper<UserPermission> {
 
 }

pcbms/src/main/java/com/hssx/pcbms/service/RoleService.java

@@ -1,20 +0,0 @@
-package com.hssx.pcbms.service;
-
-import com.hssx.pcbms.entity.Role;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hssx.pcbms.util.HttpRespMsg;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-10-24
- */
-public interface RoleService extends IService<Role> {
-
-    HttpRespMsg add(Role role);
-
-    HttpRespMsg del(Role role);
-}

pcbms/src/main/java/com/hssx/pcbms/service/RolePermissionService.java

@@ -1,6 +1,6 @@
 package com.hssx.pcbms.service;
 
-import com.hssx.pcbms.entity.RolePermission;
+import com.hssx.pcbms.entity.UserPermission;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-10-24
+ * @since 2019-10-25
  */
-public interface RolePermissionService extends IService<RolePermission> {
+public interface UserPermissionService extends IService<UserPermission> {
 
 }

pcbms/src/main/java/com/hssx/pcbms/service/UserService.java

@@ -27,4 +27,6 @@ public interface UserService extends IService<User> {
     HttpRespMsg updateUser(User user,MultipartFile file);
 
     HttpRespMsg updateAndForgetPwd(User user, Integer type,String code);
+
+    HttpRespMsg handOutpermissions(User user, String permissionIds);
 }

pcbms/src/main/java/com/hssx/pcbms/service/impl/PermissionServiceImpl.java

@@ -1,9 +1,9 @@
 package com.hssx.pcbms.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.pcbms.entity.Permission;
-import com.hssx.pcbms.entity.RolePermission;
+import com.hssx.pcbms.entity.UserPermission;
 import com.hssx.pcbms.mapper.PermissionMapper;
-import com.hssx.pcbms.mapper.RolePermissionMapper;
+import com.hssx.pcbms.mapper.UserPermissionMapper;
 import com.hssx.pcbms.service.PermissionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.pcbms.util.HttpRespMsg;
@@ -25,7 +25,7 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
     @Resource
     private PermissionMapper permissionMapper;
     @Resource
-    private RolePermissionMapper rolePermissionMapper;
+    private UserPermissionMapper userPermissionMapper;
     @Override
     public HttpRespMsg add(Permission permission) {
         HttpRespMsg msg = new HttpRespMsg();
@@ -36,7 +36,7 @@ public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permiss
     @Override
     public HttpRespMsg del(Permission permission) {
         HttpRespMsg msg = new HttpRespMsg();
-        List<RolePermission> list = rolePermissionMapper.selectList(new QueryWrapper<RolePermission>().eq("permission_id", permission.getId()).last("limit 1"));
+        List<UserPermission> list = userPermissionMapper.selectList(new QueryWrapper<UserPermission>().eq("permission_id", permission.getId()).last("limit 1"));
         if(list.size()>0){
             msg.setError("该权限已被使用到系统中，暂不支持删除操作");
         }

pcbms/src/main/java/com/hssx/pcbms/service/impl/RolePermissionServiceImpl.java

@@ -1,20 +0,0 @@
-package com.hssx.pcbms.service.impl;
-
-import com.hssx.pcbms.entity.RolePermission;
-import com.hssx.pcbms.mapper.RolePermissionMapper;
-import com.hssx.pcbms.service.RolePermissionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-10-24
- */
-@Service
-public class RolePermissionServiceImpl extends ServiceImpl<RolePermissionMapper, RolePermission> implements RolePermissionService {
-
-}

pcbms/src/main/java/com/hssx/pcbms/service/impl/RoleServiceImpl.java

@@ -1,67 +0,0 @@
-package com.hssx.pcbms.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.hssx.pcbms.entity.Role;
-import com.hssx.pcbms.entity.RolePermission;
-import com.hssx.pcbms.entity.User;
-import com.hssx.pcbms.mapper.RoleMapper;
-import com.hssx.pcbms.mapper.RolePermissionMapper;
-import com.hssx.pcbms.mapper.UserMapper;
-import com.hssx.pcbms.service.RoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hssx.pcbms.util.HttpRespMsg;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @author 吴涛涛
- * @since 2019-10-24
- */
-@Service
-public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
-
-    @Resource
-    private RoleMapper roleMapper;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private RolePermissionMapper rolePermissionMapper;
-
-    @Override
-    public HttpRespMsg add(Role role) {
-        HttpRespMsg msg = new HttpRespMsg();
-        if(null == role.getId()){
-            List<Role> roles = roleMapper.selectList(new QueryWrapper<>(role).last("limit 1"));
-            if (roles.size() > 0) {
-                msg.setError("该角色已存在，请勿重复添加");
-                return msg;
-            }
-            //添加
-            roleMapper.insert(role);
-        }else{
-            //修改
-            List<Role> roles = roleMapper.selectList(new QueryWrapper<Role>().eq("name",role.getName()).last("limit 1"));
-            if (roles.size() > 0) {
-                msg.setError("该角色已存在，请修改成其他角色名后再操作");
-                return msg;
-            }
-            roleMapper.updateById(role);
-        }
-        return msg;
-    }
-
-    @Override
-    public HttpRespMsg del(Role role) {
-        HttpRespMsg msg = new HttpRespMsg();
-        List<User> list = userMapper.selectList(new QueryWrapper<User>().eq("role_id", role.getId()).last("limit 1"));
-        if(list.size()>0){
-            msg.setError("该角色已被应用到系统中，暂不支持删除操作");
-            return msg;
-        }
-        roleMapper.deleteById(role.getId());
-        rolePermissionMapper.delete(new QueryWrapper<RolePermission>().eq("role_id",role.getId()));
-        return msg;
-    }
-}

pcbms/src/main/java/com/hssx/pcbms/service/impl/UserPermissionServiceImpl.java

@@ -0,0 +1,20 @@
+package com.hssx.pcbms.service.impl;
+
+import com.hssx.pcbms.entity.UserPermission;
+import com.hssx.pcbms.mapper.UserPermissionMapper;
+import com.hssx.pcbms.service.UserPermissionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 吴涛涛
+ * @since 2019-10-25
+ */
+@Service
+public class UserPermissionServiceImpl extends ServiceImpl<UserPermissionMapper, UserPermission> implements UserPermissionService {
+
+}

pcbms/src/main/java/com/hssx/pcbms/service/impl/UserServiceImpl.java

@@ -2,23 +2,25 @@ package com.hssx.pcbms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.pcbms.entity.User;
+import com.hssx.pcbms.entity.UserPermission;
 import com.hssx.pcbms.entity.vo.UserVO;
 import com.hssx.pcbms.mapper.UserMapper;
+import com.hssx.pcbms.mapper.UserPermissionMapper;
 import com.hssx.pcbms.service.UserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hssx.pcbms.util.HttpRespMsg;
+import com.hssx.pcbms.util.ListUtil;
 import com.hssx.pcbms.util.MD5Util;
 import com.hssx.pcbms.util.UploadFileToFileNameUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -37,6 +39,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private String sysPwd;
     @Value("${upload.path}")
     private String path;
+    @Resource
+    private UserPermissionMapper userPermissionMapper;
 
     @Override
     public HttpRespMsg login(User user, HttpServletRequest request) {
@@ -134,4 +138,22 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg handOutpermissions(User user, String permissionIds) {
+            HttpRespMsg msg = new HttpRespMsg();
+            List<Integer> ids = ListUtil.convertIntegerIdsArrayToList(permissionIds);
+            UserPermission rolePermission = new UserPermission();
+            if(!CollectionUtils.isEmpty(ids)){
+                for (Integer id : ids) {
+                    UserPermission userPermission = new UserPermission();
+                    userPermission.setPermissionId(id);
+                    userPermission.setUserId(user.getId());
+                    userPermissionMapper.insert(userPermission);
+                }
+            }else{
+                msg.setError("权限选择不能为空");
+            }
+            return msg;
+    }
 }

pcbms/src/main/resources/mapper/UserMapper.xml

@@ -9,10 +9,10 @@
         <result column="name" property="name" />
         <result column="phone" property="phone" />
         <result column="dept_id" property="deptId" />
-        <result column="role_id" property="roleId" />
         <result column="is_pass" property="isPass" />
         <result column="indate" property="indate" />
         <result column="password" property="password" />
+        <result column="role_name" property="roleName" />
     </resultMap>
 
     <resultMap id="BaseResultMapVO" type="com.hssx.pcbms.entity.vo.UserVO">
@@ -21,35 +21,29 @@
         <result column="name" property="name" />
         <result column="phone" property="phone" />
         <result column="dept_id" property="deptId" />
-        <result column="role_id" property="roleId" />
         <result column="is_pass" property="isPass" />
         <result column="indate" property="indate" />
         <!--<result column="password" property="password" />-->
         <collection property="permissions" ofType="com.hssx.pcbms.entity.Permission">
             <result column="permission_name" property="permissionName" />
         </collection>
-        <collection property="roles" ofType="com.hssx.pcbms.entity.Role">
-            <result column="rolename" property="name" />
-        </collection>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, head_url, name, phone, dept_id, role_id, is_pass, indate, password
+        id, head_url, name, phone, dept_id, is_pass, indate, password, role_name
     </sql>
 
     <select id="selectUserRolesAndPermisssuons" resultMap="BaseResultMapVO">
         select
-            u.id, u.head_url, u.name, u.phone, u.dept_id, u.role_id, u.is_pass, u.indate,
-            p.permission_name,r.name rolename
+            u.id, u.head_url, u.name, u.phone, u.dept_id, u.is_pass, u.indate,u.role_name
+            p.permission_name
         from
             user u
-        left join role r
-        on u.role_id = r.id
-        left join role_permission rp
-        on r.id = rp.role_id
+        left join user_permission up
+        on u.id = up.user_id
         left join permission p
-        on p.id = rp.permission_id
+        on p.id = up.permission_id
         where u.id = #{user.id,jdbcType=INTEGER}
     </select>
 

pcbms/src/main/resources/mapper/UserPermissionMapper.xml

@@ -0,0 +1,17 @@
+<?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.hssx.pcbms.mapper.UserPermissionMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hssx.pcbms.entity.UserPermission">
+        <id column="id" property="id" />
+        <result column="user_id" property="userId" />
+        <result column="permission_id" property="permissionId" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, user_id, permission_id
+    </sql>
+
+</mapper>