WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
176yunxuan 2024-01-17 22:40:47 +08:00
parent 2e4b16b188
commit 2d541308e5
7 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/jsl/oa/controllers/RoleController.java
View File

@ -10,10 +10,7 @@ import com.jsl.oa.utils.ResultUtil;
import lombok.RequiredArgsConstructor;
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;
import org.springframework.web.bind.annotation.*;
@RestController
@RequiredArgsConstructor
@ -23,31 +20,29 @@ public class RoleController {
/**
* 用户权限授予
* @param roleAddUserVO
* @param bindingResult
*
* @return
*/
@PostMapping("role/user/add")
public BaseResponse roleAddUser(@RequestBody @Validated RoleAddUserVO roleAddUserVO, BindingResult bindingResult){
public BaseResponse roleAddUser(@RequestParam Long uid,@RequestParam Long rid){
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
if (uid == null || rid == null) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
}
return roleService.roleAddUser(roleAddUserVO);
return roleService.roleAddUser(uid,rid);
}
/**
* 用户权限删除
* @param roleRemoveUserVO
* @param bindingResult
*
* @return
*/
@DeleteMapping("role/user/remove")
public BaseResponse roleRemoveUser(@RequestBody @Validated RoleRemoveUserVO roleRemoveUserVO, BindingResult bindingResult){
public BaseResponse roleRemoveUser(@RequestParam Long uid){
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
if (uid==null) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
}
return roleService.roleRemoveUser(roleRemoveUserVO);
return roleService.roleRemoveUser(uid);
}
}

8
src/main/java/com/jsl/oa/dao/RoleDAO.java
View File

@ -11,11 +11,11 @@ import org.springframework.stereotype.Component;
public class RoleDAO {
private final RoleMapper roleMapper;
public void roleAddUser(RoleAddUserVO roleAddUserVO) {
roleMapper.roleAddUser(roleAddUserVO);
public void roleAddUser(Long uid,Long rid) {
roleMapper.roleAddUser(uid,rid);
}
public void roleRemoveUser(RoleRemoveUserVO roleRemoveUserVO) {
roleMapper.roleRemoveUser(roleRemoveUserVO);
public void roleRemoveUser(Long uid) {
roleMapper.roleRemoveUser(uid);
}
}

4
src/main/java/com/jsl/oa/mapper/RoleMapper.java
View File

@ -10,8 +10,8 @@ import org.apache.ibatis.annotations.Mapper;
public interface RoleMapper {
@Insert("insert into organize_oa.oa_role_user (uid, rid) VALUE (#{uid},#{rid})")
void roleAddUser(RoleAddUserVO roleAddUserVO);
void roleAddUser(Long uid,Long rid);
@Delete("delete from organize_oa.oa_role_user where uid=#{uid}")
void roleRemoveUser(RoleRemoveUserVO roleRemoveUserVO);
void roleRemoveUser(Long uid);
}

2
src/main/java/com/jsl/oa/model/voData/UserLoginVO.java
View File

@ -18,7 +18,7 @@ import javax.validation.constraints.Pattern;
public class UserLoginVO {
@Pattern(regexp = "^[0-9A-Za-z_]+$", message = "支持用户名/手机号/工号登陆")
@NotBlank(message = "用户名不能为空")
private String user;
private String username;
@NotBlank(message = "密码不能为空")
private String password;
}

4
src/main/java/com/jsl/oa/services/RoleService.java
View File

@ -5,7 +5,7 @@ import com.jsl.oa.model.voData.RoleRemoveUserVO;
import com.jsl.oa.utils.BaseResponse;
public interface RoleService {
BaseResponse roleAddUser(RoleAddUserVO roleAddUserVO);
BaseResponse roleAddUser(Long uid,Long rid);
BaseResponse roleRemoveUser(RoleRemoveUserVO roleRemoveUserVO);
BaseResponse roleRemoveUser(Long uid);
}

12
src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
View File

@ -71,18 +71,18 @@ public class AuthServiceImpl implements AuthService {
public BaseResponse authLogin(@NotNull UserLoginVO userLoginVO) {
// 检查用户是否存在
UserDO userDO;
if (Pattern.matches("^[0-9A-Za-z_]{3,40}$", userLoginVO.getUser())) {
if (Pattern.matches("^[0-9A-Za-z_]{3,40}$", userLoginVO.getUsername())) {
// 是否为用户名
userDO = userMapper.getUserInfoByUsername(userLoginVO.getUser());
} else if (Pattern.matches("^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$", userLoginVO.getUser())) {
userDO = userMapper.getUserInfoByUsername(userLoginVO.getUsername());
} else if (Pattern.matches("^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$", userLoginVO.getUsername())) {
// 是否为手机号
userDO = userMapper.getUserInfoByPhone(userLoginVO.getUser());
} else if (Pattern.matches("^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", userLoginVO.getUser())) {
userDO = userMapper.getUserInfoByPhone(userLoginVO.getUsername());
} else if (Pattern.matches("^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", userLoginVO.getUsername())) {
// 是否为邮箱
return ResultUtil.error(ErrorCode.EMAIL_LOGIN_NOT_SUPPORT);
} else {
// 工号
userDO = userMapper.getUserByJobId(userLoginVO.getUser());
userDO = userMapper.getUserByJobId(userLoginVO.getUsername());
}
if (userDO != null) {
// 获取用户并登陆

12
src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java
View File

@ -19,17 +19,17 @@ public class RoleServiceImpl implements RoleService {
private final UserDAO userDAO;
@Override
public BaseResponse roleAddUser(RoleAddUserVO roleAddUserVO) {
if(userDAO.isExistUser(roleAddUserVO.getUid())) {
roleDAO.roleAddUser(roleAddUserVO);
public BaseResponse roleAddUser(Long uid,Long rid) {
if(userDAO.isExistUser(uid)) {
roleDAO.roleAddUser(uid,rid);
return ResultUtil.success();
} else return ResultUtil.error(ErrorCode.USER_NOT_EXIST);
}
@Override
public BaseResponse roleRemoveUser(RoleRemoveUserVO roleRemoveUserVO) {
if(userDAO.isExistUser(roleRemoveUserVO.getUid())) {
roleDAO.roleRemoveUser(roleRemoveUserVO);
public BaseResponse roleRemoveUser(Long uid) {
if(userDAO.isExistUser(uid)) {
roleDAO.roleRemoveUser(uid);
return ResultUtil.success();
} else return ResultUtil.error(ErrorCode.USER_NOT_EXIST);
}