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

java/pom.xml

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

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")
@@ -129,6 +130,7 @@ public class UserController {
 
     /**
      * 修改自己的用户信息
+     *
      * @param user
      * @param request
      * @return
@@ -150,6 +152,7 @@ public class UserController {
 
     /**
      * 修改用户信息
+     *
      * @param map
      * @param request
      * @return
@@ -172,6 +175,7 @@ public class UserController {
 
     /**
      * 通过cookie查找Uid
+     *
      * @param request
      * @return
      */

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()")

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,String> {
     UserAuthBean findByUId(Integer uId);
+
+    void deleteByUId(Integer uId);
 }

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);
 }

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

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);
     }