Added role management

Pinnacle/src/main/java/com/cfive/pinnacle/entity/Department.java

@@ -10,6 +10,8 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -30,6 +32,7 @@ public class Department implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**

Pinnacle/src/main/java/com/cfive/pinnacle/entity/Group.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.annotation.Version;
 import java.io.Serial;
 import java.io.Serializable;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -29,6 +31,7 @@ public class Group implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**

Pinnacle/src/main/java/com/cfive/pinnacle/entity/Role.java

@@ -8,7 +8,14 @@ import com.baomidou.mybatisplus.annotation.Version;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.List;
 
+import com.cfive.pinnacle.entity.permission.Element;
+import com.cfive.pinnacle.entity.permission.Menu;
+import com.cfive.pinnacle.entity.permission.Operation;
+import com.cfive.pinnacle.entity.permission.Power;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -29,6 +36,7 @@ public class Role implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -37,6 +45,18 @@ public class Role implements Serializable {
     @TableField("name")
     private String name;
 
+    @TableField(exist = false)
+    private List<Menu> menus;
+
+    @TableField(exist = false)
+    private List<Element> elements;
+
+    @TableField(exist = false)
+    private List<Operation> operations;
+
+    @TableField(exist = false)
+    private List<Power> powers;
+
     @TableField("deleted")
     @TableLogic
     private Integer deleted;

Pinnacle/src/main/java/com/cfive/pinnacle/entity/RoleGroup.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.annotation.Version;
 import java.io.Serial;
 import java.io.Serializable;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -29,18 +31,21 @@ public class RoleGroup implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
      * 角色
      */
     @TableField("role_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
     /**
      * 群组
      */
     @TableField("group_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long groupId;
 
     @TableField("deleted")

Pinnacle/src/main/java/com/cfive/pinnacle/entity/Staff.java

@@ -10,6 +10,8 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDate;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -30,12 +32,14 @@ public class Staff implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
      * 用户
      */
     @TableField("user_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
     /**

Pinnacle/src/main/java/com/cfive/pinnacle/entity/User.java

@@ -50,6 +50,7 @@ public class User implements Serializable {
      * 部门
      */
     @TableField("department_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long departmentId;
 
     /**

Pinnacle/src/main/java/com/cfive/pinnacle/entity/UserGroup.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.annotation.Version;
 import java.io.Serial;
 import java.io.Serializable;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -29,18 +31,21 @@ public class UserGroup implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
      * 用户
      */
     @TableField("user_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
     /**
      * 用户组
      */
     @TableField("group_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long groupId;
 
     @TableField("deleted")

Pinnacle/src/main/java/com/cfive/pinnacle/entity/UserRole.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.annotation.Version;
 import java.io.Serial;
 import java.io.Serializable;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -29,18 +31,21 @@ public class UserRole implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
      * 用户
      */
     @TableField("user_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
     /**
      * 角色
      */
     @TableField("role_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
     @TableField("deleted")

Pinnacle/src/main/java/com/cfive/pinnacle/entity/UserWork.java

@@ -31,6 +31,7 @@ public class UserWork implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**

Pinnacle/src/main/java/com/cfive/pinnacle/entity/Work.java

@@ -47,6 +47,7 @@ public class Work implements Serializable {
      * 发布者
      */
     @TableField("publisher_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long publisherId;
 
     @TableField(exist = false)
@@ -82,6 +83,7 @@ public class Work implements Serializable {
      * 源ID
      */
     @TableField("origin_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long originId;
 
     @TableField("deleted")

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Element.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serial;
 import java.io.Serializable;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -31,6 +33,7 @@ public class Element implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -43,5 +46,13 @@ public class Element implements Serializable {
      *  权限ID
      */
     @TableField("power_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long powerId;
+
+    /**
+     *  菜单ID
+     */
+    @TableField("menu_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long menuId;
 }

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/File.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serial;
 import java.io.Serializable;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -31,6 +33,7 @@ public class File implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -49,5 +52,6 @@ public class File implements Serializable {
      *  权限ID
      */
     @TableField("power_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long powerId;
 }

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Menu.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serial;
 import java.io.Serializable;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -31,6 +33,7 @@ public class Menu implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -49,11 +52,13 @@ public class Menu implements Serializable {
      *  权限ID
      */
     @TableField("power_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long powerId;
 
     /**
      * 父ID
      */
     @TableField("parent_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
 }

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Operation.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serial;
 import java.io.Serializable;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -31,6 +33,7 @@ public class Operation implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
@@ -49,11 +52,20 @@ public class Operation implements Serializable {
      *  权限ID
      */
     @TableField("power_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long powerId;
 
+    /**
+     *  页面元素ID
+     */
+    @TableField("element_id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long elementId;
+
     /**
      * 父ID
      */
     @TableField("parent_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long parentId;
 }

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/OperationLog.java

@@ -10,6 +10,8 @@ import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -34,18 +36,21 @@ public class OperationLog implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
      * 用户
      */
     @TableField("user_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long userId;
 
     /**
      * 功能
      */
     @TableField("operation_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long operationId;
 
     /**

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Power.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serial;
 import java.io.Serializable;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -31,11 +33,13 @@ public class Power implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
      * 权限类型
      */
     @TableField("type_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long typeId;
 }

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/PowerRole.java

@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.annotation.Version;
 import java.io.Serial;
 import java.io.Serializable;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -33,18 +35,21 @@ public class PowerRole implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**
      * 权限
      */
     @TableField("power_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long powerId;
 
     /**
      * 角色
      */
     @TableField("role_id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long roleId;
 
     @TableField("deleted")

Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/PowerType.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serial;
 import java.io.Serializable;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -31,6 +33,7 @@ public class PowerType implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId("id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /**