'sys-user'

digit-print-business/pom.xml

@@ -5,11 +5,23 @@
 	<groupId>com.qmth.digit.print.business</groupId>
 	<artifactId>digit-print-business</artifactId>
 	<version>1.0.0</version>
-	<packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <packaging>jar</packaging>
 
 	<parent>
 		<groupId>com.qmth.digit.print.service</groupId>
-		<artifactId>digit-print-service</artifactId>
+		<artifactId>distributed-print</artifactId>
 		<version>1.0.0</version>
 	</parent>
 

digit-print-business/src/main/java/com/qmth/digit/print/business/base/BaseResult.java

@@ -1,34 +0,0 @@
-package com.qmth.digit.print.business.base;
-
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 查询基础返回类型
- * @Author: CaoZixuan
- * @Date: 2021-03-22
- */
-public class BaseResult extends BaseEntity {
-
-    @ApiModelProperty(value = "创建人", example = "admin")
-    private String createName;
-
-    @ApiModelProperty(value = "修改人", example = "admin")
-    private String updateName;
-
-    public String getCreateName() {
-        return createName;
-    }
-
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    public String getUpdateName() {
-        return updateName;
-    }
-
-    public void setUpdateName(String updateName) {
-        this.updateName = updateName;
-    }
-}

digit-print-business/src/main/java/com/qmth/digit/print/business/bean/dto/UserDto.java

