第一次合并

distributed-print-business/.gitignore

@@ -32,8 +32,8 @@
             <version>2.0</version>
         </dependency>
         <dependency>
-            <groupId>com.qmth.teachcloud.common.business</groupId>
-            <artifactId>teachcloud-common-business</artifactId>
+            <groupId>com.qmth.teachcloud.common</groupId>
+            <artifactId>teachcloud-common</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
@@ -55,6 +55,14 @@
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.qmth.boot</groupId>
+            <artifactId>data-mysql-mp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>swagger-bootstrap-ui</artifactId>

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/annotation/ApiJsonProperty.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/annotation/ApiJsonProperty.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.annotation;
+package com.qmth.distributed.print.business.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/annotation/ExcelDBFieldDesc.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/annotation/ExcelDBFieldDesc.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.annotation;
+package com.qmth.distributed.print.business.annotation;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/annotation/ExcelDynamicExport.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/annotation/ExcelDynamicExport.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.annotation;
+package com.qmth.distributed.print.business.annotation;
 
 import java.lang.annotation.*;
 

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/annotation/ExcelNotExport.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/annotation/ExcelNotExport.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.annotation;
+package com.qmth.distributed.print.business.annotation;
 
 import java.lang.annotation.*;
 

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/annotation/ExcelNote.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/annotation/ExcelNote.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.annotation;
+package com.qmth.distributed.print.business.annotation;
 
 import java.lang.annotation.*;
 

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/annotation/ExcelProperty.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/annotation/ExcelProperty.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.annotation;
+package com.qmth.distributed.print.business.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

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

@@ -1,6 +1,7 @@
-package com.qmth.teachcloud.report.base;
+package com.qmth.distributed.print.business.base;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/base/BasePage.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/base/BasePage.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.base;
+package com.qmth.distributed.print.business.base;
 
 import io.swagger.annotations.ApiModelProperty;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/auth/AuthBean.java

@@ -1,8 +1,8 @@
 package com.qmth.distributed.print.business.bean.auth;
 
+import com.qmth.distributed.print.business.entity.BasicSchool;
 import com.qmth.distributed.print.business.entity.SysOrg;
