项目搭建

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

@@ -1,21 +1,53 @@
 package com.hssx.pcbms.controller;
 
 
+import com.hssx.pcbms.entity.Permission;
+import com.hssx.pcbms.entity.User;
+import com.hssx.pcbms.service.PermissionService;
+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.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-10-24
  */
-@RestController
+@Controller
 @RequestMapping("/permission")
 public class PermissionController {
+    @Autowired
+    private PermissionService permissionService;
 
+    /**
+     * 权限添加
+     * 参数：permissionName 权限名称（填对应英文）如 下载：dowload
+     * @return
+     */
+    @ApiOperation(value = "权限添加", notes = "权限添加方法")
+    @RequestMapping("/add")
+    @ResponseBody
+    public HttpRespMsg add(Permission permission) {
+        HttpRespMsg msg = permissionService.add(permission);
+        return msg;
+    }
+
+    /**
+     * 权限添加
+     * 参数：id :权限对应的id
+     * @return
+     */
+    @ApiOperation(value = "权限删除", notes = "权限删除方法")
+    @RequestMapping("/del")
+    @ResponseBody
+    public HttpRespMsg del(Permission permission) {
+        HttpRespMsg msg = permissionService.del(permission);
+        return msg;
+    }
 }
 

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

@@ -1,21 +1,53 @@
 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;
 
 /**
- * <p>
- *  前端控制器
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-10-24
  */
-@RestController
+@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;
+    }
 
 }
 

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

@@ -1,21 +0,0 @@
-package com.hssx.pcbms.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 吴涛涛
- * @since 2019-10-24
- */
-@RestController
-@RequestMapping("/role-permission")
-public class RolePermissionController {
-
-}
-

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

@@ -2,6 +2,7 @@ package com.hssx.pcbms.controller;
 
 
 import com.hssx.pcbms.entity.User;
+import com.hssx.pcbms.entity.vo.UserVO;
 import com.hssx.pcbms.service.UserService;
 import com.hssx.pcbms.util.HttpRespMsg;
 import io.swagger.annotations.ApiOperation;
@@ -30,7 +31,6 @@ public class UserController {
 
     /**
      * 注册
-     * @param user
      * 参数：phone 账号 password 密码 name 姓名
      *      code 验证码
      * @return
@@ -45,7 +45,6 @@ public class UserController {
 
     /**
      * 登录
-     * @param user
      * 参数：phone 账号 password 密码
      * @return
      */
@@ -58,5 +57,32 @@ public class UserController {
         return msg;
     }
 
+    /**
+     * 用户列表
+     * 参数：deptId 部门id ,roleId 角色id,isPass 审核是否通过 0-未通过 1-通过（以上参数查什么传什么）
+     * @return
+     */
+    @ApiOperation(value = "用户列表", notes = "用户列表方法")
+    @RequestMapping("/list")
+    @ResponseBody
+    public HttpRespMsg list(UserVO userVO) {
+        HttpRespMsg msg = userService.getList(userVO);
+        return msg;
+    }
+
+    /**
+     * 用户修改/审核接口
+     * 参数：id:用户id（必传）
+     * 要修改的参数：isPass 审核 0-不通过 1-通过，roleId修改角色，deptId 部门id ,phone 修改手机号
+     * @return
+     */
+    @ApiOperation(value = "用户修改", notes = "用户修改方法")
+    @RequestMapping("/update")
+    @ResponseBody
+    public HttpRespMsg update(User user) {
+        HttpRespMsg msg = userService.updateUser(user);
+        return msg;
+    }
+
 }
 

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

