update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/base/BaseEntity.java

@@ -22,7 +22,7 @@ public class BaseEntity implements Serializable {
 
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "主键")
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id")
     private Long id;
 
     @JsonSerialize(using = ToStringSerializer.class)

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/PrivilegeDto.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.bean.dto;
 
-import com.qmth.distributed.print.business.enums.PrivilegeTypeEnum;
+import com.qmth.distributed.print.business.enums.PrivilegeEnum;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,7 +14,7 @@ public class PrivilegeDto {
     private String schoolId;
     private String name;
     private String url;
-    private PrivilegeTypeEnum type;
+    private PrivilegeEnum type;
     private Long parentId;
     private Integer sortNumber;
     private List<PrivilegeDto> children = new ArrayList<>();
@@ -51,11 +51,11 @@ public class PrivilegeDto {
         this.url = url;
     }
 
-    public PrivilegeTypeEnum getType() {
+    public PrivilegeEnum getType() {
         return type;
     }
 
-    public void setType(PrivilegeTypeEnum type) {
+    public void setType(PrivilegeEnum type) {
         this.type = type;
     }
 

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

@@ -2,6 +2,8 @@ package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 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 com.qmth.distributed.print.business.enums.ExamNumberStyleEnum;
 import com.qmth.distributed.print.business.enums.PaperTypeEnum;
@@ -21,6 +23,7 @@ public class BasicCardRule extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
     /**
@@ -85,6 +88,7 @@ public class BasicCardRule extends BaseEntity implements Serializable {
      */
     private String remark;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField(exist = false)
     private Long[] orgIds;
 

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

@@ -2,6 +2,8 @@ package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 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 java.io.Serializable;
@@ -22,6 +24,7 @@ public class BasicCourse extends BaseEntity implements Serializable {
     /**
      * 学校ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
     /**

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

@@ -2,6 +2,8 @@ package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 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 com.qmth.distributed.print.business.enums.PrintMethodEnum;
 
@@ -20,6 +22,7 @@ public class BasicExamRule extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
     /**

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

@@ -2,6 +2,8 @@ package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 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 com.qmth.distributed.print.business.enums.ClassifyEnum;
 import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
@@ -21,6 +23,7 @@ public class BasicTemplate extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
     /**
@@ -39,6 +42,7 @@ public class BasicTemplate extends BaseEntity implements Serializable {
     /**
      * 模板附件ID（保存到附件表ID）
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("attachment_id")
     private Long attachmentId;
     /**
@@ -50,6 +54,7 @@ public class BasicTemplate extends BaseEntity implements Serializable {
      */
     private String remark;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField(exist = false)
     private Long[] orgIds;
 

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

@@ -2,6 +2,8 @@ package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 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 com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 
@@ -27,11 +29,13 @@ public class BasicTemplateOrg extends BaseEntity implements Serializable {
     /**
      * 通卡模板ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("rule_id")
     private Long ruleId;
     /**
      * 组织机构ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("org_id")
     private Long orgId;
 

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

@@ -3,6 +3,8 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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 java.io.Serializable;
@@ -23,11 +25,13 @@ public class BasicUserCourse extends BaseEntity implements Serializable {
     /**
      * 用户ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("user_id")
     private Long userId;
     /**
      * 课程ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("course_id")
     private Long courseId;
 

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

@@ -3,6 +3,8 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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 java.io.Serializable;
@@ -23,6 +25,7 @@ public class BasicVerifyCode extends BaseEntity implements Serializable {
     /**
      * 用户ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("user_id")
     private Long userId;
     /**

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

@@ -2,6 +2,8 @@ package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 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 java.io.Serializable;
@@ -19,6 +21,7 @@ public class ExamCard extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
     /**

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

@@ -3,6 +3,8 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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 java.io.Serializable;
@@ -23,6 +25,7 @@ public class ExamCardDetail extends BaseEntity implements Serializable {
     /**
      * 题卡ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("card_id")
     private Long cardId;
     private String content;

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

@@ -3,6 +3,8 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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 java.io.Serializable;
@@ -20,11 +22,13 @@ public class ExamDetail extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
     /**
      * 印刷计划ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("print_plan_id")
     private Long printPlanId;
     @TableField("print_plan_name")

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

@@ -3,6 +3,8 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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 java.io.Serializable;
@@ -20,8 +22,11 @@ public class ExamDetailCourse extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
+
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("exam_detail_id")
     private Long examDetailId;
     @TableField("course_code")

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

@@ -2,6 +2,8 @@ package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 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 java.io.Serializable;
@@ -19,6 +21,7 @@ public class ExamPrintPlan extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
     /**

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

@@ -3,6 +3,8 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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 java.io.Serializable;
@@ -20,6 +22,7 @@ public class ExamStudent extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
     @TableField("exam_detail_course_id")

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

@@ -2,6 +2,8 @@ package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 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 com.qmth.distributed.print.business.enums.ExamStatusEnum;
 
@@ -23,6 +25,7 @@ public class ExamTask extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
     /**
@@ -57,11 +60,13 @@ public class ExamTask extends BaseEntity implements Serializable {
     /**
      * 题卡规则
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("card_rule_id")
     private Long cardRuleId;
     /**
      * 命题老师
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("user_id")
     private Long userId;
     /**

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

@@ -3,6 +3,8 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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 java.io.Serializable;
@@ -23,6 +25,7 @@ public class ExamTaskDetail extends BaseEntity implements Serializable {
     /**
      * 命题任务ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("exam_task_id")
     private Long examTaskId;
     /**
@@ -49,6 +52,7 @@ public class ExamTaskDetail extends BaseEntity implements Serializable {
     /**
      * 题卡ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("card_id")
     private Long cardId;
     /**

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

@@ -3,6 +3,8 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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 java.io.Serializable;
@@ -23,6 +25,7 @@ public class ExamTaskReviewLog extends BaseEntity implements Serializable {
     /**
      * 命题任务ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("exam_task_id")
     private Long examTaskId;
     /**
@@ -34,8 +37,11 @@ public class ExamTaskReviewLog extends BaseEntity implements Serializable {
      * 审核意见
      */
     private String reason;
+
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("operate_id")
     private Long operateId;
+
     @TableField("operate_time")
     private Long operateTime;
 

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

@@ -3,6 +3,8 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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 java.io.Serializable;
@@ -20,6 +22,7 @@ public class ExamTaskTemp extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
     /**

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

@@ -2,6 +2,8 @@ package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 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 java.io.Serializable;
@@ -22,6 +24,7 @@ public class SysOrg extends BaseEntity implements Serializable {
     /**
      * 学校ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
     /**
@@ -35,6 +38,7 @@ public class SysOrg extends BaseEntity implements Serializable {
     /**
      * 上级机构ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("parent_id")
     private Long parentId;
     /**

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

@@ -1,9 +1,13 @@
 package com.qmth.distributed.print.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.qmth.distributed.print.business.base.BaseEntity;
-import com.qmth.distributed.print.business.enums.PrivilegeTypeEnum;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.enums.PrivilegeEnum;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -16,45 +20,62 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("sys_privilege")
-public class SysPrivilege extends BaseEntity implements Serializable {
+public class SysPrivilege implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 学校ID
-     */
-    @TableField("school_id")
-    private Long schoolId;
-    /**
-     * 菜单名称
-     */
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "名称")
+    @TableField(value = "name")
     private String name;
-    /**
-     * URL地址
-     */
+
+    @ApiModelProperty(value = "地址")
+    @TableField(value = "url")
     private String url;
-    /**
-     * M-菜单，F-操作
-     */
-    private PrivilegeTypeEnum type;
-    /**
-     * 上级菜单
-     */
-    @TableField("parent_id")
+
+    @ApiModelProperty(value = "类型，MENU：菜单，BUTTON：按钮，LINK：链接，URL：接口地址，LIST：列表，CONDITION：查询条件")
+    @TableField(value = "type")
+    private PrivilegeEnum type;
+
+    @ApiModelProperty(value = "父id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "parent_id")
     private Long parentId;
-    @TableField("sort_number")
-    private Integer sortNumber;
-    /**
-     * 备注
-     */
+
+    @ApiModelProperty(value = "序号")
+    @TableField(value = "sequence")
+    private Integer sequence;
+
+    @ApiModelProperty(value = "属性，NO_AUTH：无需鉴权，AUTH：鉴权，SYS：系统公用")
+    @TableField(value = "property")
+    private String property;
+
+    @ApiModelProperty(value = "备注")
+    @TableField(value = "remark")
     private String remark;
 
-    public Long getSchoolId() {
-        return schoolId;
+    @ApiModelProperty(value = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)//新增执行
+    private Long createTime;
+
+    @ApiModelProperty(value = "是否启用，false：停用，true：启用")
+    @TableField(value = "enable")
+    private Boolean enable;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getId() {
+        return id;
     }
 
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
+    public void setId(Long id) {
+        this.id = id;
     }
 
     public String getName() {
@@ -73,11 +94,11 @@ public class SysPrivilege extends BaseEntity implements Serializable {
         this.url = url;
     }
 
-    public PrivilegeTypeEnum getType() {
+    public PrivilegeEnum getType() {
         return type;
     }
 
-    public void setType(PrivilegeTypeEnum type) {
+    public void setType(PrivilegeEnum type) {
         this.type = type;
     }
 
@@ -89,12 +110,20 @@ public class SysPrivilege extends BaseEntity implements Serializable {
         this.parentId = parentId;
     }
 
-    public Integer getSortNumber() {
-        return sortNumber;
+    public Integer getSequence() {
+        return sequence;
     }
 
-    public void setSortNumber(Integer sortNumber) {
-        this.sortNumber = sortNumber;
+    public void setSequence(Integer sequence) {
+        this.sequence = sequence;
+    }
+
+    public String getProperty() {
+        return property;
+    }
+
+    public void setProperty(String property) {
+        this.property = property;
     }
 
     public String getRemark() {
@@ -105,4 +134,19 @@ public class SysPrivilege extends BaseEntity implements Serializable {
         this.remark = remark;
     }
 
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
 }

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

@@ -2,6 +2,8 @@ package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 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 com.qmth.distributed.print.business.enums.RoleTypeEnum;
 
@@ -23,6 +25,7 @@ public class SysRole extends BaseEntity implements Serializable {
     /**
      * 学校ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
     /**
@@ -38,6 +41,7 @@ public class SysRole extends BaseEntity implements Serializable {
      */
     private RoleTypeEnum type;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField(exist = false)
     private Long[] privilegeIds;
 

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

@@ -2,6 +2,8 @@ package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 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 java.io.Serializable;
@@ -19,8 +21,11 @@ public class SysRoleCourse extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("role_id")
     private Long roleId;
+
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("course_id")
     private Long courseId;
 

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

@@ -3,6 +3,8 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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 java.io.Serializable;
@@ -22,11 +24,14 @@ public class SysRolePrivilege extends BaseEntity implements Serializable {
     /**
      * 角色ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("role_id")
     private Long roleId;
+
     /**
      * 菜单ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("privilege_id")
     private Long privilegeId;
 

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

@@ -2,6 +2,8 @@ package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 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 java.io.Serializable;
@@ -22,6 +24,7 @@ public class SysUser extends BaseEntity implements Serializable {
     /**
      * 学校ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("school_id")
     private Long schoolId;
     /**
@@ -43,6 +46,8 @@ public class SysUser extends BaseEntity implements Serializable {
      */
     @TableField("mobile_number")
     private String mobileNumber;
+
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("org_id")
     private Long orgId;
     /**
@@ -59,9 +64,11 @@ public class SysUser extends BaseEntity implements Serializable {
      */
     private String remark;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField(exist = false)
     private Long[] roleIds;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField(exist = false)
     private Long[] courseIds;
 

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

@@ -3,6 +3,8 @@ package com.qmth.distributed.print.business.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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 java.io.Serializable;
@@ -23,15 +25,17 @@ public class SysUserRole extends BaseEntity implements Serializable {
     /**
      * 用户ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("user_id")
     private Long userId;
+
     /**
      * 角色ID
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     @TableField("role_id")
     private Long roleId;
 
-
     public Long getUserId() {
         return userId;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/PrivilegeTypeEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/PrivilegeEnum.java

@@ -4,32 +4,57 @@ import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 菜单类型
  * @Date: 2021/3/23.
  */
-public enum PrivilegeTypeEnum {
+public enum PrivilegeEnum {
 
-    M("菜单"),
-    F("操作");
+    MENU("菜单"),
 
-    PrivilegeTypeEnum(String desc) {
-        this.desc = desc;
-    }
+    BUTTON("按钮"),
+
+    LINK("链接"),
+
+    URL("接口地址"),
+
+    LIST("列表"),
+
+    CONDITION("查询条件");
 
     private String desc;
 
+    private PrivilegeEnum(String desc) {
+        this.desc = desc;
+    }
+
     public String getDesc() {
         return desc;
     }
 
+    /**
+     * 状态转换 toName
+     *
+     * @param title
+     * @return
+     */
+    public static String convertToName(String title) {
+        for (PrivilegeEnum e : PrivilegeEnum.values()) {
+            if (Objects.equals(title, e.getDesc())) {
+                return e.name();
+            }
+        }
+        return null;
+    }
+
     /**
      * @return
      */
     public static List<EnumResult> listTypes() {
         List<EnumResult> list = new ArrayList<EnumResult>();
-        for (PrivilegeTypeEnum value : PrivilegeTypeEnum.values()) {
+        for (PrivilegeEnum value : PrivilegeEnum.values()) {
             EnumResult result = new EnumResult();
             result.setName(value.name());
             result.setOrdinal(value.ordinal());

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

@@ -438,21 +438,30 @@ CREATE TABLE `sys_org`  (
 -- Table structure for sys_privilege
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_privilege`;
-CREATE TABLE `sys_privilege`  (
-  `id` bigint(10) NOT NULL AUTO_INCREMENT,
-  `school_id` bigint(10) NULL DEFAULT NULL COMMENT '学校ID',
-  `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '菜单名称',
-  `url` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'URL地址',
-  `type` varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'M-菜单，F-操作',
-  `parent_id` bigint(10) NULL DEFAULT NULL COMMENT '上级菜单',
-  `sort_number` int(11) NOT NULL,
-  `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注',
-  `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 = 8 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '菜单权限表' ROW_FORMAT = Dynamic;
+CREATE TABLE sys_privilege
+(
+	id BIGINT AUTO_INCREMENT PRIMARY KEY NOT NULL,
+	name VARCHAR(100)
+		COMMENT '菜单名称' NOT NULL,
+	url VARCHAR(100)
+		COMMENT 'URL地址' NOT NULL,
+	type VARCHAR(50)
+		COMMENT '类型，MENU：菜单，BUTTON：按钮，LINK：链接，URL：接口地址，LIST：列表，CONDITION：查询条件' NOT NULL,
+	parent_id BIGINT
+		COMMENT '上级菜单' NULL,
+	sequence INTEGER
+		COMMENT '序号' NOT NULL,
+	property VARCHAR(30)
+		COMMENT '属性，NO_AUTH：无需鉴权，AUTH：鉴权，SYS：系统公用' NULL,
+	remark VARCHAR(200)
+		COMMENT '备注' NULL,
+	create_time BIGINT NULL,
+	enable TINYINT DEFAULT 1
+		COMMENT '是否启用，false：停用，true：启用' NOT NULL
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='菜单权限表';
+
+/* Add Comments */
+ALTER TABLE sys_privilege COMMENT = '菜单权限表';
 
 -- ----------------------------
 -- Table structure for sys_role

distributed-print/src/main/java/com/qmth/distributed/print/api/EnumsController.java

@@ -63,7 +63,7 @@ public class EnumsController {
             list = PrintMethodEnum.listTypes();
         } else if (type.equals(EnumType.PRIVILEGE_TYPE.name())) {
             //菜单类型
-            list = PrivilegeTypeEnum.listTypes();
+            list = PrivilegeEnum.listTypes();
         } else if (type.equals(EnumType.REQUIRED_FIELDS.name())) {
             //考务必选字段
             list = RequiredFieldsEnum.listTypes();