refactor: 用户权限、身份、组关系重构

src/main/java/com/softeng/dingtalk/controller/UserController.java

@@ -33,7 +33,6 @@ public class UserController {
     UserService userService;
     @Autowired
     NotifyService notifyService;
-
     @Autowired
     BaseApi baseApi;
 
@@ -131,5 +130,24 @@ public void downloadLeaseContract(@RequestAttribute int uid, HttpServletResponse
         userService.downloadContractFile(uid,response);
     }
 
+    /**
+     * @author LiXiaoKang
+     * @description 新增获取用户权限与所属组信息
+     * @create 1/10/2020 8:38 PM
+     */
+
+    /**
+     * 获取用户权限信息
+     * @param uid
+     * @return
+     */
+    @GetMapping("/user/permission")
+    public List<String> getPermissions(@RequestAttribute int uid){
+        return userService.getPermissionNames(uid);
+    }
 
+    @GetMapping("/user/team")
+    public List<String> getTeams(@RequestAttribute int uid){
+        return userService.getTeams(uid);
+    }
 }

src/main/java/com/softeng/dingtalk/entity/Permission.java

@@ -0,0 +1,31 @@
+package com.softeng.dingtalk.entity;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * @author LiXiaoKang
+ * @description 用户权限类
+ * @date 02/02/2023
+ */
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@ToString
+public class Permission {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+
+    private String name;
+
+    private String description;
+}

src/main/java/com/softeng/dingtalk/entity/Team.java

@@ -0,0 +1,29 @@
+package com.softeng.dingtalk.entity;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * @author LiXiaoKang
+ * @description 用户组实体类
+ * @date 02/02/2023
+ */
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@ToString
+public class Team {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private int id;
+
+    private String name;
+}

src/main/java/com/softeng/dingtalk/entity/User.java

@@ -159,6 +159,17 @@ public class User {
     @OneToMany(mappedBy = "user", cascade = CascadeType.REMOVE)
     private List<Prize> allPrizes;
 
+    /**
+     * @author LiXiaoKang
+     * @description todo-用户权限重构
+     * @date 2/3/2023
+     */
+
+    /**
+     * 用户权限id（代替authority）
+     */
+    private int permissionId;
+
 
     public User(String userid, String unionid, String name, String avatar, int authority, Position position) {
         this.userid = userid;

src/main/java/com/softeng/dingtalk/entity/UserPermission.java

@@ -0,0 +1,31 @@
+package com.softeng.dingtalk.entity;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+
+/**
+ * @author LiXiaoKang
+ * @description 用户-用户权限实体类
+ * @date 02/02/2023
+ */
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@ToString
+// 设置联合主键的注解
+@IdClass(UserPermissionAssociatePK.class)
+public class UserPermission {
+
+    @Id
+    private int userId;
+
+    @Id
+    private int permissionId;
+}

src/main/java/com/softeng/dingtalk/entity/UserPermissionAssociatePK.java

@@ -0,0 +1,38 @@
+package com.softeng.dingtalk.entity;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @author LiXiaoKang
+ * @description 用户-权限实体类的联合主键
+ * @date 02/02/2023
+ */
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class UserPermissionAssociatePK implements Serializable {
+
+    private int userId;
+
+    private int permissionId;
+
+    @Override
+    public boolean equals(Object obj){
+        if(obj instanceof UserPermissionAssociatePK){
+            return userId == ((UserPermissionAssociatePK) obj).userId && permissionId == ((UserPermissionAssociatePK) obj).getPermissionId();
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode(){
+        return userId+permissionId;
+    }
+}

src/main/java/com/softeng/dingtalk/entity/UserTeam.java

@@ -0,0 +1,32 @@
+package com.softeng.dingtalk.entity;
+
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+
+/**
+ * @author LiXiaoKang
+ * @description 用户组实体类
+ * @date 02/02/2023
+ */
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@ToString
+// 设置联合主键的注解
+@IdClass(UserTeamAssociatePK.class)
+public class UserTeam {
+
+    @Id
+    private int userId;
+
+    @Id
+    private int teamId;
+}

src/main/java/com/softeng/dingtalk/entity/UserTeamAssociatePK.java

@@ -0,0 +1,38 @@
+package com.softeng.dingtalk.entity;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+/**
+ * @author LiXiaoKang
+ * @description 用户-用户组实体类的联合主键
+ * @date 02/02/2023
+ */
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class UserTeamAssociatePK implements Serializable {
+
+    private int userId;
+
+    private int teamId;
+
+    @Override
+    public boolean equals(Object obj){
+        if(obj instanceof UserTeamAssociatePK){
+            return userId == ((UserTeamAssociatePK) obj).userId && teamId == ((UserTeamAssociatePK) obj).getTeamId();
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode(){
+        return userId+teamId;
+    }
+}

src/main/java/com/softeng/dingtalk/enums/Position.java

@@ -13,7 +13,14 @@ public enum Position {
     ACADEMIC("学硕"),
     PROFESSIONAL("专硕"),
     UNDERGRADUATE("本科生"),
-    OTHER("待定");
+    OTHER("待定"),
+
+    /**
+     * @author LiXiaoKang
+     * @description todo-新增职位/学位
+     * @create 2/4/2023
+     */
+    TEACHER("教师");
 
     private String title;
 

src/main/java/com/softeng/dingtalk/repository/PermissionRepository.java

@@ -0,0 +1,16 @@
+package com.softeng.dingtalk.repository;
+
+import com.softeng.dingtalk.entity.Permission;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author LiXiaoKang
+ * @description 操作Permission实体类的接口
+ * @date 2/5/2023
+ */
+
+@Repository
+public interface PermissionRepository extends CustomizedRepository<Permission, Integer>{
+
+    Permission findById(int id);
+}

src/main/java/com/softeng/dingtalk/repository/TeamRepository.java

@@ -0,0 +1,15 @@
+package com.softeng.dingtalk.repository;
+
+import com.softeng.dingtalk.entity.Team;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author LiXiaoKang
+ * @description 操作Team实体类的接口
+ * @date 2/5/2023
+ */
+
+@Repository
+public interface TeamRepository extends CustomizedRepository<Team, Integer>{
+    Team findById(int id);
+}

src/main/java/com/softeng/dingtalk/repository/UserPermissionRepository.java

@@ -0,0 +1,23 @@
+package com.softeng.dingtalk.repository;
+
+import com.softeng.dingtalk.entity.UserPermission;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author LiXiaoKang
+ * @description 操作UserPermission实体类的接口
+ * @date 2/5/2023
+ */
+
+@Repository
+public interface UserPermissionRepository extends CustomizedRepository<UserPermission, UserPermissionRepository>{
+
+    /**
+     * 获取用户的所有权限
+     * @param userId 用户id
+     * @return 用户所有权限
+     */
+    List<UserPermission> findAllByUserId(int userId);
+}

src/main/java/com/softeng/dingtalk/repository/UserTeamRepository.java

@@ -0,0 +1,24 @@
+package com.softeng.dingtalk.repository;
+
+import com.softeng.dingtalk.entity.UserTeam;
+import com.softeng.dingtalk.entity.UserTeamAssociatePK;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @author LiXiaoKang
+ * @description 操作UserTeam实体类的接口
+ * @date 2/5/2023
+ */
+
+@Repository
+public interface UserTeamRepository extends CustomizedRepository<UserTeam, UserTeamAssociatePK>{
+
+    /**
+     * 获取用户所在的所有用户组
+     * @param userId 用户id
+     * @return 用户所在的所有用户组
+     */
+    List<UserTeam> findAllByUserId(int userId);
+}