-import com.qmth.teachcloud.common.business.entity.BasicSchool;
-import com.qmth.teachcloud.common.business.entity.SysRole;
+import com.qmth.distributed.print.business.entity.SysRole;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/auth/ExpireTimeBean.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/auth/ExpireTimeBean.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.bean.dto;
+package com.qmth.distributed.print.business.bean.dto;
 
 /**
  * @Date: 2021/3/31.

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

@@ -1,7 +1,6 @@
 package com.qmth.distributed.print.business.bean.dto;
 
-
-import com.qmth.teachcloud.common.business.annotation.ExcelProperty;
+import com.qmth.distributed.print.business.annotation.ExcelProperty;
 
 /**
  * @Date: 2021/3/29.

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

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.bean.dto;
+package com.qmth.distributed.print.business.bean.dto;
 
 /**
  * @Description: 根据用户账号和用户名称查询他可命题的课程

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

@@ -1,6 +1,5 @@
 package com.qmth.distributed.print.business.bean.dto;
 
-import com.qmth.teachcloud.common.business.bean.dto.BlurryUserDto;
 import java.util.List;
 
 /**

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

@@ -2,7 +2,7 @@ package com.qmth.distributed.print.business.bean.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.business.annotation.ExcelProperty;
+import com.qmth.distributed.print.business.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
 
 /**

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

@@ -1,47 +1,47 @@
 package com.qmth.distributed.print.business.bean.dto;
 
-import com.qmth.teachcloud.common.business.annotation.ExcelDBFieldDesc;
+import com.qmth.distributed.print.business.annotation.ExcelDBFieldDesc;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
 
 /**
- * @Description: 考务数据导入Dto(对应 ExaminationDBFieldsEnum 同时作为考务数据表所需要的的字段, 来接收excel导入的考务数据)
+ * @Description: 考务数据导入Dto(对应 ExaminationDBFieldsEnum 同时作为考务数据表所需要的的字段,来接收excel导入的考务数据)
  * @Author: CaoZixuan
  * @Date: 2021-04-25
  */
 public class ExaminationImportDto {
 
     @ApiModelProperty(value = "学号")
-    @ExcelDBFieldDesc(name = "学号", length = 30)
+    @ExcelDBFieldDesc(name = "学号",length = 30)
     private String studentCode;
 
     @ApiModelProperty(value = "考号")
-    @ExcelDBFieldDesc(name = "考号", length = 30)
+    @ExcelDBFieldDesc(name = "考号",length = 30)
     private String ticketNumber;
 
     @ApiModelProperty(value = "座位号")
-    @ExcelDBFieldDesc(name = "座位号", length = 30)
+    @ExcelDBFieldDesc(name = "座位号",length = 30)
     private String siteNumber;
 
     @ApiModelProperty(value = "姓名")
-    @ExcelDBFieldDesc(name = "姓名", length = 30)
+    @ExcelDBFieldDesc(name = "姓名",length = 30)
     private String studentName;
 
     @ApiModelProperty(value = "课程代码")
-    @ExcelDBFieldDesc(name = "课程代码", length = 30)
+    @ExcelDBFieldDesc(name = "课程代码",length = 30)
     private String courseCode;
 
     @ApiModelProperty(value = "课程名称")
-    @ExcelDBFieldDesc(name = "课程名称", length = 50)
+    @ExcelDBFieldDesc(name = "课程名称",length = 50)
     private String courseName;
 
     @ApiModelProperty(value = "考点")
-    @ExcelDBFieldDesc(name = "考点", length = 30)
+    @ExcelDBFieldDesc(name = "考点",length = 30)
     private String examPlace;
 
     @ApiModelProperty(value = "考场")
-    @ExcelDBFieldDesc(name = "考场", length = 30)
+    @ExcelDBFieldDesc(name = "考场",length = 30)
     private String examRoom;
 
     @ApiModelProperty(value = "考试日期")
@@ -53,7 +53,7 @@ public class ExaminationImportDto {
     private String examTime;
 
     @ApiModelProperty(value = "试卷编号")
-    @ExcelDBFieldDesc(name = "试卷编号", length = 30)
+    @ExcelDBFieldDesc(name = "试卷编号",length = 30)
     private String paperNumber;
 
     @ApiModelProperty(value = "备选字段集合")

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

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.bean.dto;
+package com.qmth.distributed.print.business.bean.dto;
 
 import java.util.List;
 

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/bean/dto/MenuDto.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/MenuDto.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.bean.dto;
+package com.qmth.distributed.print.business.bean.dto;
 
 /**
  * @Date: 2021/4/13.

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

@@ -1,6 +1,6 @@
-package com.qmth.teachcloud.common.business.bean.dto;
+package com.qmth.distributed.print.business.bean.dto;
 
-import com.qmth.teachcloud.common.business.enums.PageSizeEnum;
+import com.qmth.distributed.print.business.enums.PageSizeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 /**

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

@@ -2,8 +2,8 @@ package com.qmth.distributed.print.business.bean.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.business.enums.PrivilegeEnum;
-import com.qmth.teachcloud.common.business.enums.RoleTypeEnum;
+import com.qmth.distributed.print.business.enums.PrivilegeEnum;
+import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

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

@@ -1,8 +1,8 @@
-package com.qmth.teachcloud.common.business.bean.dto;
+package com.qmth.distributed.print.business.bean.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.business.enums.PrivilegeEnum;
+import com.qmth.distributed.print.business.enums.PrivilegeEnum;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.bean.dto;
+package com.qmth.distributed.print.business.bean.dto;
 
 /**
  * @Date: 2021/4/2.

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

@@ -3,8 +3,8 @@ package com.qmth.distributed.print.business.bean.dto;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.entity.SysOrg;
+import com.qmth.distributed.print.business.enums.ClassifyEnum;
 import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
-import com.qmth.teachcloud.common.business.enums.ClassifyEnum;
 
 import java.util.List;
 

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/bean/dto/UserDto.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/UserDto.java

@@ -1,7 +1,7 @@
-package com.qmth.teachcloud.common.business.bean.dto;
+package com.qmth.distributed.print.business.bean.dto;
 
-import com.qmth.teachcloud.common.business.entity.BasicCourse;
-import com.qmth.teachcloud.common.business.entity.SysRole;
+import com.qmth.distributed.print.business.entity.BasicCourse;
+import com.qmth.distributed.print.business.entity.SysRole;
 
 import java.util.List;
 

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/bean/params/ArraysParams.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/ArraysParams.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.bean.params;
+package com.qmth.distributed.print.business.bean.params;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/BlurryParam.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.bean.params;
 
-import com.qmth.teachcloud.common.business.base.BasePage;
+import com.qmth.distributed.print.business.base.BasePage;
 
 /**
  * @Date: 2021/3/23.

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/ChooseParams.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.bean.params;
 
-import com.qmth.teachcloud.common.business.base.BasePage;
+import com.qmth.distributed.print.business.base.BasePage;
 
 /**
  * @Date: 2021/3/23.

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/DeleteParams.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.bean.params;
 
-import com.qmth.teachcloud.common.business.base.BasePage;
+import com.qmth.distributed.print.business.base.BasePage;
 
 /**
  * @Date: 2021/3/23.

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/LoginParam.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.bean.params;
 
-import com.qmth.teachcloud.common.business.base.BasePage;
+import com.qmth.distributed.print.business.base.BasePage;
 
 /**
  * @Date: 2021/3/23.

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/RoleParam.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.bean.params;
 
-import com.qmth.teachcloud.common.business.base.BasePage;
+import com.qmth.distributed.print.business.base.BasePage;
 
 /**
  * @Date: 2021/3/23.

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/SerialNumberParams.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.bean.params;
 
-import com.qmth.teachcloud.common.business.base.BasePage;
+import com.qmth.distributed.print.business.base.BasePage;
 
 /**
  * @Date: 2021/3/23.

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/UserParam.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.bean.params;
 
-import com.qmth.teachcloud.common.business.base.BasePage;
+import com.qmth.distributed.print.business.base.BasePage;
 
 /**
  * @Date: 2021/3/23.

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/UserSaveParams.java

@@ -0,0 +1,22 @@
+package com.qmth.distributed.print.business.bean.params;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.entity.SysUser;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Description: 用户保存/编辑params
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/3/24
+ */
+public class UserSaveParams extends SysUser implements Serializable {
+
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/EditResult.java

@@ -2,11 +2,11 @@ package com.qmth.distributed.print.business.bean.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.entity.BasicSchool;
 import com.qmth.distributed.print.business.entity.SysOrg;
+import com.qmth.distributed.print.business.entity.SysUser;
+import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.teachcloud.common.business.entity.BasicSchool;
-import com.qmth.teachcloud.common.business.entity.SysUser;
-import com.qmth.teachcloud.common.business.enums.RoleTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/PrintPlanBrief.java

@@ -4,7 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.bean.dto.PrivilegeCacheDto;
-import com.qmth.teachcloud.common.business.enums.PrivilegeEnum;
+import com.qmth.distributed.print.business.bean.dto.PrivilegeDto;
+import com.qmth.distributed.print.business.enums.PrivilegeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/RolePrivilegeResult.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/RolePrivilegeResult.java

@@ -1,10 +1,10 @@
-package com.qmth.teachcloud.common.business.bean.result;
+package com.qmth.distributed.print.business.bean.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.business.enums.TaskResultEnum;
-import com.qmth.teachcloud.common.business.enums.TaskStatusEnum;
-import com.qmth.teachcloud.common.business.enums.TaskTypeEnum;
+import com.qmth.distributed.print.business.enums.TaskResultEnum;
+import com.qmth.distributed.print.business.enums.TaskStatusEnum;
+import com.qmth.distributed.print.business.enums.TaskTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/TemplatePrintInfoResult.java

@@ -2,8 +2,8 @@ package com.qmth.distributed.print.business.bean.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.distributed.print.business.enums.ClassifyEnum;
 import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
-import com.qmth.teachcloud.common.business.enums.ClassifyEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/WorkResult.java

@@ -3,6 +3,7 @@ package com.qmth.distributed.print.business.bean.result;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/cache/CreatePdfCacheUtil.java

@@ -1,9 +1,9 @@
 package com.qmth.distributed.print.business.config;
 
+import com.qmth.distributed.print.business.annotation.ApiJsonObject;
+import com.qmth.distributed.print.business.annotation.ApiJsonProperty;
 import com.fasterxml.classmate.TypeResolver;
 import com.google.common.base.Optional;
-import com.qmth.teachcloud.common.business.annotation.ApiJsonObject;
-import com.qmth.teachcloud.common.business.annotation.ApiJsonProperty;
 import org.apache.ibatis.javassist.*;
 import org.apache.ibatis.javassist.bytecode.AnnotationsAttribute;
 import org.apache.ibatis.javassist.bytecode.ConstPool;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/config/MetaHandler.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/config/MetaHandler.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.entity;
+package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,6 +6,7 @@ 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 com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -67,17 +68,6 @@ public class BasicAttachment implements Serializable {
     @TableField(exist = false)
     private Integer pages;
 
-    @TableField(exist = false)
-    private String attachmentPath;
-
-    public String getAttachmentPath() {
-        return attachmentPath;
-    }
-
-    public void setAttachmentPath(String attachmentPath) {
-        this.attachmentPath = attachmentPath;
-    }
-
     public BasicAttachment() {
 
     }

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

@@ -4,9 +4,9 @@ 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;
-import com.qmth.teachcloud.common.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -1,10 +1,10 @@
-package com.qmth.teachcloud.common.business.entity;
+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.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -4,8 +4,8 @@ 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;
-import com.qmth.teachcloud.common.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -4,8 +4,8 @@ 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.MessageEnum;
-import com.qmth.teachcloud.common.business.base.BaseEntity;
 
 import java.io.Serializable;
 

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/entity/BasicSchool.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicSchool.java

@@ -1,8 +1,8 @@
-package com.qmth.teachcloud.common.business.entity;
+package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.qmth.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -20,28 +20,13 @@ public class BasicSchool extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "学校编号")
-    @TableField(value = "code")
     private String code;
-
-    @ApiModelProperty(value = "学校名称")
-    @TableField(value = "name")
     private String name;
-
-    @ApiModelProperty(value = "是否启用，false：停用，true：启用")
-    @TableField(value = "enable")
     private Boolean enable;
-
-    @ApiModelProperty(value = "访问key")
-    @TableField(value = "access_key")
+    @TableField("access_key")
     private String accessKey;
-
-    @ApiModelProperty(value = "访问secret")
-    @TableField(value = "access_secret")
+    @TableField("access_secret")
     private String accessSecret;
-
-    @ApiModelProperty(value = "备注")
-    @TableField(value = "remark")
     private String remark;
 
     @ApiModelProperty(value = "学校logo")

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

@@ -4,9 +4,9 @@ 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;
-import com.qmth.teachcloud.common.business.base.BaseEntity;
-import com.qmth.teachcloud.common.business.enums.ClassifyEnum;
 
 import java.io.Serializable;
 

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

@@ -4,8 +4,8 @@ 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;
-import com.qmth.teachcloud.common.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -1,10 +1,11 @@
 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.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -1,10 +1,11 @@
 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.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -6,6 +6,7 @@ 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 io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

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

@@ -4,7 +4,7 @@ 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.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -4,10 +4,10 @@ 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.CardStatusEnum;
 import com.qmth.distributed.print.business.enums.CardTypeEnum;
 import com.qmth.distributed.print.business.enums.MakeMethodEnum;
-import com.qmth.teachcloud.common.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -1,10 +1,11 @@
 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.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -1,11 +1,12 @@
 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 com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
-import com.qmth.teachcloud.common.business.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

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

@@ -4,7 +4,7 @@ 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.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

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

@@ -4,10 +4,10 @@ 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.BackupMethodEnum;
 import com.qmth.distributed.print.business.enums.DrawRuleEnum;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
-import com.qmth.teachcloud.common.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -1,13 +1,15 @@
 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.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * <p>

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

@@ -4,11 +4,12 @@ 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;
 import com.qmth.distributed.print.business.enums.ReviewStatusEnum;
-import com.qmth.teachcloud.common.business.base.BaseEntity;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

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

@@ -4,7 +4,7 @@ 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.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -4,8 +4,8 @@ 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.ReviewStatusEnum;
-import com.qmth.teachcloud.common.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -1,11 +1,12 @@
 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 com.qmth.distributed.print.business.enums.ReviewStatusEnum;
-import com.qmth.teachcloud.common.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -1,10 +1,11 @@
 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.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -2,7 +2,7 @@ package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.qmth.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -4,7 +4,7 @@ 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.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.entity;
+package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -6,7 +6,7 @@ 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.teachcloud.common.business.enums.PrivilegeEnum;
+import com.qmth.distributed.print.business.enums.PrivilegeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

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

@@ -1,11 +1,11 @@
-package com.qmth.teachcloud.common.business.entity;
+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.teachcloud.common.business.base.BaseEntity;
-import com.qmth.teachcloud.common.business.enums.RoleTypeEnum;
+import com.qmth.distributed.print.business.base.BaseEntity;
+import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

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

@@ -4,7 +4,7 @@ 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.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -1,10 +1,11 @@
-package com.qmth.teachcloud.common.business.entity;
+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 io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

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

@@ -1,11 +1,15 @@
-package com.qmth.teachcloud.common.business.entity;
+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.teachcloud.common.business.base.BaseEntity;
+import com.qmth.distributed.print.business.base.BaseEntity;
+import com.qmth.distributed.print.business.service.SysConfigService;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.util.Base64Util;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
@@ -86,16 +90,15 @@ public class SysUser extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private Long[] courseIds;
 
-    public void setInsertInfo(Long userId, String password) {
+    public void setInsertInfo(Long userId) {
         setId(SystemConstant.getDbUuid());
         setCreateId(userId);
         setUpdateId(userId);
         setCreateTime(System.currentTimeMillis());
         setUpdateTime(System.currentTimeMillis());
-//        SysConfigService sysConfigService = SpringContextHolder.getBean(SysConfigService.class);
-//        SysConfig sysConfig = sysConfigService.getByKey("sys.user.initPassword");
-//        setPassword(Base64Util.encode(StringUtils.isNoneBlank(sysConfig.getConfigValue()) ? sysConfig.getConfigValue().getBytes() : "123456".getBytes()));
-        setPassword(password);
+        SysConfigService sysConfigService = SpringContextHolder.getBean(SysConfigService.class);
+        SysConfig sysConfig = sysConfigService.getByKey("sys.user.initPassword");
+        setPassword(Base64Util.encode(StringUtils.isNoneBlank(sysConfig.getConfigValue()) ? sysConfig.getConfigValue().getBytes() : "123456".getBytes()));
     }
 
     public void setUpdateInfo(Long userId) {

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

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.entity;
+package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/entity/TBSession.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TBSession.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.entity;
+package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;

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

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.business.enums.TaskResultEnum;
-import com.qmth.teachcloud.common.business.enums.TaskStatusEnum;
+import com.qmth.distributed.print.business.enums.TaskResultEnum;
+import com.qmth.distributed.print.business.enums.TaskStatusEnum;
+import com.qmth.distributed.print.business.enums.TaskTypeEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/entity/TBTask.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TBTask.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.entity;
+package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
@@ -6,14 +6,16 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.business.enums.TaskResultEnum;
-import com.qmth.teachcloud.common.business.enums.TaskStatusEnum;
-import com.qmth.teachcloud.common.business.enums.TaskTypeEnum;
+import com.qmth.distributed.print.business.enums.TaskResultEnum;
+import com.qmth.distributed.print.business.enums.TaskStatusEnum;
+import com.qmth.distributed.print.business.enums.TaskTypeEnum;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * <p>

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/entity/TGError.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TGError.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.entity;
+package com.qmth.distributed.print.business.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/BackupMethodEnum.java

@@ -1,13 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 试卷备份方式
- *
  * @Date: 2021/3/23.
  */
 public enum BackupMethodEnum {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/CardRequiredFieldsEnum.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 
 import java.util.ArrayList;
@@ -8,15 +8,14 @@ import java.util.List;
 
 /**
  * 考务必选字段
- *
  * @Date: 2021/3/29.
  */
 public enum CardRequiredFieldsEnum {
 
     TICKET_NUMBER("ticketNumber", "考号"),
     SITE_NUMBER("siteNumber", "座位号"),
-    STUDENT_NAME("studentName", "姓名"),
-    COURSE_NAME("courseName", "课程名称");
+    STUDENT_NAME("studentName","姓名"),
+    COURSE_NAME("courseName","课程名称");
 
     private String code;
     private String desc;
@@ -42,7 +41,7 @@ public enum CardRequiredFieldsEnum {
         List<EnumResult> list = new ArrayList<>();
         for (CardRequiredFieldsEnum value : CardRequiredFieldsEnum.values()) {
             // 校验是否在考务必选字段中
-            if (!RequiredFieldsEnum.contain(value.name())) {
+            if(!RequiredFieldsEnum.contain(value.name())){
                 throw ExceptionResultEnum.ERROR.exception("");
             }
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/CardStatusEnum.java

@@ -1,14 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 通用模板类型
- *
  * @Date: 2021/3/23.
  */
 public enum CardStatusEnum {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/CardTypeEnum.java

@@ -1,13 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 通用模板类型
- *
  * @Date: 2021/3/23.
  */
 public enum CardTypeEnum {

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

@@ -1,4 +1,6 @@
-package com.qmth.teachcloud.common.business.enums;
+package com.qmth.distributed.print.business.enums;
+
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/DownloadFileEnum.java

@@ -1,13 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 抽卷规则
- *
  * @Date: 2021/3/23.
  */
 public enum DrawRuleEnum {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/EnumType.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/ExamNumberStyleEnum.java

@@ -1,13 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 考号版式
- *
  * @Date: 2021/3/23.
  */
 public enum ExamNumberStyleEnum {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/ExamStatusEnum.java

@@ -1,13 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 命题类型
- *
  * @Date: 2021/3/23.
  */
 public enum ExamStatusEnum {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/FieldUniqueEnum.java

@@ -1,13 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 题卡制作方式
- *
  * @Date: 2021/3/23.
  */
 public enum MakeMethodEnum {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/MessageEnum.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,14 +11,14 @@ import java.util.List;
  * @Date: 2021-03-27
  */
 public enum OrgCenterTypeEnum {
-    NETWORK("NETWORK", "高校网院"),
-    COLLEGE("COLLEGE", "高校教务处"),
-    UNDERGRADUATE("UNDERGRADUATE", "本科招办"),
-    POSTGRADUATE("COLLEGE", "研究生招办"),
-    MINISTRY("MINISTRY", "考试院"),
-    AOPENG("AOPENG", "奥鹏"),
-    PARTNER("PARTNER", "合作机构"),
-    OTHER("OTHER", "其他"),
+    NETWORK("NETWORK","高校网院"),
+    COLLEGE("COLLEGE","高校教务处"),
+    UNDERGRADUATE("UNDERGRADUATE","本科招办"),
+    POSTGRADUATE("COLLEGE","研究生招办"),
+    MINISTRY("MINISTRY","考试院"),
+    AOPENG("AOPENG","奥鹏"),
+    PARTNER("PARTNER","合作机构"),
+    OTHER("OTHER","其他"),
     ;
 
     OrgCenterTypeEnum(String typeCode, String typeName) {
@@ -36,7 +36,6 @@ public enum OrgCenterTypeEnum {
     public String getTypeName() {
         return typeName;
     }
-
     public static List<EnumResult> listTypes() {
         List<EnumResult> list = new ArrayList<EnumResult>();
         for (OrgCenterTypeEnum value : OrgCenterTypeEnum.values()) {

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/enums/PageSizeEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/PageSizeEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.enums;
+package com.qmth.distributed.print.business.enums;
 
 /**
  * @Description: 页面大小enum

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/PaperTypeEnum.java

@@ -1,13 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * AB卷版式
- *
  * @Date: 2021/3/23.
  */
 public enum PaperTypeEnum {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/PrintMethodEnum.java

@@ -1,13 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 印刷方式
- *
  * @Date: 2021/3/23.
  */
 public enum PrintMethodEnum {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/PrintPlanStatusEnum.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,7 +15,8 @@ public enum PrintPlanStatusEnum {
     READY("就绪"),
     PRINTING("印刷中"),
     PRINT_FINISH("印刷完成"),
-    END("已结束");
+    END("已结束")
+    ;
     private final String desc;
 
     PrintPlanStatusEnum(String desc) {
@@ -25,7 +26,6 @@ public enum PrintPlanStatusEnum {
     public String getDesc() {
         return desc;
     }
-
     public static List<EnumResult> listTypes() {
         List<EnumResult> list = new ArrayList<>();
         for (PrintPlanStatusEnum value : PrintPlanStatusEnum.values()) {

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

@@ -1,4 +1,6 @@
-package com.qmth.teachcloud.common.business.enums;
+package com.qmth.distributed.print.business.enums;
+
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/PrivilegePropertyEnum.java

@@ -1,13 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 考务必选字段(此枚举类中的字段必须在ExaminationImportDto类中有对应的属性code作为属性名，同时该属性必须加@ExcelDBFieldDesc注解，且name必须和desc对应)
- *
  * @Date: 2021/3/29.
  */
 public enum RequiredFieldsEnum {
@@ -15,14 +14,14 @@ public enum RequiredFieldsEnum {
     STUDENT_CODE("studentCode", "学号"),
     TICKET_NUMBER("ticketNumber", "考号"),
     SITE_NUMBER("siteNumber", "座位号"),
-    STUDENT_NAME("studentName", "姓名"),
-    COURSE_CODE("courseCode", "课程代码"),
-    COURSE_NAME("courseName", "课程名称"),
-    EXAM_PLACE("examPlace", "考点"),
-    EXAM_ROOM("examRoom", "考场"),
-    EXAM_DATE("examDate", "考试日期"),
-    EXAM_TIME("examTime", "考试时间"),
-    PAPER_NUMBER("paperNumber", "试卷编号");
+    STUDENT_NAME("studentName","姓名"),
+    COURSE_CODE("courseCode","课程代码"),
+    COURSE_NAME("courseName","课程名称"),
+    EXAM_PLACE("examPlace","考点"),
+    EXAM_ROOM("examRoom","考场"),
+    EXAM_DATE("examDate","考试日期"),
+    EXAM_TIME("examTime","考试时间"),
+    PAPER_NUMBER("paperNumber","试卷编号");
 
     private String code;
     private String desc;
@@ -59,14 +58,13 @@ public enum RequiredFieldsEnum {
 
     /**
      * 是否包含
-     *
      * @param name
      * @return
      */
-    public static boolean contain(String name) {
+    public static boolean contain(String name){
         RequiredFieldsEnum[] values = RequiredFieldsEnum.values();
         for (RequiredFieldsEnum value : values) {
-            if (value.name().equals(name)) {
+            if(value.name().equals(name)){
                 return true;
             }
         }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/ReviewStatusEnum.java

@@ -1,13 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 审核状态
- *
  * @Date: 2021/3/23.
  */
 public enum ReviewStatusEnum {

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/enums/RoleTypeEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/RoleTypeEnum.java

@@ -1,4 +1,6 @@
-package com.qmth.teachcloud.common.business.enums;
+package com.qmth.distributed.print.business.enums;
+
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/Source.java

@@ -1,13 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 文件存储级别类型
- *
  * @Date: 2021/3/23.
  */
 public enum StorageLevelEnum {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/StorageTypeEnum.java

@@ -1,13 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 附件存储位置类型
- *
  * @Date: 2021/3/23.
  */
 public enum StorageTypeEnum {

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/enums/TaskResultEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/TaskResultEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.enums;
+package com.qmth.distributed.print.business.enums;
 
 import java.util.Objects;
 

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/enums/TaskStatusEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/TaskStatusEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.enums;
+package com.qmth.distributed.print.business.enums;
 
 import java.util.Objects;
 

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/enums/TaskTypeEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/TaskTypeEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.enums;
+package com.qmth.distributed.print.business.enums;
 
 import java.util.Objects;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/TemplateTypeEnum.java

@@ -1,13 +1,12 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.teachcloud.common.business.enums.EnumResult;
+import com.qmth.distributed.print.business.enums.result.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 通用模板类型
- *
  * @Date: 2021/3/23.
  */
 public enum TemplateTypeEnum {

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/enums/UploadFileEnum.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/enums/UploadFileEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.common.business.enums;
+package com.qmth.distributed.print.business.enums;
 
 import java.util.Objects;