update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/SysRolePrivilege.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -18,9 +19,15 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("sys_role_privilege")
-public class SysRolePrivilege extends BaseEntity implements Serializable {
+public class SysRolePrivilege implements Serializable {
 
     private static final long serialVersionUID = 1L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id")
+    private Long id;
+
     /**
      * 角色ID
      */
@@ -35,6 +42,30 @@ public class SysRolePrivilege extends BaseEntity implements Serializable {
     @TableField("privilege_id")
     private Long privilegeId;
 
+    @ApiModelProperty(value = "是否启用，false：停用，true：启用")
+    @TableField(value = "enable")
+    private Boolean enable;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
     public Long getRoleId() {
         return roleId;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/SysUserRole.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -22,6 +23,11 @@ public class SysUserRole extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id")
+    private Long id;
+
     /**
      * 用户ID
      */
@@ -36,6 +42,32 @@ public class SysUserRole extends BaseEntity implements Serializable {
     @TableField("role_id")
     private Long roleId;
 
+    @ApiModelProperty(value = "是否启用，false：停用，true：启用")
+    @TableField(value = "enable")
+    private Boolean enable;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    @Override
+    public Long getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
     public Long getUserId() {
         return userId;
     }

distributed-print-business/src/main/resources/db/init-table.sql

@@ -499,16 +499,19 @@ CREATE TABLE `sys_role_course`  (
 -- Table structure for sys_role_privilege
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_role_privilege`;
-CREATE TABLE `sys_role_privilege`  (
-  `id` bigint(10) NOT NULL AUTO_INCREMENT,
-  `role_id` bigint(10) NOT NULL COMMENT '角色ID',
-  `privilege_id` bigint(10) NOT NULL COMMENT '菜单ID',
-  `create_id` bigint(10) NULL DEFAULT NULL,
-  `create_time` bigint(13) NULL DEFAULT NULL,
-  `update_id` bigint(10) NULL DEFAULT NULL,
-  `update_time` bigint(13) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 15 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '角色和菜单关联表' ROW_FORMAT = Dynamic;
+CREATE TABLE sys_role_privilege
+(
+	id BIGINT AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	role_id BIGINT
+		COMMENT '角色ID' NOT NULL,
+	privilege_id BIGINT
+		COMMENT '菜单ID' NOT NULL,
+	enable TINYINT DEFAULT 1
+		COMMENT '是否禁用，false：禁用，true：启用' NULL
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='角色和菜单关联表';
+
+/* Add Comments */
+ALTER TABLE sys_role_privilege COMMENT = '角色和菜单关联表';
 
 -- ----------------------------
 -- Table structure for sys_user
@@ -536,15 +539,19 @@ CREATE TABLE `sys_user`  (
 -- Table structure for sys_user_role
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_user_role`;
-CREATE TABLE `sys_user_role`  (
-  `id` bigint(10) NOT NULL AUTO_INCREMENT,
-  `user_id` bigint(10) NOT NULL COMMENT '用户ID',
-  `role_id` bigint(10) NOT NULL COMMENT '角色ID',
-  `create_id` bigint(10) NULL DEFAULT NULL,
-  `create_time` bigint(13) NULL DEFAULT NULL,
-  `update_id` bigint(10) NULL DEFAULT NULL,
-  `update_time` bigint(13) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 33 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '用户和角色关联表' ROW_FORMAT = Dynamic;
+CREATE TABLE sys_user_role
+(
+	id BIGINT AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	user_id BIGINT
+		COMMENT '用户ID' NOT NULL,
+	role_id BIGINT
+		COMMENT '角色ID' NOT NULL,
+	privilege_id BIGINT
+		COMMENT '权限id' NOT NULL,
+	enable TINYINT DEFAULT 1
+		COMMENT '是否禁用，false：禁用，true：启用' NOT NULL
+) ENGINE=InnoDB AUTO_INCREMENT=33 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='用户和角色关联表';
 
+/* Add Comments */
+ALTER TABLE sys_user_role COMMENT = '用户和角色关联表';
 SET FOREIGN_KEY_CHECKS = 1;