@@ -2,6 +2,7 @@ package com.hssx.pcbms.service;
 
 import com.hssx.pcbms.entity.Permission;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.pcbms.util.HttpRespMsg;
 
 /**
  * <p>
@@ -13,4 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface PermissionService extends IService<Permission> {
 
+    HttpRespMsg add(Permission permission);
+
+    HttpRespMsg del(Permission permission);
 }

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

@@ -2,6 +2,7 @@ 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>
@@ -13,4 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface RoleService extends IService<Role> {
 
+    HttpRespMsg add(Role role);
+
+    HttpRespMsg del(Role role);
 }

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

@@ -2,6 +2,7 @@ package com.hssx.pcbms.service;
 
 import com.hssx.pcbms.entity.User;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hssx.pcbms.entity.vo.UserVO;
 import com.hssx.pcbms.util.HttpRespMsg;
 
 import javax.servlet.http.HttpServletRequest;
@@ -19,4 +20,8 @@ public interface UserService extends IService<User> {
     HttpRespMsg login(User user, HttpServletRequest request);
 
     HttpRespMsg regist(User user,String code);
+
+    HttpRespMsg getList(UserVO userVO);
+
+    HttpRespMsg updateUser(User user);
 }

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

@@ -1,10 +1,15 @@
 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.mapper.PermissionMapper;
+import com.hssx.pcbms.mapper.RolePermissionMapper;
 import com.hssx.pcbms.service.PermissionService;
 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;
 
 /**
  * <p>
@@ -17,4 +22,25 @@ import org.springframework.stereotype.Service;
 @Service
 public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permission> implements PermissionService {
 
+    @Resource
+    private PermissionMapper permissionMapper;
+    @Resource
+    private RolePermissionMapper rolePermissionMapper;
+    @Override
+    public HttpRespMsg add(Permission permission) {
+        HttpRespMsg msg = new HttpRespMsg();
+        permissionMapper.insert(permission);
+        return msg;
+    }
+
+    @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"));
+        if(list.size()>0){
+            msg.setError("该权限已被使用到系统中，暂不支持删除操作");
+        }
+        permissionMapper.deleteById(permission.getId());
+        return msg;
+    }
 }

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

@@ -1,20 +1,51 @@
 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.User;
 import com.hssx.pcbms.mapper.RoleMapper;
+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;
+
 /**
- * <p>
- *  服务实现类
- * </p>
- *
  * @author 吴涛涛
  * @since 2019-10-24
  */
 @Service
 public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
 
+    @Resource
+    private RoleMapper roleMapper;
+    @Resource
+    private UserMapper userMapper;
+
+    @Override
+    public HttpRespMsg add(Role role) {
+        HttpRespMsg msg = new HttpRespMsg();
+        List<Role> roles = roleMapper.selectList(new QueryWrapper<>(role).last("limit 1"));
+        if (roles.size() > 0) {
+            msg.setError("该角色已存在，请勿重复添加");
+            return msg;
+        }
+        roleMapper.insert(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());
+        return null;
+    }
 }

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

@@ -8,17 +8,19 @@ 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.MD5Util;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author 吴涛涛
@@ -31,6 +33,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private UserMapper userMapper;
     @Value("${sysPwd}")
     private String sysPwd;
+
     @Override
     public HttpRespMsg login(User user, HttpServletRequest request) {
         HttpRespMsg msg = new HttpRespMsg();
@@ -41,7 +44,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         //验证用户名是否正确
         if (count > 0) {
             User systemUser = userMapper.selectOne(qw);
-            if(0 == systemUser.getIsPass()){
+            if (0 == systemUser.getIsPass()) {
                 msg.setError("账号未审核通过，不支持登录操作");
                 return msg;
             }
@@ -66,7 +69,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         QueryWrapper<User> qw = new QueryWrapper<>();
         qw.eq("phone", user.getPhone());
         Integer count = userMapper.selectCount(qw);
-        if(count > 0){
+        if (count > 0) {
             msg.setError("账号已存在，请勿重复创建");
             return msg;
         }
@@ -75,4 +78,36 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         userMapper.insert(user);
         return msg;
     }
+
+    @Override
+    public HttpRespMsg getList(UserVO userVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User user = new User();
+        BeanUtils.copyProperties(userVO, user);
+        List<User> users = userMapper.selectList(new QueryWrapper<User>(user));
+        msg.data = users;
+        return msg;
+    }
+
+    @Override
+    public HttpRespMsg updateUser(User user) {
+        HttpRespMsg msg = new HttpRespMsg();
+        User currentUser = userMapper.selectById(user.getId());
+        if (currentUser == null) {
+            msg.setError("用户未找到，请联系管理员");
+            return msg;
+        }
+        if (null != user.getPhone()) {
+            if (!currentUser.getPhone().equals(user.getPhone())) {
+                //修改手机号
+                Integer count = userMapper.selectCount(new QueryWrapper<User>().eq("phone", user.getPhone()));
+                if (count > 0) {
+                    msg.setError("该手机号已被注册，请换用其他手机号");
+                    return msg;
+                }
+            }
+        }
+        userMapper.updateById(user);
+        return msg;
+    }
 }