p35z7urxv
/
pqa2fspn3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[fix][M]: 完善删除用户逻辑

Browse Source
master
Romesum 5 years ago
parent 6e886a547c
commit 9df32f5cba
7 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File

6
java/pom.xml
Unescape View File

@ -63,6 +63,12 @@
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>1.1.2-beta5</version>
</dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId> <artifactId>junit-jupiter</artifactId>

46
java/src/main/java/com/hzu/bookingsystem/controller/UserController.java
Unescape View File

@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@RestController @RestController
@CrossOrigin @CrossOrigin
@RequestMapping("/user") @RequestMapping("/user")
@ -38,10 +39,10 @@ public class UserController {
HttpServletResponse response) { HttpServletResponse response) {
//1. openid去和数据库里的数据匹配 //1. openid去和数据库里的数据匹配
UserBean user1 = userService.findByUnameAndPwd(user.getUsername(),user.getPassword()); UserBean user1 = userService.findByUnameAndPwd(user.getUsername(), user.getPassword());
System.out.println(user1); System.out.println(user1);
if (user1 == null) { if (user1 == null) {
return ResultVOUtil.error(-2,"账号或密码不正确"); return ResultVOUtil.error(-2, "账号或密码不正确");
} }
//2. 设置token至redis //2. 设置token至redis
@ -72,7 +73,7 @@ public class UserController {
// 查看当前用户个人信息 // 查看当前用户个人信息
@GetMapping(value = "/getUserInfo") @GetMapping(value = "/getUserInfo")
public ResultVO getUserInfo(HttpServletRequest request){ public ResultVO getUserInfo(HttpServletRequest request) {
Integer uId = getUIdByCookie(request); Integer uId = getUIdByCookie(request);
UserBean user = userService.findById(uId); UserBean user = userService.findById(uId);
user.setPassword(null); user.setPassword(null);
@ -81,7 +82,7 @@ public class UserController {
// 获取当前用户名称 // 获取当前用户名称
@GetMapping(value = "/getUserName") @GetMapping(value = "/getUserName")
public ResultVO getUserName(HttpServletRequest request){ public ResultVO getUserName(HttpServletRequest request) {
Integer uId = getUIdByCookie(request); Integer uId = getUIdByCookie(request);
UserBean user = userService.findById(uId); UserBean user = userService.findById(uId);
return ResultVOUtil.success(user.getNickname()); return ResultVOUtil.success(user.getNickname());
@ -89,24 +90,24 @@ public class UserController {
//创建用户 //创建用户
@PostMapping(value = "/addUser", consumes = "application/json") @PostMapping(value = "/addUser", consumes = "application/json")
public ResultVO addUser(@RequestBody Map<String,Object> map) { public ResultVO addUser(@RequestBody Map<String, Object> map) {
// 0.转换对象 // 0.转换对象
UserBean user = (UserBean) Map2Object.map2Object(map,UserBean.class); UserBean user = (UserBean) Map2Object.map2Object(map, UserBean.class);
// 1.查重 // 1.查重
if (userService.findByUserame(user.getUsername()) != null) if (userService.findByUserame(user.getUsername()) != null)
return ResultVOUtil.error(-1,"该工号已存在！"); return ResultVOUtil.error(-1, "该工号已存在！");
// 2.插入 // 2.插入
userService.add(user,(Integer)map.get("position")); userService.add(user, (Integer) map.get("position"));
return ResultVOUtil.success(); return ResultVOUtil.success();
} }
// 通过UID删除用户 // 通过UID删除用户
@PostMapping(value = "/deleteUser", consumes = "application/json") @PostMapping(value = "/deleteUser", consumes = "application/json")
public ResultVO deleteUser(@RequestBody UserBean user){ public ResultVO deleteUser(@RequestBody UserBean user) {
// 查找该用户看是否存在 // 查找该用户看是否存在
UserBean user1 = userService.findById(user.getUId()); UserBean user1 = userService.findById(user.getUId());
if (user1 == null){ if (user1 == null) {
return ResultVOUtil.error(-1,"用户不存在"); return ResultVOUtil.error(-1, "用户不存在");
} }
// 删除该用户 // 删除该用户
userService.deleteById(user1.getUId()); userService.deleteById(user1.getUId());
@ -122,23 +123,24 @@ public class UserController {
// 查找所有用户列表 // 查找所有用户列表
@GetMapping(value = "/getUserList") @GetMapping(value = "/getUserList")
public ResultVO getUserList(){ public ResultVO getUserList() {
List<UserDTO> userList = userService.findAllUserInfo(); List<UserDTO> userList = userService.findAllUserInfo();
return ResultVOUtil.success(userList); return ResultVOUtil.success(userList);
} }
/** /**
* 修改自己的用户信息 * 修改自己的用户信息
*
* @param user * @param user
* @param request * @param request
* @return * @return
*/ */
@PostMapping(value = "/updateBySelf", consumes = "application/json") @PostMapping(value = "/updateBySelf", consumes = "application/json")
public ResultVO updateBySelf(@RequestBody UserBean user, public ResultVO updateBySelf(@RequestBody UserBean user,
HttpServletRequest request){ HttpServletRequest request) {
Integer uId = getUIdByCookie(request); Integer uId = getUIdByCookie(request);
if (uId == null){ if (uId == null) {
return ResultVOUtil.error(-1,"未找到该用户ID"); return ResultVOUtil.error(-1, "未找到该用户ID");
} }
UserBean old = userService.findById(uId); UserBean old = userService.findById(uId);
user.setUId(uId); user.setUId(uId);
@ -150,28 +152,30 @@ public class UserController {
/** /**
* 修改用户信息 * 修改用户信息
*
* @param map * @param map
* @param request * @param request
* @return * @return
*/ */
@PostMapping(value = "/updateUser", consumes = "application/json") @PostMapping(value = "/updateUser", consumes = "application/json")
public ResultVO updateUser(@RequestBody Map<String,Object> map, public ResultVO updateUser(@RequestBody Map<String, Object> map,
HttpServletRequest request){ HttpServletRequest request) {
// 转换对象 // 转换对象
UserBean user = (UserBean) Map2Object.map2Object(map,UserBean.class); UserBean user = (UserBean) Map2Object.map2Object(map, UserBean.class);
if (user.getUId() == null){ if (user.getUId() == null) {
return ResultVOUtil.error(-1,"未找到该用户ID"); return ResultVOUtil.error(-1, "未找到该用户ID");
} }
UserBean old = userService.findById(user.getUId()); UserBean old = userService.findById(user.getUId());
user.setUId(user.getUId()); user.setUId(user.getUId());
user.setPassword(old.getPassword()); user.setPassword(old.getPassword());
user.setUsername(old.getUsername()); user.setUsername(old.getUsername());
userService.update(user,(Integer) map.get("position")); userService.update(user, (Integer) map.get("position"));
return ResultVOUtil.success(); return ResultVOUtil.success();
} }
/** /**
* 通过cookie查找Uid * 通过cookie查找Uid
*
* @param request * @param request
* @return * @return
*/ */

10
java/src/main/java/com/hzu/bookingsystem/filter/UserAuthorizeAspect.java
Unescape View File

@ -24,11 +24,11 @@ public class UserAuthorizeAspect {
@Autowired @Autowired
private StringRedisTemplate redisTemplate; private StringRedisTemplate redisTemplate;
// @Pointcut("execution(public * com.hzu.bookingsystem.controller.*.*(..))" + @Pointcut("execution(public * com.hzu.bookingsystem.controller.*.*(..))" +
// "&& !execution(public * com.hzu.bookingsystem.controller.UserController.login(..))" + "&& !execution(public * com.hzu.bookingsystem.controller.UserController.login(..))" +
// "&& !execution(public * com.hzu.bookingsystem.controller.UserController.logout(..))") "&& !execution(public * com.hzu.bookingsystem.controller.UserController.logout(..))")
@Pointcut( // @Pointcut(
"execution(public * com.hzu.bookingsystem.controller.UserController.getUserList(..))") // "execution(public * com.hzu.bookingsystem.controller.UserController.getUserList(..))")
public void verify() {} public void verify() {}
@Before("verify()") @Before("verify()")

2
java/src/main/java/com/hzu/bookingsystem/repository/UserAuthRepository.java
Unescape View File

@ -9,4 +9,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
*/ */
public interface UserAuthRepository extends JpaRepository<UserAuthBean,String> { public interface UserAuthRepository extends JpaRepository<UserAuthBean,String> {
UserAuthBean findByUId(Integer uId); UserAuthBean findByUId(Integer uId);
void deleteByUId(Integer uId);
} }

2
java/src/main/java/com/hzu/bookingsystem/service/UserAuthService.java
Unescape View File

@ -7,7 +7,7 @@ public interface UserAuthService {
UserAuthBean update(Integer uId, Integer groupId); UserAuthBean update(Integer uId, Integer groupId);
void delete(Integer uId, Integer groupId); void delete(Integer uId);
UserAuthBean findByUId(Integer uId); UserAuthBean findByUId(Integer uId);
} }

5
java/src/main/java/com/hzu/bookingsystem/service/impl/UserAuthServiceImpl.java
Unescape View File

@ -24,9 +24,8 @@ public class UserAuthServiceImpl implements UserAuthService {
} }
@Override @Override
public void delete(Integer uId, Integer groupId) { public void delete(Integer uId) {
UserAuthBean userAuth = new UserAuthBean(uId,groupId); userAuthRepository.deleteByUId(uId);
userAuthRepository.delete(userAuth);
} }
@Override @Override

3
java/src/main/java/com/hzu/bookingsystem/service/impl/UserServiceImpl.java
Unescape View File

@ -74,6 +74,9 @@ public class UserServiceImpl implements UserService {
@Override @Override
@Transactional @Transactional
public void deleteById(Integer uId) { public void deleteById(Integer uId) {
//清除用户组中的用户信息
userAuthService.delete(uId);
//清除用户
userRepository.deleteByUId(uId); userRepository.deleteByUId(uId);
} }

Write Preview
Loading…
Cancel
Save