From e9bbc1e2744a0a738b9d470f7da8c63e25c1bddd Mon Sep 17 00:00:00 2001
From: suyiiyii <suyiiyii@gmail.com>
Date: Fri, 16 Aug 2024 22:47:45 +0800
Subject: [PATCH] =?UTF-8?q?refactor(user):=20=E6=9B=B4=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BB=84=E5=AD=97=E6=AE=B5=E5=B9=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

用户实体的group字段已被重命名为userGroup，以提高清晰度。此外，与用户组相关的逻辑已从UserService和UserController中更新，以适应这一变化。用户权限集合的处理逻辑也被移除。
---
 .../top/suyiiyii/sims/controller/UserController.java     | 2 +-
 src/main/java/top/suyiiyii/sims/entity/User.java         | 9 +--------
 src/main/java/top/suyiiyii/sims/service/UserService.java | 8 +++-----
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/main/java/top/suyiiyii/sims/controller/UserController.java b/src/main/java/top/suyiiyii/sims/controller/UserController.java
index 5c5c0a4..c9e0362 100644
--- a/src/main/java/top/suyiiyii/sims/controller/UserController.java
+++ b/src/main/java/top/suyiiyii/sims/controller/UserController.java
@@ -78,7 +78,7 @@ public class UserController {
         user.setPassword(request.getPassword());
         user.setEmail(request.getEmail());
         user.setGrade(request.getGrade());
-        user.setGroup(request.getGroup());
+        user.setUserGroup(request.getGroup());
         userService.register(user);
 
         return Result.success(CommonResponse.factory("注册成功"));
diff --git a/src/main/java/top/suyiiyii/sims/entity/User.java b/src/main/java/top/suyiiyii/sims/entity/User.java
index 6606503..d7bed55 100644
--- a/src/main/java/top/suyiiyii/sims/entity/User.java
+++ b/src/main/java/top/suyiiyii/sims/entity/User.java
@@ -1,14 +1,11 @@
 package top.suyiiyii.sims.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.tangzc.mpe.autotable.annotation.Table;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.Set;
-
 /**
  * @Author tortoise
  * @Date 2024/8/9 14:02
@@ -29,9 +26,5 @@ public class User {
     private String password;
     private String email;
     private String grade;
-    private String group;
-    @TableField(exist = false)
-    private String token;
-    @TableField(exist = false)
-    private Set<Permissions> permissions;
+    private String userGroup;
 }
diff --git a/src/main/java/top/suyiiyii/sims/service/UserService.java b/src/main/java/top/suyiiyii/sims/service/UserService.java
index c5a086d..fcaabc3 100644
--- a/src/main/java/top/suyiiyii/sims/service/UserService.java
+++ b/src/main/java/top/suyiiyii/sims/service/UserService.java
@@ -2,7 +2,6 @@ package top.suyiiyii.sims.service;
 
 
 
-import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -74,7 +73,6 @@ public class UserService {
                 permissionsSet.add(permissions);
             }
         }
-        dbUser.setPermissions(permissionsSet);
 
         String token = JwtUtils.createToken(dbUser.getId().toString(), dbUser.getPassword());
 
@@ -103,7 +101,7 @@ public class UserService {
         if (user.getEmail() == null || user.getEmail().equals("")) {
             throw new ServiceException("邮箱不能为空");
         }
-        if (user.getGroup() == null || user.getGroup().equals("")) {
+        if (user.getUserGroup() == null || user.getUserGroup().equals("")) {
             throw new ServiceException("组别不能为空");
         }
 
@@ -125,7 +123,7 @@ public class UserService {
             UserDto.setUserId(user.getId());
             UserDto.setUsername(user.getUsername());
             UserDto.setGrade(user.getGrade());
-            UserDto.setGroup(user.getGroup());
+            UserDto.setGroup(user.getUserGroup());
             UserDto.setRoles(new ArrayList<>());
             Integer id = user.getId();
             List<UserRole> userRoles = roleMapper.selectRolesById(id);
@@ -147,7 +145,7 @@ public class UserService {
         UserDto.setUserId(user.getId());
         UserDto.setUsername(user.getUsername());
         UserDto.setGrade(user.getGrade());
-        UserDto.setGroup(user.getGroup());
+        UserDto.setGroup(user.getUserGroup());
         UserDto.setRoles(new ArrayList<>());
         List<UserRole> userRoles = roleMapper.selectRolesById(id);
         for (UserRole userRole : userRoles) {