第一次合并

distributed-print-business/pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.qmth.distributed.print.business</groupId>
     <artifactId>distributed-print-business</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <build>
         <plugins>
             <plugin>
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.qmth.distributed.print.service</groupId>
         <artifactId>distributed-print-service</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
     </parent>
 
     <dependencies>
@@ -32,8 +32,8 @@
             <version>2.0</version>
         </dependency>
         <dependency>
-            <groupId>com.qmth.teachcloud.common</groupId>
-            <artifactId>teachcloud-common</artifactId>
+            <groupId>com.qmth.teachcloud.common.business</groupId>
+            <artifactId>teachcloud-common-business</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
@@ -55,14 +55,6 @@
             <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>-->

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.distributed.print.business.entity.SysRole;
+import com.qmth.teachcloud.common.business.entity.BasicSchool;
+import com.qmth.teachcloud.common.business.entity.SysRole;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

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

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

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

@@ -1,5 +1,6 @@
 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/ExaminationExportDto.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.distributed.print.business.annotation.ExcelProperty;
+import com.qmth.teachcloud.common.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.distributed.print.business.annotation.ExcelDBFieldDesc;
+import com.qmth.teachcloud.common.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/PrivilegeCacheDto.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.distributed.print.business.enums.PrivilegeEnum;
-import com.qmth.distributed.print.business.enums.RoleTypeEnum;
+import com.qmth.teachcloud.common.business.enums.PrivilegeEnum;
+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/dto/TemplateDto.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;
 

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

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

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

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

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

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

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

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

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

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

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

@@ -1,22 +0,0 @@
-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/LoginResult.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/PrivilegeResult.java

@@ -4,8 +4,7 @@ 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.distributed.print.business.bean.dto.PrivilegeDto;
-import com.qmth.distributed.print.business.enums.PrivilegeEnum;
+import com.qmth.teachcloud.common.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/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/config/MapApiReader.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/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;
 

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;
 

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

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

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

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

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

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

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

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

@@ -6,8 +6,8 @@ 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.distributed.print.business.enums.TaskResultEnum;
-import com.qmth.distributed.print.business.enums.TaskStatusEnum;
+import com.qmth.teachcloud.common.business.enums.TaskResultEnum;
+import com.qmth.teachcloud.common.business.enums.TaskStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

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

@@ -1,12 +1,13 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.business.enums.result.EnumResult;
+import com.qmth.teachcloud.common.business.enums.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.distributed.print.business.enums.result.EnumResult;
+import com.qmth.teachcloud.common.business.enums.EnumResult;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 
 import java.util.ArrayList;

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

@@ -1,12 +1,14 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.business.enums.result.EnumResult;
+
+import com.qmth.teachcloud.common.business.enums.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,12 +1,13 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.business.enums.result.EnumResult;
+import com.qmth.teachcloud.common.business.enums.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/DrawRuleEnum.java

@@ -1,12 +1,13 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.business.enums.result.EnumResult;
+import com.qmth.teachcloud.common.business.enums.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/ExamDetailStatusEnum.java

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

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

@@ -1,12 +1,13 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.business.enums.result.EnumResult;
+import com.qmth.teachcloud.common.business.enums.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,12 +1,13 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.business.enums.result.EnumResult;
+import com.qmth.teachcloud.common.business.enums.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/MakeMethodEnum.java

