Merge remote-tracking branch 'origin/master'

src/main/java/com/jsl/oa/controllers/RoleController.java

@@ -1,10 +1,54 @@
 package com.jsl.oa.controllers;
 
+import com.jsl.oa.model.voData.RoleAddUser;
+import com.jsl.oa.model.voData.RoleRemoveUser;
+import com.jsl.oa.services.RoleService;
+import com.jsl.oa.utils.BaseResponse;
+import com.jsl.oa.utils.ErrorCode;
+import com.jsl.oa.utils.Processing;
+import com.jsl.oa.utils.ResultUtil;
 import lombok.RequiredArgsConstructor;
+import org.apache.ibatis.annotations.Delete;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequiredArgsConstructor
 
 public class RoleController {
+    private final RoleService roleService;
+
+    /**
+     * 用户权限授予
+     * @param roleAddUser
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping("role/user/add")
+    public BaseResponse roleAddUser(@RequestBody @Validated RoleAddUser roleAddUser, BindingResult bindingResult){
+        // 判断是否有参数错误
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
+        }
+        return roleService.roleAddUser(roleAddUser);
+    }
+
+    /**
+     * 用户权限删除
+     * @param roleRemoveUser
+     * @param bindingResult
+     * @return
+     */
+    @DeleteMapping("role/user/remove")
+    public BaseResponse roleRemoveUser(@RequestBody @Validated RoleRemoveUser roleRemoveUser, BindingResult bindingResult){
+        // 判断是否有参数错误
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
+        }
+        return roleService.roleRemoveUser(roleRemoveUser);
+    }
 }

src/main/java/com/jsl/oa/dao/RoleDAO.java

@@ -0,0 +1,21 @@
+package com.jsl.oa.dao;
+
+import com.jsl.oa.mapper.RoleMapper;
+import com.jsl.oa.model.voData.RoleAddUser;
+import com.jsl.oa.model.voData.RoleRemoveUser;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class RoleDAO {
+    private final RoleMapper roleMapper;
+
+    public void roleAddUser(RoleAddUser roleAddUser) {
+        roleMapper.roleAddUser(roleAddUser);
+    }
+
+    public void roleRemoveUser(RoleRemoveUser roleRemoveUser) {
+        roleMapper.roleRemoveUser(roleRemoveUser);
+    }
+}

src/main/java/com/jsl/oa/mapper/RoleMapper.java

@@ -0,0 +1,17 @@
+package com.jsl.oa.mapper;
+
+import com.jsl.oa.model.voData.RoleAddUser;
+import com.jsl.oa.model.voData.RoleRemoveUser;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RoleMapper {
+
+    @Insert("insert into organize_oa.oa_role_user (uid, rid) VALUE (#{uid},#{rid})")
+    void roleAddUser(RoleAddUser roleAddUser);
+
+    @Delete("delete from organize_oa.oa_role_user where uid=#{uid}")
+    void roleRemoveUser(RoleRemoveUser roleRemoveUser);
+}

src/main/java/com/jsl/oa/model/voData/RoleAddUser.java

@@ -0,0 +1,13 @@
+package com.jsl.oa.model.voData;
+
+import lombok.Getter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+public class RoleAddUser {
+    @NotNull(message = "角色id不能为空")
+    private Long uid;
+    @NotNull(message = "角色id不能为空")
+    private int rid;
+}

src/main/java/com/jsl/oa/model/voData/RoleRemoveUser.java

@@ -0,0 +1,11 @@
+package com.jsl.oa.model.voData;
+
+import lombok.Getter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+public class RoleRemoveUser {
+    @NotNull(message = "用户id不能为空")
+    private Long uid;
+}

src/main/java/com/jsl/oa/services/RoleService.java

@@ -0,0 +1,11 @@
+package com.jsl.oa.services;
+
+import com.jsl.oa.model.voData.RoleAddUser;
+import com.jsl.oa.model.voData.RoleRemoveUser;
+import com.jsl.oa.utils.BaseResponse;
+
+public interface RoleService {
+    BaseResponse roleAddUser(RoleAddUser roleAddUser);
+
+    BaseResponse roleRemoveUser(RoleRemoveUser roleRemoveUser);
+}

src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java

@@ -0,0 +1,36 @@
+package com.jsl.oa.services.impl;
+
+import com.jsl.oa.dao.RoleDAO;
+import com.jsl.oa.dao.UserDAO;
+import com.jsl.oa.model.voData.RoleAddUser;
+import com.jsl.oa.model.voData.RoleRemoveUser;
+import com.jsl.oa.services.RoleService;
+import com.jsl.oa.utils.BaseResponse;
+import com.jsl.oa.utils.ErrorCode;
+import com.jsl.oa.utils.ResultUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class RoleServiceImpl implements RoleService {
+
+    private final RoleDAO roleDAO;
+    private final UserDAO userDAO;
+
+    @Override
+    public BaseResponse roleAddUser(RoleAddUser roleAddUser) {
+        if(userDAO.isExistUser(roleAddUser.getUid())) {
+            roleDAO.roleAddUser(roleAddUser);
+            return ResultUtil.success();
+        } else return ResultUtil.error(ErrorCode.USER_NOT_EXIST);
+    }
+
+    @Override
+    public BaseResponse roleRemoveUser(RoleRemoveUser roleRemoveUser) {
+        if(userDAO.isExistUser(roleRemoveUser.getUid())) {
+            roleDAO.roleRemoveUser(roleRemoveUser);
+            return ResultUtil.success();
+        } else return ResultUtil.error(ErrorCode.USER_NOT_EXIST);
+    }
+}