@@ -0,0 +1,96 @@
+package com.qmth.digit.print.business.bean.dto;
+
+import com.qmth.digit.print.business.entity.BasicCourse;
+import com.qmth.digit.print.business.entity.SysRole;
+
+import java.util.List;
+
+/**
+ * @Date: 2021/3/23.
+ */
+public class UserDto {
+
+    private String id;
+    private String schoolId;
+    private String loginName;
+    private String realName;
+    private String mobileNumber;
+    private Boolean enable;
+    private String remark;
+
+    private List<SysRole> roles;
+
+    private List<BasicCourse> courses;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(String schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getRealName() {
+        return realName;
+    }
+
+    public void setRealName(String realName) {
+        this.realName = realName;
+    }
+
+    public String getMobileNumber() {
+        return mobileNumber;
+    }
+
+    public void setMobileNumber(String mobileNumber) {
+        this.mobileNumber = mobileNumber;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public List<SysRole> getRoles() {
+        return roles;
+    }
+
+    public void setRoles(List<SysRole> roles) {
+        this.roles = roles;
+    }
+
+    public List<BasicCourse> getCourses() {
+        return courses;
+    }
+
+    public void setCourses(List<BasicCourse> courses) {
+        this.courses = courses;
+    }
+}

digit-print-business/src/main/java/com/qmth/digit/print/business/bean/query/UserParam.java

@@ -0,0 +1,46 @@
+package com.qmth.digit.print.business.bean.query;
+
+import com.qmth.digit.print.business.base.BasePage;
+
+/**
+ * @Date: 2021/3/23.
+ */
+public class UserParam extends BasePage {
+
+    private Long schoolId;
+    private String loginName;
+    private Long roleId;
+    private Boolean enable;
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public Long getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Long roleId) {
+        this.roleId = roleId;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
+}

digit-print-business/src/main/java/com/qmth/digit/print/business/bean/result/SchoolResult.java

@@ -1,45 +0,0 @@
-package com.qmth.digit.print.business.bean.result;
-
-import com.qmth.digit.print.business.base.BaseResult;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 学校信息查询结果
- * @Author: CaoZixuan
- * @Date: 2021-03-22
- */
-public class SchoolResult extends BaseResult {
-
-    @ApiModelProperty(value = "学校代码", example = "123456")
-    private String code;
-
-    @ApiModelProperty(value = "学校名称", example = "武汉大学")
-    private String name;
-
-    @ApiModelProperty(value = "是否可用", example = "true")
-    private boolean enable;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(boolean enable) {
-        this.enable = enable;
-    }
-}

digit-print-business/src/main/java/com/qmth/digit/print/business/entity/BasicAttachment.java

@@ -1,7 +1,11 @@
 package com.qmth.digit.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 io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
 
@@ -18,6 +22,10 @@ public class BasicAttachment implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
+
     /**
      * 文件名
      */
@@ -62,6 +70,14 @@ public class BasicAttachment implements Serializable {
     @TableField("create_time")
     private Long createTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public String getName() {
         return name;
     }

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

@@ -2,6 +2,7 @@ package com.qmth.digit.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qmth.digit.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 
@@ -14,7 +15,7 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("basic_card_rule")
-public class BasicCardRule implements Serializable {
+public class BasicCardRule extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -81,14 +82,7 @@ public class BasicCardRule implements Serializable {
      * 备注
      */
     private String remark;
-    @TableField("create_id")
-    private Long createId;
-    @TableField("create_time")
-    private Long createTime;
-    @TableField("update_id")
-    private Long updateId;
-    @TableField("update_time")
-    private Long updateTime;
+
 
     public Long getSchoolId() {
         return schoolId;
@@ -202,35 +196,4 @@ public class BasicCardRule implements Serializable {
         this.remark = remark;
     }
 
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getUpdateId() {
-        return updateId;
-    }
-
-    public void setUpdateId(Long updateId) {
-        this.updateId = updateId;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

@@ -2,6 +2,7 @@ package com.qmth.digit.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qmth.digit.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 
@@ -14,7 +15,7 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("basic_course")
-public class BasicCourse implements Serializable {
+public class BasicCourse extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -31,26 +32,6 @@ public class BasicCourse implements Serializable {
      * 课程名称
      */
     private String name;
-    /**
-     * 创建人
-     */
-    @TableField("create_id")
-    private Long createId;
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Long createTime;
-    /**
-     * 修改人
-     */
-    @TableField("update_id")
-    private Long updateId;
-    /**
-     * 修改时间
-     */
-    @TableField("update_time")
-    private Long updateTime;
 
     public Long getSchoolId() {
         return schoolId;
@@ -76,35 +57,4 @@ public class BasicCourse implements Serializable {
         this.name = name;
     }
 
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getUpdateId() {
-        return updateId;
-    }
-
-    public void setUpdateId(Long updateId) {
-        this.updateId = updateId;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

@@ -2,6 +2,7 @@ package com.qmth.digit.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qmth.digit.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 
@@ -14,7 +15,7 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("basic_exam_rule")
-public class BasicExamRule implements Serializable {
+public class BasicExamRule extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -49,14 +50,6 @@ public class BasicExamRule implements Serializable {
      */
     @TableField("print_method")
     private String printMethod;
-    @TableField("create_id")
-    private Long createId;
-    @TableField("create_time")
-    private Long createTime;
-    @TableField("update_id")
-    private Long updateId;
-    @TableField("update_time")
-    private Long updateTime;
 
     public Long getSchoolId() {
         return schoolId;
@@ -114,35 +107,4 @@ public class BasicExamRule implements Serializable {
         this.printMethod = printMethod;
     }
 
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getUpdateId() {
-        return updateId;
-    }
-
-    public void setUpdateId(Long updateId) {
-        this.updateId = updateId;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

@@ -2,6 +2,7 @@ package com.qmth.digit.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qmth.digit.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 
@@ -14,7 +15,7 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("basic_template")
-public class BasicTemplate implements Serializable {
+public class BasicTemplate extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -46,14 +47,6 @@ public class BasicTemplate implements Serializable {
      * 备注
      */
     private String remark;
-    @TableField("create_id")
-    private Long createId;
-    @TableField("create_time")
-    private Long createTime;
-    @TableField("update_id")
-    private Long updateId;
-    @TableField("update_time")
-    private Long updateTime;
 
 
     public Long getSchoolId() {
@@ -112,35 +105,4 @@ public class BasicTemplate implements Serializable {
         this.remark = remark;
     }
 
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getUpdateId() {
-        return updateId;
-    }
-
-    public void setUpdateId(Long updateId) {
-        this.updateId = updateId;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -18,6 +21,10 @@ public class BasicTemplateOrg implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
+
     /**
      * 模板类型：GENERIC-通卡模板，VARIABLE-变量印品模板，ORDINARY-普通印品模板，CARD_RULE-题卡规则
      */
@@ -33,6 +40,13 @@ public class BasicTemplateOrg implements Serializable {
     @TableField("org_id")
     private Long orgId;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
 
     public String getType() {
         return type;

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

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -18,6 +21,9 @@ public class BasicUserCourse implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
     /**
      * 用户ID
      */
@@ -29,6 +35,13 @@ public class BasicUserCourse implements Serializable {
     @TableField("course_id")
     private Long courseId;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
 
     public Long getUserId() {
         return userId;

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

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -18,6 +21,9 @@ public class BasicVerifyCode implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
     /**
      * 用户ID
      */
@@ -48,6 +54,14 @@ public class BasicVerifyCode implements Serializable {
     @TableField("create_time")
     private Long createTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getUserId() {
         return userId;
     }

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

@@ -2,6 +2,7 @@ package com.qmth.digit.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qmth.digit.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 
@@ -14,7 +15,7 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("exam_card")
-public class ExamCard implements Serializable {
+public class ExamCard extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -39,17 +40,6 @@ public class ExamCard implements Serializable {
      */
     @TableField("make_method")
     private String makeMethod;
-    @TableField("create_id")
-    private Long createId;
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Long createTime;
-    @TableField("update_id")
-    private Long updateId;
-    @TableField("update_time")
-    private Long updateTime;
 
     public Long getSchoolId() {
         return schoolId;
@@ -91,35 +81,4 @@ public class ExamCard implements Serializable {
         this.makeMethod = makeMethod;
     }
 
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getUpdateId() {
-        return updateId;
-    }
-
-    public void setUpdateId(Long updateId) {
-        this.updateId = updateId;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -18,6 +21,9 @@ public class ExamCardDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
     /**
      * 题卡ID
      */
@@ -29,6 +35,13 @@ public class ExamCardDetail implements Serializable {
     @TableField("attachment_id")
     private String attachmentId;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
 
     public Long getCardId() {
         return cardId;

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

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -18,6 +21,10 @@ public class ExamDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
+
     @TableField("school_id")
     private Long schoolId;
     /**
@@ -65,6 +72,14 @@ public class ExamDetail implements Serializable {
     @TableField("create_time")
     private Long createTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getSchoolId() {
         return schoolId;
     }

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

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -18,6 +21,10 @@ public class ExamDetailCourse implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
+
     @TableField("school_id")
     private Long schoolId;
     @TableField("exam_detail_id")
@@ -29,6 +36,14 @@ public class ExamDetailCourse implements Serializable {
     @TableField("paper_number")
     private String paperNumber;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getSchoolId() {
         return schoolId;
     }

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

@@ -2,6 +2,7 @@ package com.qmth.digit.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qmth.digit.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 
@@ -14,7 +15,7 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("exam_print_plan")
-public class ExamPrintPlan implements Serializable {
+public class ExamPrintPlan extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -82,14 +83,6 @@ public class ExamPrintPlan implements Serializable {
     @TableField("ordinary_content")
     private String ordinaryContent;
     private String status;
-    @TableField("create_id")
-    private Long createId;
-    @TableField("create_time")
-    private Long createTime;
-    @TableField("update_id")
-    private Long updateId;
-    @TableField("update_time")
-    private Long updateTime;
 
     public Long getSchoolId() {
         return schoolId;
@@ -179,35 +172,4 @@ public class ExamPrintPlan implements Serializable {
         this.status = status;
     }
 
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getUpdateId() {
-        return updateId;
-    }
-
-    public void setUpdateId(Long updateId) {
-        this.updateId = updateId;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -18,6 +21,9 @@ public class ExamStudent implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
     @TableField("school_id")
     private Long schoolId;
     @TableField("exam_detail_course_id")
@@ -39,6 +45,14 @@ public class ExamStudent implements Serializable {
     @TableField("paper_type")
     private String paperType;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getSchoolId() {
         return schoolId;
     }

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

@@ -2,6 +2,7 @@ package com.qmth.digit.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qmth.digit.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -15,7 +16,7 @@ import java.util.Date;
  * @since 2021-03-23
  */
 @TableName("exam_task")
-public class ExamTask implements Serializable {
+public class ExamTask extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -75,26 +76,6 @@ public class ExamTask implements Serializable {
     private Integer enable;
     @TableField("batch_no")
     private String batchNo;
-    /**
-     * 创建人
-     */
-    @TableField("create_id")
-    private Long createId;
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Long createTime;
-    /**
-     * 修改人
-     */
-    @TableField("update_id")
-    private Long updateId;
-    /**
-     * 修改时间
-     */
-    @TableField("update_time")
-    private Long updateTime;
 
     public Long getSchoolId() {
         return schoolId;
@@ -200,35 +181,4 @@ public class ExamTask implements Serializable {
         this.batchNo = batchNo;
     }
 
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getUpdateId() {
-        return updateId;
-    }
-
-    public void setUpdateId(Long updateId) {
-        this.updateId = updateId;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -18,6 +21,9 @@ public class ExamTaskDetail implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
     /**
      * 命题任务ID
      */
@@ -75,6 +81,14 @@ public class ExamTaskDetail implements Serializable {
     @TableField("unexposed_paper_type")
     private String unexposedPaperType;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getExamTaskId() {
         return examTaskId;
     }

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

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -18,6 +21,10 @@ public class ExamTaskReviewLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
+
     /**
      * 命题任务ID
      */
@@ -37,6 +44,14 @@ public class ExamTaskReviewLog implements Serializable {
     @TableField("operate_time")
     private Long operateTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getExamTaskId() {
         return examTaskId;
     }

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

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -18,6 +21,10 @@ public class ExamTaskTemp implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
+
     @TableField("school_id")
     private Long schoolId;
     /**
@@ -49,6 +56,15 @@ public class ExamTaskTemp implements Serializable {
     @TableField("create_time")
     private Long createTime;
 
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getSchoolId() {
         return schoolId;
     }

digit-print-business/src/main/java/com/qmth/digit/print/business/entity/SysConfig.java

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -18,6 +21,10 @@ public class SysConfig implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
+
     /**
      * 参数键值
      */
@@ -42,6 +49,14 @@ public class SysConfig implements Serializable {
     @TableField("create_time")
     private Long createTime;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public String getKey() {
         return key;
     }

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

@@ -2,6 +2,7 @@ package com.qmth.digit.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qmth.digit.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 
@@ -14,7 +15,7 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("sys_org")
-public class SysOrg implements Serializable {
+public class SysOrg extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -26,7 +27,7 @@ public class SysOrg implements Serializable {
     /**
      * 机构代码
      */
-    private String ode;
+    private String code;
     /**
      * 机构名称
      */
@@ -40,26 +41,6 @@ public class SysOrg implements Serializable {
      * 0-禁用，1-启用
      */
     private Integer enable;
-    /**
-     * 创建人
-     */
-    @TableField("create_id")
-    private Long createId;
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Long createTime;
-    /**
-     * 修改人
-     */
-    @TableField("update_id")
-    private Long updateId;
-    /**
-     * 修改时间
-     */
-    @TableField("update_time")
-    private Long updateTime;
 
     public Long getSchoolId() {
         return schoolId;
@@ -69,12 +50,12 @@ public class SysOrg implements Serializable {
         this.schoolId = schoolId;
     }
 
-    public String getOde() {
-        return ode;
+    public String getCode() {
+        return code;
     }
 
-    public void setOde(String ode) {
-        this.ode = ode;
+    public void setCode(String code) {
+        this.code = code;
     }
 
     public String getName() {
@@ -101,35 +82,4 @@ public class SysOrg implements Serializable {
         this.enable = enable;
     }
 
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getUpdateId() {
-        return updateId;
-    }
-
-    public void setUpdateId(Long updateId) {
-        this.updateId = updateId;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

@@ -2,6 +2,7 @@ package com.qmth.digit.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qmth.digit.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 
@@ -14,7 +15,7 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("sys_privilege")
-public class SysPrivilege implements Serializable {
+public class SysPrivilege extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -46,14 +47,6 @@ public class SysPrivilege implements Serializable {
      * 备注
      */
     private String remark;
-    @TableField("create_id")
-    private Long createId;
-    @TableField("create_time")
-    private Long createTime;
-    @TableField("update_id")
-    private Long updateId;
-    @TableField("update_time")
-    private Long updateTime;
 
     public Long getSchoolId() {
         return schoolId;
@@ -111,35 +104,4 @@ public class SysPrivilege implements Serializable {
         this.remark = remark;
     }
 
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getUpdateId() {
-        return updateId;
-    }
-
-    public void setUpdateId(Long updateId) {
-        this.updateId = updateId;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

@@ -2,6 +2,7 @@ package com.qmth.digit.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qmth.digit.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 
@@ -14,7 +15,7 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("sys_role")
-public class SysRole implements Serializable {
+public class SysRole extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -35,26 +36,6 @@ public class SysRole implements Serializable {
      * INTERNAL-内置，CUSTOM-自定义
      */
     private String type;
-    /**
-     * 创建人
-     */
-    @TableField("create_id")
-    private Long createId;
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Long createTime;
-    /**
-     * 修改人
-     */
-    @TableField("update_id")
-    private Long updateId;
-    /**
-     * 修改时间
-     */
-    @TableField("update_time")
-    private Long updateTime;
 
     public Long getSchoolId() {
         return schoolId;
@@ -88,35 +69,4 @@ public class SysRole implements Serializable {
         this.type = type;
     }
 
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getUpdateId() {
-        return updateId;
-    }
-
-    public void setUpdateId(Long updateId) {
-        this.updateId = updateId;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -17,12 +20,23 @@ import java.io.Serializable;
 public class SysRoleCourse implements Serializable {
 
     private static final long serialVersionUID = 1L;
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
 
     @TableField("role_id")
     private Long roleId;
     @TableField("course_id")
     private Long courseId;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getRoleId() {
         return roleId;
     }

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

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -17,7 +20,9 @@ import java.io.Serializable;
 public class SysRolePrivilege implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
     /**
      * 角色ID
      */
@@ -29,6 +34,14 @@ public class SysRolePrivilege implements Serializable {
     @TableField("privilege_id")
     private Long privilegeId;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getRoleId() {
         return roleId;
     }

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

@@ -2,6 +2,7 @@ package com.qmth.digit.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qmth.digit.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 
@@ -14,7 +15,7 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("sys_user")
-public class SysUser implements Serializable {
+public class SysUser extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -47,7 +48,7 @@ public class SysUser implements Serializable {
     /**
      * 0-禁用，1-启用
      */
-    private Integer enable;
+    private Boolean enable;
     /**
      * 密码修改时间
      */
@@ -57,16 +58,6 @@ public class SysUser implements Serializable {
      * 备注
      */
     private String remark;
-    /**
-     * 创建人
-     */
-    @TableField("create_id")
-    private Long createId;
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Long createTime;
 
     public Long getSchoolId() {
         return schoolId;
@@ -116,11 +107,11 @@ public class SysUser implements Serializable {
         this.orgId = orgId;
     }
 
-    public Integer getEnable() {
+    public Boolean getEnable() {
         return enable;
     }
 
-    public void setEnable(Integer enable) {
+    public void setEnable(Boolean enable) {
         this.enable = enable;
     }
 
@@ -140,19 +131,4 @@ public class SysUser implements Serializable {
         this.remark = remark;
     }
 
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
 }

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

@@ -1,7 +1,10 @@
 package com.qmth.digit.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 java.io.Serializable;
 
@@ -18,6 +21,9 @@ public class SysUserRole implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "id")
+    private Long id;
     /**
      * 用户ID
      */
@@ -29,6 +35,14 @@ public class SysUserRole implements Serializable {
     @TableField("role_id")
     private Long roleId;
 
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public Long getUserId() {
         return userId;
     }

digit-print-business/src/main/java/com/qmth/digit/print/business/mapper/SysUserMapper.java

@@ -1,7 +1,11 @@
 package com.qmth.digit.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.digit.print.business.bean.dto.UserDto;
+import com.qmth.digit.print.business.bean.query.UserParam;
 import com.qmth.digit.print.business.entity.SysUser;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.qmth.digit.print.business.entity.SysUser;
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
 
+    IPage<UserDto> listPage(@Param("page") IPage<UserDto> page, @Param("param") UserParam param);
 }

digit-print-business/src/main/java/com/qmth/digit/print/business/service/SysUserService.java

@@ -1,6 +1,9 @@
 package com.qmth.digit.print.business.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.digit.print.business.bean.dto.UserDto;
+import com.qmth.digit.print.business.bean.query.UserParam;
 import com.qmth.digit.print.business.entity.SysUser;
 
 /**
@@ -13,4 +16,5 @@ import com.qmth.digit.print.business.entity.SysUser;
  */
 public interface SysUserService extends IService<SysUser> {
 
+    IPage<UserDto> list(UserParam param);
 }

digit-print-business/src/main/java/com/qmth/digit/print/business/service/impl/SysUserServiceImpl.java

@@ -1,6 +1,10 @@
 package com.qmth.digit.print.business.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.digit.print.business.bean.dto.UserDto;
+import com.qmth.digit.print.business.bean.query.UserParam;
 import com.qmth.digit.print.business.entity.SysUser;
 import com.qmth.digit.print.business.mapper.SysUserMapper;
 import com.qmth.digit.print.business.service.SysUserService;
@@ -17,4 +21,10 @@ import org.springframework.stereotype.Service;
 @Service
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements SysUserService {
 
+    @Override
+    public IPage<UserDto> list(UserParam param) {
+        IPage<UserDto> page = new Page<>(param.getPageNumber(), param.getPageSize());
+        IPage<UserDto> userDtoIPage =  this.baseMapper.listPage(page, param);
+        return userDtoIPage;
+    }
 }

digit-print-business/src/main/java/com/qmth/digit/print/business/util/ExcelUtil.java

@@ -49,18 +49,18 @@ public class ExcelUtil {
             //获取整个excel
             XSSFWorkbook xb = new XSSFWorkbook(inputStream);
             int sheets = xb.getNumberOfSheets();
-            List<LinkedMultiValueMap<Integer, Object>> finalOList = new ArrayList<>();
-            List<LinkedMultiValueMap<Integer, String>> finalColumnNameList = new ArrayList<>();
-            List<LinkedMultiValueMap<Integer, ExcelError>> finalExcelErrorList = new ArrayList<>();
+            List<LinkedMultiValueMap<Integer, Object>> finalOList = new ArrayList();
+            List<LinkedMultiValueMap<Integer, String>> finalColumnNameList = new ArrayList();
+            List<LinkedMultiValueMap<Integer, ExcelError>> finalExcelErrorList = new ArrayList();
             for (int y = 0; y < sheets; y++) {
                 //获取第一个表单sheet
                 XSSFSheet sheet = xb.getSheetAt(y);
                 //获取最后一行
                 int lastrow = sheet.getLastRowNum();
                 //循环行数依次获取列数
-                LinkedMultiValueMap<Integer, Object> oList = new LinkedMultiValueMap<>();
-                LinkedMultiValueMap<Integer, String> columnNameList = new LinkedMultiValueMap<>();
-                LinkedMultiValueMap<Integer, ExcelError> excelErrorList = new LinkedMultiValueMap<>();
+                LinkedMultiValueMap<Integer, Object> oList = new LinkedMultiValueMap();
+                LinkedMultiValueMap<Integer, String> columnNameList = new LinkedMultiValueMap();
+                LinkedMultiValueMap<Integer, ExcelError> excelErrorList = new LinkedMultiValueMap();
                 for (int i = 0; i < lastrow + 1; i++) {
                     //获取哪一行i
                     Row row = sheet.getRow(i);
@@ -99,7 +99,7 @@ public class ExcelUtil {
                                             field.setAccessible(true);
                                             Map map = (Map) field.get(o);
                                             if (Objects.isNull(map)) {
-                                                map = new LinkedHashMap<>();
+                                                map = new LinkedHashMap();
                                             }
                                             map.put(columnNameList.get(y).get(j), obj);
                                             field.set(o, map);

digit-print-business/src/main/resources/mapper/SysUserMapper.xml

@@ -23,5 +23,33 @@
         id,
         school_id, login_name, real_name, password, mobile_number, org_id, enable, pwd_update_time, remark, create_id, create_time
     </sql>
+    <select id="listPage" resultType="com.qmth.digit.print.business.bean.dto.UserDto">
+        SELECT
+            a.id,
+            a.school_id schoolId,
+            a.login_name loginName,
+            a.real_name realName,
+            a.mobile_number mobileNumber,
+            a.enable,
+            a.remark
+        FROM
+            sys_user a
+                JOIN
+            sys_user_role b ON a.id = b.user_id
+        <where>
+            <if test="schoolId != null">
+                a.school_id = #{schoolId}
+            </if>
+            <if test="loginName != null">
+                a.login_name = concat('%', #{loginName} , '%')
+            </if>
+            <if test="roleId != null">
+                b.role_id = #{roleId}
+            </if>
+            <if test="enable != null">
+                a.enable = #{enable}
+            </if>
+        </where>
+    </select>
 
 </mapper>

digit-print-common/pom.xml

@@ -9,7 +9,7 @@
 
     <parent>
         <groupId>com.qmth.digit.print.service</groupId>
-        <artifactId>digit-print-service</artifactId>
+        <artifactId>distributed-print</artifactId>
         <version>1.0.0</version>
     </parent>
 

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/BackupMethodEnum.java

@@ -0,0 +1,42 @@
+package com.qmth.digit.print.common.enums;
+
+import com.qmth.digit.print.common.enums.result.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 试卷备份方式
+ * @Date: 2021/3/23.
+ */
+public enum BackupMethodEnum {
+
+    PLACE("按考点"),
+    ROOM("按考场");
+
+    BackupMethodEnum(String desc) {
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * @return
+     */
+    private static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (BackupMethodEnum value : BackupMethodEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
+
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/ClassifyEnum.java

@@ -0,0 +1,43 @@
+package com.qmth.digit.print.common.enums;
+
+import com.qmth.digit.print.common.enums.result.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 模板-分类
+ * @Date: 2021/3/23.
+ */
+public enum ClassifyEnum {
+
+    SIGN("签到表"),
+    PACKAGE("卷袋贴"),
+    CHECK_IN("登记表");
+
+    ClassifyEnum(String desc) {
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * @return
+     */
+    private static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (ClassifyEnum value : ClassifyEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
+
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/DrawRuleEnum.java

@@ -0,0 +1,42 @@
+package com.qmth.digit.print.common.enums;
+
+import com.qmth.digit.print.common.enums.result.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 抽卷规则
+ * @Date: 2021/3/23.
+ */
+public enum DrawRuleEnum {
+
+    ONE("只抽一次"),
+    CIRCLE("循环抽取");
+
+    DrawRuleEnum(String desc) {
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * @return
+     */
+    private static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (DrawRuleEnum value : DrawRuleEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
+
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/ExamNumberStyleEnum.java

@@ -0,0 +1,43 @@
+package com.qmth.digit.print.common.enums;
+
+import com.qmth.digit.print.common.enums.result.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 考号版式
+ * @Date: 2021/3/23.
+ */
+public enum ExamNumberStyleEnum {
+
+    PRINT("印刷条码"),
+    PASTE("粘贴条码"),
+    FILL("卡号填涂");
+
+    ExamNumberStyleEnum(String desc) {
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * @return
+     */
+    private static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (ExamNumberStyleEnum value : ExamNumberStyleEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
+
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/ExamStatusEnum.java

@@ -0,0 +1,44 @@
+package com.qmth.digit.print.common.enums;
+
+import com.qmth.digit.print.common.enums.result.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 命题类型
+ * @Date: 2021/3/23.
+ */
+public enum ExamStatusEnum {
+
+    NEW("新建"),
+    STAGE("暂存"),
+    SUBMIT("提交"),
+    CANCEL("撤回");
+
+    ExamStatusEnum(String desc) {
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * @return
+     */
+    private static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (ExamStatusEnum value : ExamStatusEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
+
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/PaperTypeEnum.java

@@ -0,0 +1,42 @@
+package com.qmth.digit.print.common.enums;
+
+import com.qmth.digit.print.common.enums.result.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * AB卷版式
+ * @Date: 2021/3/23.
+ */
+public enum PaperTypeEnum {
+
+    PRINT("印刷条码"),
+    FILL("卡号填涂");
+
+    PaperTypeEnum(String desc) {
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * @return
+     */
+    private static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (PaperTypeEnum value : PaperTypeEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
+
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/PrintMethodEnum.java

@@ -0,0 +1,42 @@
+package com.qmth.digit.print.common.enums;
+
+import com.qmth.digit.print.common.enums.result.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 印刷方式
+ * @Date: 2021/3/23.
+ */
+public enum PrintMethodEnum {
+
+    AUTO("自动"),
+    MANUAL("手动");
+
+    PrintMethodEnum(String desc) {
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * @return
+     */
+    private static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (PrintMethodEnum value : PrintMethodEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
+
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/PrivilegeTypeEnum.java

@@ -0,0 +1,42 @@
+package com.qmth.digit.print.common.enums;
+
+import com.qmth.digit.print.common.enums.result.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 菜单类型
+ * @Date: 2021/3/23.
+ */
+public enum PrivilegeTypeEnum {
+
+    M("菜单"),
+    F("操作");
+
+    PrivilegeTypeEnum(String desc) {
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * @return
+     */
+    private static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (PrivilegeTypeEnum value : PrivilegeTypeEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
+
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/ReviewStatusEnum.java

@@ -0,0 +1,42 @@
+package com.qmth.digit.print.common.enums;
+
+import com.qmth.digit.print.common.enums.result.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 审核状态
+ * @Date: 2021/3/23.
+ */
+public enum ReviewStatusEnum {
+
+    PASS("通过"),
+    NOT_PASS("不通过");
+
+    ReviewStatusEnum(String desc) {
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * @return
+     */
+    private static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (ReviewStatusEnum value : ReviewStatusEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
+
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/RoleTypeEnum.java

@@ -0,0 +1,51 @@
+package com.qmth.digit.print.common.enums;
+
+import com.qmth.digit.print.common.enums.result.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 角色类型
+ * @Date: 2021/3/23.
+ */
+public enum RoleTypeEnum {
+
+    ADMIN("超级管理员"),
+    SCHOOL_ADMIN("学校管理员"),
+    EXAM_TEACHER("考务老师"),
+    QUESTION_TEACHER("命题老师"),
+    CUSTOMER("客服员"),
+    PRINTER("印刷员"),
+    CUSTOM("自定义");
+
+    RoleTypeEnum(String desc) {
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * @param hasAdmin 是否需要管理员
+     * @return
+     */
+    private static List<EnumResult> listTypes(boolean hasAdmin) {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (RoleTypeEnum value : RoleTypeEnum.values()) {
+            if (!hasAdmin && "ADMIN".equals(value.name())) {
+                continue;
+            }
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
+
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/StorageLevelEnum.java

@@ -0,0 +1,43 @@
+package com.qmth.digit.print.common.enums;
+
+import com.qmth.digit.print.common.enums.result.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 文件存储级别类型
+ * @Date: 2021/3/23.
+ */
+public enum StorageLevelEnum {
+
+    H("高"),
+    M("中"),
+    L("低");
+
+    StorageLevelEnum(String desc) {
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * @return
+     */
+    private static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (StorageLevelEnum value : StorageLevelEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
+
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/StorageTypeEnum.java

@@ -0,0 +1,42 @@
+package com.qmth.digit.print.common.enums;
+
+import com.qmth.digit.print.common.enums.result.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 附件存储位置类型
+ * @Date: 2021/3/23.
+ */
+public enum StorageTypeEnum {
+
+    LOCAL("本地"),
+    OSS("OSS");
+
+    StorageTypeEnum(String desc) {
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * @return
+     */
+    private static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (StorageTypeEnum value : StorageTypeEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
+
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/TemplateTypeEnum.java

@@ -0,0 +1,44 @@
+package com.qmth.digit.print.common.enums;
+
+import com.qmth.digit.print.common.enums.result.EnumResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 通用模板类型
+ * @Date: 2021/3/23.
+ */
+public enum TemplateTypeEnum {
+
+    GENERIC("通卡模板"),
+    VARIABLE("变量印品模板"),
+    ORDINARY("普通印品模板"),
+    CARD_RULE("题卡规则");
+
+    TemplateTypeEnum(String desc) {
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    /**
+     * @return
+     */
+    private static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<EnumResult>();
+        for (TemplateTypeEnum value : TemplateTypeEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getDesc());
+            list.add(result);
+        }
+        return list;
+    }
+
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/enums/result/EnumResult.java

@@ -0,0 +1,59 @@
+package com.qmth.digit.print.common.enums.result;
+
+/**
+ * @Date: 2021/3/23.
+ */
+public class EnumResult {
+
+    /**
+     * enum name()
+     */
+    private String name;
+
+    /**
+     * enum ordinal
+     */
+    private Integer ordinal;
+
+    /**
+     * enum 自定义code
+     */
+    private String code;
+
+    /**
+     * enum 自定义描述
+     */
+    private String desc;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getOrdinal() {
+        return ordinal;
+    }
+
+    public void setOrdinal(Integer ordinal) {
+        this.ordinal = ordinal;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

digit-print-common/src/main/java/com/qmth/digit/print/common/util/FileUtil.java

@@ -474,6 +474,7 @@ public class FileUtil {
 
     /**
      * 文件转数组
+     *
      * @param file
      * @return
      * @throws IOException

digit-print/pom.xml

@@ -9,7 +9,7 @@
 
 	<parent>
 		<groupId>com.qmth.digit.print.service</groupId>
-		<artifactId>digit-print-service</artifactId>
+		<artifactId>distributed-print</artifactId>
 		<version>1.0.0</version>
 	</parent>
 

digit-print/src/main/java/com/qmth/digit/print/api/SysConfigController.java

@@ -1,6 +1,7 @@
 package com.qmth.digit.print.api;
 
 
+import com.qmth.boot.api.constant.ApiConstant;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -13,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2021-03-23
  */
 @RestController
-@RequestMapping("/sysConfig")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/sys_config")
 public class SysConfigController {
 
 }

digit-print/src/main/java/com/qmth/digit/print/api/SysUserController.java

@@ -1,10 +1,22 @@
 package com.qmth.digit.print.api;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.annotation.BOOL;
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.digit.print.business.bean.dto.UserDto;
+import com.qmth.digit.print.business.bean.query.UserParam;
+import com.qmth.digit.print.business.service.SysUserService;
+import com.qmth.digit.print.common.util.Result;
+import com.qmth.digit.print.common.util.ResultUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 用户表 前端控制器
@@ -14,8 +26,17 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2021-03-23
  */
 @RestController
-@RequestMapping("/sysUser")
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.sys}/user")
+@Aac(auth = BOOL.FALSE)
 public class SysUserController {
 
+    @Autowired
+    private SysUserService sysUserService;
+
+    @RequestMapping("/list")
+    public Result list(UserParam param){
+        IPage<UserDto> userDtos = sysUserService.list(param);
+        return ResultUtil.ok(userDtos);
+    }
 }
 

digit-print/src/main/resources/application.properties

@@ -62,8 +62,10 @@ com.qmth.api.auth.time-max-delay=10000
 com.qmth.cache.expire-after-write=240m
 
 #api\u524D\u7F00
-prefix.url.admin=admin
+prefix.url.common=common
 prefix.url.sys=sys
+prefix.url.basic=basic
+prefix.url.exam=exam
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info