@@ -1,12 +1,13 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.business.enums.result.EnumResult;
+import com.qmth.teachcloud.common.business.enums.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/OrgCenterTypeEnum.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.business.enums.result.EnumResult;
+import com.qmth.teachcloud.common.business.enums.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,6 +36,7 @@ public enum OrgCenterTypeEnum {
     public String getTypeName() {
         return typeName;
     }
+
     public static List<EnumResult> listTypes() {
         List<EnumResult> list = new ArrayList<EnumResult>();
         for (OrgCenterTypeEnum value : OrgCenterTypeEnum.values()) {

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

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

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

@@ -1,12 +1,13 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.business.enums.result.EnumResult;
+import com.qmth.teachcloud.common.business.enums.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 考务必选字段(此枚举类中的字段必须在ExaminationImportDto类中有对应的属性code作为属性名，同时该属性必须加@ExcelDBFieldDesc注解，且name必须和desc对应)
+ *
  * @Date: 2021/3/29.
  */
 public enum RequiredFieldsEnum {
@@ -14,14 +15,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;
@@ -58,13 +59,14 @@ 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,12 +1,13 @@
 package com.qmth.distributed.print.business.enums;
 
-import com.qmth.distributed.print.business.enums.result.EnumResult;
+import com.qmth.teachcloud.common.business.enums.EnumResult;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * 审核状态
+ *
  * @Date: 2021/3/23.
  */
 public enum ReviewStatusEnum {

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

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

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

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

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicAttachmentMapper.java

@@ -1,7 +1,7 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.BasicAttachment;
+import com.qmth.teachcloud.common.business.entity.BasicAttachment;
 
 /**
  * <p>

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicCourseMapper.java

@@ -3,9 +3,9 @@ package com.qmth.distributed.print.business.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.distributed.print.business.bean.dto.CourseInfoDto;
 import com.qmth.distributed.print.business.bean.params.CourseParam;
-import com.qmth.distributed.print.business.entity.BasicCourse;
+import com.qmth.teachcloud.common.business.bean.dto.CourseInfoDto;
+import com.qmth.teachcloud.common.business.entity.BasicCourse;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -24,5 +24,5 @@ public interface BasicCourseMapper extends BaseMapper<BasicCourse> {
 
     IPage<BasicCourse> listPage(Page<BasicCourse> page, @Param("schoolId") Long schoolId, @Param("code") String code, @Param("name") String name);
 
-    List<CourseInfoDto> findByUserLoginNameAndRealName(@Param("loginName")String loginName,@Param("realName") String realName);
+    List<CourseInfoDto> findByUserLoginNameAndRealName(@Param("loginName")String loginName, @Param("realName") String realName);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicSchoolMapper.java

@@ -1,8 +1,8 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.bean.dto.SchoolDto;
-import com.qmth.distributed.print.business.entity.BasicSchool;
+import com.qmth.teachcloud.common.business.bean.dto.SchoolDto;
+import com.qmth.teachcloud.common.business.entity.BasicSchool;
 
 import java.util.List;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamDetailCourseMapper.java

@@ -1,8 +1,8 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.BasicCourse;
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
+import com.qmth.teachcloud.common.business.entity.BasicCourse;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamTaskMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.ExamTask;
+import com.qmth.teachcloud.common.business.bean.dto.BlurryUserDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -50,12 +51,12 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
     IPage<WorkResult> queryByMyWork(IPage<Map> iPage,
                                     @Param("userId") Long userId,
                                     @Param("schoolId") Long schoolId,
-                                    @Param("status") String...status);
+                                    @Param("status") String... status);
 
     IPage<WorkResult> queryUserByMyWork(IPage<Map> iPage,
-                                    @Param("userId") Long userId,
-                                    @Param("schoolId") Long schoolId,
-                                    @Param("status") String...status);
+                                        @Param("userId") Long userId,
+                                        @Param("schoolId") Long schoolId,
+                                        @Param("status") String... status);
 
     /**
      * 查询我的工作台
@@ -69,7 +70,7 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
     IPage<WorkResult> queryByMyWorkSubmit(IPage<Map> iPage,
                                           @Param("userId") Long userId,
                                           @Param("schoolId") Long schoolId,
-                                          @Param("status") String...status);
+                                          @Param("status") String... status);
 
     IPage<ClientExamTaskDto> listClientExamTaskPage(Page<ClientExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("machineCode") String machineCode, @Param("printPlanId") Long printPlanId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("isTry") Boolean isTry, @Param("isPass") Boolean isPass, @Param("orgIds") Set<Long> orgIds, @Param("printPlanStatus") String printPlanStatus, @Param("examDetailStatus") String[] examDetailStatus);
 
@@ -79,6 +80,7 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
 
     /**
      * 查询审核样品
+     *
      * @param examTaskId 命题任务id
      * @return 结果
      */

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/SysPrivilegeMapper.java

@@ -1,7 +1,7 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.SysPrivilege;
+import com.qmth.teachcloud.common.business.entity.SysPrivilege;
 
 /**
  * <p>

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/SysRoleMapper.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.distributed.print.business.bean.params.RoleParam;
-import com.qmth.distributed.print.business.entity.SysRole;
+import com.qmth.teachcloud.common.business.entity.SysRole;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/SysRolePrivilegeMapper.java

@@ -1,7 +1,7 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.SysRolePrivilege;
+import com.qmth.teachcloud.common.business.entity.SysRolePrivilege;
 
 /**
  * <p>

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

@@ -3,9 +3,9 @@ package com.qmth.distributed.print.business.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.distributed.print.business.bean.dto.BlurryUserDto;
-import com.qmth.distributed.print.business.bean.dto.UserDto;
-import com.qmth.distributed.print.business.entity.SysUser;
+import com.qmth.teachcloud.common.business.bean.dto.BlurryUserDto;
+import com.qmth.teachcloud.common.business.bean.dto.UserDto;
+import com.qmth.teachcloud.common.business.entity.SysUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/SysUserRoleMapper.java

@@ -1,9 +1,9 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.bean.dto.MenuDto;
-import com.qmth.distributed.print.business.entity.SysRole;
-import com.qmth.distributed.print.business.entity.SysUserRole;
+import com.qmth.teachcloud.common.business.bean.dto.MenuDto;
+import com.qmth.teachcloud.common.business.entity.SysRole;
+import com.qmth.teachcloud.common.business.entity.SysUserRole;
 
 import java.util.List;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TBSessionMapper.java

@@ -1,8 +1,7 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.TBSession;
-
+import com.qmth.teachcloud.common.business.entity.TBSession;
 /**
  * <p>
  * 会话表 Mapper 接口

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TBTaskMapper.java

@@ -2,8 +2,8 @@ package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.distributed.print.business.bean.result.TaskListResult;
-import com.qmth.distributed.print.business.entity.TBTask;
+import com.qmth.teachcloud.common.business.bean.result.TaskListResult;
+import com.qmth.teachcloud.common.business.entity.TBTask;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/TGErrorMapper.java

@@ -1,7 +1,7 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.TGError;
+import com.qmth.teachcloud.common.business.entity.TGError;
 
 /**
  * <p>

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicAttachmentService.java

@@ -2,12 +2,11 @@ package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.itextpdf.text.DocumentException;
-import com.qmth.distributed.print.business.bean.dto.PdfDto;
-import com.qmth.distributed.print.business.entity.BasicAttachment;
 import com.qmth.distributed.print.business.entity.ExamDetail;
-import com.qmth.distributed.print.business.entity.ExamDetailCourse;
-import com.qmth.distributed.print.business.enums.ClassifyEnum;
-import com.qmth.distributed.print.business.enums.UploadFileEnum;
+import com.qmth.teachcloud.common.business.bean.dto.PdfDto;
+import com.qmth.teachcloud.common.business.entity.BasicAttachment;
+import com.qmth.teachcloud.common.business.enums.ClassifyEnum;
+import com.qmth.teachcloud.common.business.enums.UploadFileEnum;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicCourseService.java

@@ -2,10 +2,8 @@ package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.CourseInfoDto;
-import com.qmth.distributed.print.business.bean.params.BlurryParam;
-import com.qmth.distributed.print.business.bean.params.CourseParam;
-import com.qmth.distributed.print.business.entity.BasicCourse;
+import com.qmth.teachcloud.common.business.bean.dto.CourseInfoDto;
+import com.qmth.teachcloud.common.business.entity.BasicCourse;
 
 import java.util.List;
 
@@ -23,7 +21,7 @@ public interface BasicCourseService extends IService<BasicCourse> {
 
     List<BasicCourse> list(String param, Long printPlanId);
 
-    boolean saveCourse(BasicCourse course,Long userId);
+    boolean saveCourse(BasicCourse course, Long userId);
 
     boolean remove(Long id);
 
@@ -31,18 +29,20 @@ public interface BasicCourseService extends IService<BasicCourse> {
 
     /**
      * 校验课程信息
-     * @param schoolId 学校id
+     *
+     * @param schoolId   学校id
      * @param courseCode 课程代码
      * @param courseName 课程名称
-     * @param userId 当前用户id
+     * @param userId     当前用户id
      */
-    void verifyCourseInfo(Long schoolId,String courseCode,String courseName,Long userId);
+    void verifyCourseInfo(Long schoolId, String courseCode, String courseName, Long userId);
 
     /**
      * 根据用户登录名和真实名称查找其可命的课程
+     *
      * @param loginName 登录名
-     * @param realName 真实名
+     * @param realName  真实名
      * @return 课程集合
      */
-    List<CourseInfoDto> findByUserLoginNameAndRealName(String loginName,String realName);
+    List<CourseInfoDto> findByUserLoginNameAndRealName(String loginName, String realName);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicMessageService.java

@@ -3,8 +3,8 @@ package com.qmth.distributed.print.business.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.entity.BasicMessage;
 import com.qmth.distributed.print.business.entity.ExamTask;
-import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.enums.MessageEnum;
+import com.qmth.teachcloud.common.business.entity.SysUser;
 
 import java.util.List;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicSchoolService.java

@@ -1,8 +1,8 @@
 package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.SchoolDto;
-import com.qmth.distributed.print.business.entity.BasicSchool;
+import com.qmth.teachcloud.common.business.bean.dto.SchoolDto;
+import com.qmth.teachcloud.common.business.entity.BasicSchool;
 
 import java.util.List;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicUserCourseService.java

@@ -2,7 +2,7 @@ package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.entity.BasicUserCourse;
-import com.qmth.distributed.print.business.entity.SysUser;
+import com.qmth.teachcloud.common.business.entity.SysUser;
 
 /**
  * <p>

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/CacheService.java

@@ -1,8 +1,12 @@
 package com.qmth.distributed.print.business.service;
 
 import com.qmth.distributed.print.business.bean.auth.AuthBean;
-import com.qmth.distributed.print.business.entity.*;
+import com.qmth.distributed.print.business.entity.SysOrg;
 import com.qmth.distributed.print.business.enums.PrivilegePropertyEnum;
+import com.qmth.teachcloud.common.business.entity.BasicSchool;
+import com.qmth.teachcloud.common.business.entity.SysRolePrivilege;
+import com.qmth.teachcloud.common.business.entity.SysUser;
+import com.qmth.teachcloud.common.business.entity.SysUserRole;
 
 import java.util.List;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/CommonService.java

@@ -4,11 +4,11 @@ import com.qmth.distributed.print.business.bean.auth.AuthBean;
 import com.qmth.distributed.print.business.bean.dto.PrivilegeCacheDto;
 import com.qmth.distributed.print.business.bean.result.LoginResult;
 import com.qmth.distributed.print.business.bean.result.RolePrivilegeResult;
-import com.qmth.distributed.print.business.entity.BasicAttachment;
-import com.qmth.distributed.print.business.entity.SysRolePrivilege;
-import com.qmth.distributed.print.business.entity.SysUser;
-import com.qmth.distributed.print.business.entity.SysUserRole;
 import com.qmth.distributed.print.business.enums.PrivilegePropertyEnum;
+import com.qmth.teachcloud.common.business.entity.BasicAttachment;
+import com.qmth.teachcloud.common.business.entity.SysRolePrivilege;
+import com.qmth.teachcloud.common.business.entity.SysUser;
+import com.qmth.teachcloud.common.business.entity.SysUserRole;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamCardService.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.dto.CardCustDto;
 import com.qmth.distributed.print.business.bean.dto.CardDetailDto;
 import com.qmth.distributed.print.business.bean.dto.SyncExamCardDto;
-import com.qmth.distributed.print.business.bean.params.ArraysParams;
 import com.qmth.distributed.print.business.bean.params.ExamCardParams;
 import com.qmth.distributed.print.business.entity.ExamCard;
+import com.qmth.teachcloud.common.business.bean.params.ArraysParams;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamDetailCourseService.java

@@ -1,8 +1,8 @@
 package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.BasicCourse;
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
+import com.qmth.teachcloud.common.business.entity.BasicCourse;
 
 import java.util.List;
 import java.util.Map;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamTaskService.java

@@ -4,13 +4,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
-import com.qmth.distributed.print.business.entity.*;
+import com.qmth.distributed.print.business.entity.ExamTask;
+import com.qmth.distributed.print.business.entity.ExamTaskDetail;
+import com.qmth.distributed.print.business.entity.ExamTaskReviewLog;
 import com.qmth.distributed.print.business.enums.ExamStatusEnum;
+import com.qmth.teachcloud.common.business.bean.dto.BlurryUserDto;
+import com.qmth.teachcloud.common.business.entity.SysUser;
+import com.qmth.teachcloud.common.business.entity.TBTask;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
@@ -115,6 +119,7 @@ public interface ExamTaskService extends IService<ExamTask> {
 
     /**
      * 根据命题任务id从（'exam_task_detail'表和'exam_task_paper_log'表查找审核样品信息）
+     *
      * @param examTaskId 命题任务主键
      * @return 命题任务信息
      */

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/SysPrivilegeService.java

@@ -1,8 +1,8 @@
 package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.PrivilegeDto;
-import com.qmth.distributed.print.business.entity.SysPrivilege;
+import com.qmth.teachcloud.common.business.bean.dto.PrivilegeDto;
+import com.qmth.teachcloud.common.business.entity.SysPrivilege;
 
 import java.util.List;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/SysRolePrivilegeService.java

@@ -1,8 +1,8 @@
 package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.SysRole;
-import com.qmth.distributed.print.business.entity.SysRolePrivilege;
+import com.qmth.teachcloud.common.business.entity.SysRole;
+import com.qmth.teachcloud.common.business.entity.SysRolePrivilege;
 
 import java.util.List;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/SysRoleService.java

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.params.RoleParam;
-import com.qmth.distributed.print.business.entity.SysRole;
+import com.qmth.teachcloud.common.business.entity.SysRole;
 
 import java.util.List;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/SysUserRoleService.java

@@ -1,9 +1,9 @@
 package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.MenuDto;
-import com.qmth.distributed.print.business.entity.SysRole;
-import com.qmth.distributed.print.business.entity.SysUserRole;
+import com.qmth.teachcloud.common.business.bean.dto.MenuDto;
+import com.qmth.teachcloud.common.business.entity.SysRole;
+import com.qmth.teachcloud.common.business.entity.SysUserRole;
 
 import java.util.List;
 

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

@@ -2,11 +2,11 @@ package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.BlurryUserDto;
-import com.qmth.distributed.print.business.bean.dto.LoginDto;
-import com.qmth.distributed.print.business.bean.dto.UserDto;
-import com.qmth.distributed.print.business.bean.params.UserSaveParams;
-import com.qmth.distributed.print.business.entity.SysUser;
+import com.qmth.teachcloud.common.business.bean.dto.BlurryUserDto;
+import com.qmth.teachcloud.common.business.bean.dto.LoginDto;
+import com.qmth.teachcloud.common.business.bean.dto.UserDto;
+import com.qmth.teachcloud.common.business.bean.params.UserSaveParams;
+import com.qmth.teachcloud.common.business.entity.SysUser;
 
 import java.security.NoSuchAlgorithmException;
 import java.util.List;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TBSessionService.java

@@ -1,7 +1,7 @@
 package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.TBSession;
+import com.qmth.teachcloud.common.business.entity.TBSession;
 
 /**
  * <p>

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TBTaskService.java

@@ -2,13 +2,13 @@ package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.params.ArraysParams;
-import com.qmth.distributed.print.business.bean.result.TaskListResult;
-import com.qmth.distributed.print.business.entity.SysUser;
-import com.qmth.distributed.print.business.entity.TBTask;
-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.business.bean.params.ArraysParams;
+import com.qmth.teachcloud.common.business.bean.result.TaskListResult;
+import com.qmth.teachcloud.common.business.entity.SysUser;
+import com.qmth.teachcloud.common.business.entity.TBTask;
+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 org.springframework.scheduling.annotation.Async;
 import org.springframework.web.multipart.MultipartFile;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TGErrorService.java

@@ -1,7 +1,7 @@
 package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.TGError;
+import com.qmth.teachcloud.common.business.entity.TGError;
 
 /**
  * <p>

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicAttachmentServiceImpl.java

@@ -7,20 +7,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.itextpdf.text.DocumentException;
 import com.itextpdf.text.pdf.PdfReader;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.distributed.print.business.bean.dto.PdfDto;
 import com.qmth.distributed.print.business.config.DictionaryConfig;
-import com.qmth.distributed.print.business.entity.BasicAttachment;
 import com.qmth.distributed.print.business.entity.ExamDetail;
-import com.qmth.distributed.print.business.entity.SysUser;
-import com.qmth.distributed.print.business.enums.ClassifyEnum;
-import com.qmth.distributed.print.business.enums.PageSizeEnum;
-import com.qmth.distributed.print.business.enums.UploadFileEnum;
 import com.qmth.distributed.print.business.mapper.BasicAttachmentMapper;
 import com.qmth.distributed.print.business.service.BasicAttachmentService;
 import com.qmth.distributed.print.business.util.HtmlToPdfUtil;
 import com.qmth.distributed.print.business.util.OssUtil;
 import com.qmth.distributed.print.business.util.PdfUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
+import com.qmth.teachcloud.common.business.bean.dto.PdfDto;
+import com.qmth.teachcloud.common.business.entity.BasicAttachment;
+import com.qmth.teachcloud.common.business.entity.SysUser;
+import com.qmth.teachcloud.common.business.enums.ClassifyEnum;
+import com.qmth.teachcloud.common.business.enums.PageSizeEnum;
+import com.qmth.teachcloud.common.business.enums.UploadFileEnum;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.HexUtils;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicCardRuleServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.CardRuleDto;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
 import com.qmth.distributed.print.business.entity.SysOrg;
-import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import com.qmth.distributed.print.business.mapper.BasicCardRuleMapper;
 import com.qmth.distributed.print.business.service.BasicCardRuleService;
@@ -16,6 +15,7 @@ import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
 import com.qmth.distributed.print.business.service.CommonService;
 import com.qmth.distributed.print.business.util.ConvertUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
+import com.qmth.teachcloud.common.business.entity.SysUser;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicCourseServiceImpl.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.distributed.print.business.bean.dto.CourseInfoDto;
-import com.qmth.distributed.print.business.entity.BasicCourse;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.mapper.BasicCourseMapper;
 import com.qmth.distributed.print.business.service.BasicCourseService;
@@ -13,6 +11,8 @@ import com.qmth.distributed.print.business.service.ExamDetailCourseService;
 import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.distributed.print.business.util.ConvertUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
+import com.qmth.teachcloud.common.business.bean.dto.CourseInfoDto;
+import com.qmth.teachcloud.common.business.entity.BasicCourse;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicExamRuleServiceImpl.java

@@ -5,15 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.entity.BasicExamRule;
 import com.qmth.distributed.print.business.entity.ExamPrintPlan;
-import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.distributed.print.business.mapper.BasicExamRuleMapper;
 import com.qmth.distributed.print.business.service.BasicExamRuleService;
 import com.qmth.distributed.print.business.service.ExamPrintPlanService;
 import com.qmth.distributed.print.business.util.ServletUtil;
+import com.qmth.teachcloud.common.business.entity.SysUser;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.util.JacksonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicMessageServiceImpl.java

@@ -15,7 +15,6 @@ import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.entity.BasicMessage;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.entity.SysConfig;
-import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.enums.MessageEnum;
 import com.qmth.distributed.print.business.mapper.BasicMessageMapper;
 import com.qmth.distributed.print.business.service.BasicMessageService;
@@ -23,6 +22,7 @@ import com.qmth.distributed.print.business.service.CacheService;
 import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.distributed.print.business.service.SysConfigService;
 import com.qmth.distributed.print.business.util.ServletUtil;
+import com.qmth.teachcloud.common.business.entity.SysUser;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicSchoolServiceImpl.java

@@ -1,10 +1,10 @@
 package com.qmth.distributed.print.business.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.bean.dto.SchoolDto;
-import com.qmth.distributed.print.business.entity.BasicSchool;
 import com.qmth.distributed.print.business.mapper.BasicSchoolMapper;
 import com.qmth.distributed.print.business.service.BasicSchoolService;
+import com.qmth.teachcloud.common.business.bean.dto.SchoolDto;
+import com.qmth.teachcloud.common.business.entity.BasicSchool;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicTemplateServiceImpl.java

@@ -16,6 +16,8 @@ import com.qmth.distributed.print.business.mapper.BasicTemplateMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.ConvertUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
+import com.qmth.teachcloud.common.business.entity.BasicAttachment;
+import com.qmth.teachcloud.common.business.entity.SysUser;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;