diff --git a/java/pom.xml b/java/pom.xml index 5b978b2..364a3d9 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -63,6 +63,12 @@ gson + + com.alibaba + easyexcel + 1.1.2-beta5 + + org.junit.jupiter junit-jupiter diff --git a/java/src/main/java/com/hzu/bookingsystem/controller/UserController.java b/java/src/main/java/com/hzu/bookingsystem/controller/UserController.java index b4398a0..320065a 100644 --- a/java/src/main/java/com/hzu/bookingsystem/controller/UserController.java +++ b/java/src/main/java/com/hzu/bookingsystem/controller/UserController.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; + @RestController @CrossOrigin @RequestMapping("/user") @@ -35,13 +36,13 @@ public class UserController { // 登录 @PostMapping("/login") public ResultVO login(@RequestBody UserBean user, - HttpServletResponse response) { + HttpServletResponse response) { //1. openid去和数据库里的数据匹配 - UserBean user1 = userService.findByUnameAndPwd(user.getUsername(),user.getPassword()); + UserBean user1 = userService.findByUnameAndPwd(user.getUsername(), user.getPassword()); System.out.println(user1); if (user1 == null) { - return ResultVOUtil.error(-2,"账号或密码不正确"); + return ResultVOUtil.error(-2, "账号或密码不正确"); } //2. 设置token至redis @@ -57,13 +58,13 @@ public class UserController { // 登出 @GetMapping("/logout") public ResultVO logout(HttpServletRequest request, - HttpServletResponse response) { + HttpServletResponse response) { //1. 从cookie里查询 Cookie cookie = CookieUtil.get(request, "token"); if (cookie != null) { - //2. 清除redis + //2. 清除redis redisTemplate.opsForValue().getOperations().delete(cookie.getValue()); - //3. 清除cookie + //3. 清除cookie CookieUtil.set(response, "token", null, 0); } return ResultVOUtil.success(); @@ -72,7 +73,7 @@ public class UserController { // 查看当前用户个人信息 @GetMapping(value = "/getUserInfo") - public ResultVO getUserInfo(HttpServletRequest request){ + public ResultVO getUserInfo(HttpServletRequest request) { Integer uId = getUIdByCookie(request); UserBean user = userService.findById(uId); user.setPassword(null); @@ -81,7 +82,7 @@ public class UserController { // 获取当前用户名称 @GetMapping(value = "/getUserName") - public ResultVO getUserName(HttpServletRequest request){ + public ResultVO getUserName(HttpServletRequest request) { Integer uId = getUIdByCookie(request); UserBean user = userService.findById(uId); return ResultVOUtil.success(user.getNickname()); @@ -89,24 +90,24 @@ public class UserController { //创建用户 @PostMapping(value = "/addUser", consumes = "application/json") - public ResultVO addUser(@RequestBody Map map) { + public ResultVO addUser(@RequestBody Map map) { // 0.转换对象 - UserBean user = (UserBean) Map2Object.map2Object(map,UserBean.class); + UserBean user = (UserBean) Map2Object.map2Object(map, UserBean.class); // 1.查重 if (userService.findByUserame(user.getUsername()) != null) - return ResultVOUtil.error(-1,"该工号已存在！"); + return ResultVOUtil.error(-1, "该工号已存在！"); // 2.插入 - userService.add(user,(Integer)map.get("position")); + userService.add(user, (Integer) map.get("position")); return ResultVOUtil.success(); } // 通过UID删除用户 @PostMapping(value = "/deleteUser", consumes = "application/json") - public ResultVO deleteUser(@RequestBody UserBean user){ + public ResultVO deleteUser(@RequestBody UserBean user) { // 查找该用户看是否存在 UserBean user1 = userService.findById(user.getUId()); - if (user1 == null){ - return ResultVOUtil.error(-1,"用户不存在"); + if (user1 == null) { + return ResultVOUtil.error(-1, "用户不存在"); } // 删除该用户 userService.deleteById(user1.getUId()); @@ -122,23 +123,24 @@ public class UserController { // 查找所有用户列表 @GetMapping(value = "/getUserList") - public ResultVO getUserList(){ + public ResultVO getUserList() { List userList = userService.findAllUserInfo(); return ResultVOUtil.success(userList); } /** * 修改自己的用户信息 + * * @param user * @param request * @return */ @PostMapping(value = "/updateBySelf", consumes = "application/json") public ResultVO updateBySelf(@RequestBody UserBean user, - HttpServletRequest request){ + HttpServletRequest request) { Integer uId = getUIdByCookie(request); - if (uId == null){ - return ResultVOUtil.error(-1,"未找到该用户ID"); + if (uId == null) { + return ResultVOUtil.error(-1, "未找到该用户ID"); } UserBean old = userService.findById(uId); user.setUId(uId); @@ -150,28 +152,30 @@ public class UserController { /** * 修改用户信息 + * * @param map * @param request * @return */ @PostMapping(value = "/updateUser", consumes = "application/json") - public ResultVO updateUser(@RequestBody Map map, - HttpServletRequest request){ + public ResultVO updateUser(@RequestBody Map map, + HttpServletRequest request) { // 转换对象 - UserBean user = (UserBean) Map2Object.map2Object(map,UserBean.class); - if (user.getUId() == null){ - return ResultVOUtil.error(-1,"未找到该用户ID"); + UserBean user = (UserBean) Map2Object.map2Object(map, UserBean.class); + if (user.getUId() == null) { + return ResultVOUtil.error(-1, "未找到该用户ID"); } UserBean old = userService.findById(user.getUId()); user.setUId(user.getUId()); user.setPassword(old.getPassword()); user.setUsername(old.getUsername()); - userService.update(user,(Integer) map.get("position")); + userService.update(user, (Integer) map.get("position")); return ResultVOUtil.success(); } /** * 通过cookie查找Uid + * * @param request * @return */ diff --git a/java/src/main/java/com/hzu/bookingsystem/filter/UserAuthorizeAspect.java b/java/src/main/java/com/hzu/bookingsystem/filter/UserAuthorizeAspect.java index d9b856d..aa52fd3 100644 --- a/java/src/main/java/com/hzu/bookingsystem/filter/UserAuthorizeAspect.java +++ b/java/src/main/java/com/hzu/bookingsystem/filter/UserAuthorizeAspect.java @@ -24,11 +24,11 @@ public class UserAuthorizeAspect { @Autowired private StringRedisTemplate redisTemplate; -// @Pointcut("execution(public * com.hzu.bookingsystem.controller.*.*(..))" + -// "&& !execution(public * com.hzu.bookingsystem.controller.UserController.login(..))" + -// "&& !execution(public * com.hzu.bookingsystem.controller.UserController.logout(..))") - @Pointcut( - "execution(public * com.hzu.bookingsystem.controller.UserController.getUserList(..))") + @Pointcut("execution(public * com.hzu.bookingsystem.controller.*.*(..))" + + "&& !execution(public * com.hzu.bookingsystem.controller.UserController.login(..))" + + "&& !execution(public * com.hzu.bookingsystem.controller.UserController.logout(..))") +// @Pointcut( +// "execution(public * com.hzu.bookingsystem.controller.UserController.getUserList(..))") public void verify() {} @Before("verify()") diff --git a/java/src/main/java/com/hzu/bookingsystem/repository/UserAuthRepository.java b/java/src/main/java/com/hzu/bookingsystem/repository/UserAuthRepository.java index 896d05d..ef571d7 100644 --- a/java/src/main/java/com/hzu/bookingsystem/repository/UserAuthRepository.java +++ b/java/src/main/java/com/hzu/bookingsystem/repository/UserAuthRepository.java @@ -9,4 +9,6 @@ import org.springframework.data.jpa.repository.JpaRepository; */ public interface UserAuthRepository extends JpaRepository { UserAuthBean findByUId(Integer uId); + + void deleteByUId(Integer uId); } diff --git a/java/src/main/java/com/hzu/bookingsystem/service/UserAuthService.java b/java/src/main/java/com/hzu/bookingsystem/service/UserAuthService.java index 4cf4cc4..006c8dd 100644 --- a/java/src/main/java/com/hzu/bookingsystem/service/UserAuthService.java +++ b/java/src/main/java/com/hzu/bookingsystem/service/UserAuthService.java @@ -7,7 +7,7 @@ public interface UserAuthService { UserAuthBean update(Integer uId, Integer groupId); - void delete(Integer uId, Integer groupId); + void delete(Integer uId); UserAuthBean findByUId(Integer uId); } diff --git a/java/src/main/java/com/hzu/bookingsystem/service/impl/UserAuthServiceImpl.java b/java/src/main/java/com/hzu/bookingsystem/service/impl/UserAuthServiceImpl.java index 1505a4f..efafb9c 100644 --- a/java/src/main/java/com/hzu/bookingsystem/service/impl/UserAuthServiceImpl.java +++ b/java/src/main/java/com/hzu/bookingsystem/service/impl/UserAuthServiceImpl.java @@ -24,9 +24,8 @@ public class UserAuthServiceImpl implements UserAuthService { } @Override - public void delete(Integer uId, Integer groupId) { - UserAuthBean userAuth = new UserAuthBean(uId,groupId); - userAuthRepository.delete(userAuth); + public void delete(Integer uId) { + userAuthRepository.deleteByUId(uId); } @Override diff --git a/java/src/main/java/com/hzu/bookingsystem/service/impl/UserServiceImpl.java b/java/src/main/java/com/hzu/bookingsystem/service/impl/UserServiceImpl.java index bc799c5..cc5cb4d 100644 --- a/java/src/main/java/com/hzu/bookingsystem/service/impl/UserServiceImpl.java +++ b/java/src/main/java/com/hzu/bookingsystem/service/impl/UserServiceImpl.java @@ -74,6 +74,9 @@ public class UserServiceImpl implements UserService { @Override @Transactional public void deleteById(Integer uId) { + //清除用户组中的用户信息 + userAuthService.delete(uId); + //清除用户 userRepository.deleteByUId(uId); }