抽取公用方法

distributed-print-business/pom.xml

@@ -55,18 +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>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</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.entity.BasicSchool;
 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.annotation.ExcelProperty;
 
 /**
  * @Date: 2021/3/29.

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.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
 
 /**

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

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

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

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

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

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

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

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

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

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

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

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

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.entity.BasicSchool;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

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.annotation.ApiJsonObject;
+import com.qmth.teachcloud.common.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/BasicAttachment.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 com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModelProperty;
 

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.base.BaseEntity;
 
 import java.io.Serializable;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/BasicCourse.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.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.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.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.base.BaseEntity;
 
 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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.base.BaseEntity;
 
 import java.io.Serializable;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/SysRole.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.RoleTypeEnum;
+import com.qmth.teachcloud.common.base.BaseEntity;
 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.distributed.print.business.base.BaseEntity;
+import com.qmth.teachcloud.common.base.BaseEntity;
 
 import java.io.Serializable;
 

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

@@ -5,7 +5,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/SysUser.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.service.SysConfigService;
+import com.qmth.teachcloud.common.base.BaseEntity;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.util.Base64Util;

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

@@ -3,6 +3,7 @@ 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.enums.PrivilegePropertyEnum;
+import com.qmth.teachcloud.common.entity.BasicSchool;
 
 import java.util.List;
 

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

@@ -8,7 +8,6 @@ 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;
@@ -21,6 +20,7 @@ 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.config.DictionaryConfig;
 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/BasicMessageServiceImpl.java

@@ -11,7 +11,6 @@ import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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;
@@ -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.config.DictionaryConfig;
 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/BasicVerifyCodeServiceImpl.java

@@ -10,12 +10,12 @@ import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.entity.BasicVerifyCode;
 import com.qmth.distributed.print.business.entity.SysConfig;
 import com.qmth.distributed.print.business.mapper.BasicVerifyCodeMapper;
 import com.qmth.distributed.print.business.service.BasicVerifyCodeService;
 import com.qmth.distributed.print.business.service.SysConfigService;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 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/CacheServiceImpl.java

@@ -6,6 +6,8 @@ import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.PrivilegePropertyEnum;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicSchool;
+import com.qmth.teachcloud.common.service.BasicSchoolService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cache.annotation.CacheEvict;

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

@@ -3,9 +3,9 @@ package com.qmth.distributed.print.business.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.tools.signature.SignatureEntity;
 import com.qmth.boot.tools.signature.SignatureType;
-import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.service.CallApiOrgCenterService;
 import com.qmth.distributed.print.business.util.HttpUtil;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.springframework.stereotype.Service;

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

@@ -15,15 +15,16 @@ 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.PrivilegeResult;
 import com.qmth.distributed.print.business.bean.result.RolePrivilegeResult;
-import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.*;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
 import com.qmth.distributed.print.business.util.*;
 import com.qmth.teachcloud.common.SignatureEntityTest;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.SessionUtil;
 import org.apache.commons.io.IOUtils;

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

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.distributed.print.business.bean.dto.SyncExamCardDto;
 import com.qmth.distributed.print.business.bean.dto.SyncExamStudentDto;
-import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.distributed.print.business.enums.TaskResultEnum;
@@ -15,7 +14,9 @@ import com.qmth.distributed.print.business.enums.TaskStatusEnum;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.HttpKit;
 import com.qmth.teachcloud.common.SignatureEntityTest;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;

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

@@ -23,7 +23,9 @@ import com.qmth.distributed.print.business.mapper.ExamPrintPlanMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.service.BasicSchoolService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -3,13 +3,13 @@ package com.qmth.distributed.print.business.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.qmth.distributed.print.business.entity.BasicSchool;
 import com.qmth.distributed.print.business.enums.OrgCenterTypeEnum;
-import com.qmth.distributed.print.business.service.BasicSchoolService;
 import com.qmth.distributed.print.business.service.CallApiOrgCenterService;
 import com.qmth.distributed.print.business.service.OrgCenterDataDisposeService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.service.BasicSchoolService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -2,13 +2,11 @@ package com.qmth.distributed.print.business.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.bean.params.ArraysParams;
 import com.qmth.distributed.print.business.bean.result.TaskListResult;
-import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.entity.BasicAttachment;
 import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.entity.TBTask;
@@ -22,6 +20,7 @@ import com.qmth.distributed.print.business.service.SysUserService;
 import com.qmth.distributed.print.business.service.TBTaskService;
 import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
 import com.qmth.distributed.print.business.util.ServletUtil;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.JacksonUtil;
@@ -35,7 +34,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * <p>

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

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.itextpdf.text.DocumentException;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.distributed.print.business.annotation.ExcelDBFieldDesc;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.params.ArraysParams;
 import com.qmth.distributed.print.business.bean.params.SerialNumberParams;
@@ -20,7 +19,9 @@ import com.qmth.distributed.print.business.enums.*;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
 import com.qmth.distributed.print.business.util.*;
+import com.qmth.teachcloud.common.annotation.ExcelDBFieldDesc;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.FileUtil;
 import com.qmth.teachcloud.common.util.HexUtils;

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

@@ -1,9 +1,9 @@
 package com.qmth.distributed.print.business.util;
 
-import com.qmth.distributed.print.business.annotation.ExcelNote;
 import com.qmth.distributed.print.business.util.excel.ExcelCallback;
 import com.qmth.distributed.print.business.util.excel.ExcelError;
 import com.qmth.distributed.print.business.util.excel.ExcelWriter;
+import com.qmth.teachcloud.common.annotation.ExcelNote;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/FreemarkerUtil.java

@@ -2,12 +2,12 @@ package com.qmth.distributed.print.business.util;
 
 import com.alibaba.fastjson.JSONObject;
 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.enums.ClassifyEnum;
 import com.qmth.distributed.print.business.enums.UploadFileEnum;
 import com.qmth.distributed.print.business.service.BasicAttachmentService;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import freemarker.template.Configuration;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/HtmlToPdfUtil.java

@@ -1,7 +1,7 @@
 package com.qmth.distributed.print.business.util;
 
-import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.enums.PageSizeEnum;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/OssUtil.java

@@ -3,8 +3,8 @@ package com.qmth.distributed.print.business.util;
 import com.aliyun.oss.OSS;
 import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.model.*;
-import com.qmth.distributed.print.business.domain.AliYunOssDomain;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.domain.AliYunOssDomain;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/ServletUtil.java

@@ -2,8 +2,8 @@ package com.qmth.distributed.print.business.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.core.enums.Platform;
-import com.qmth.distributed.print.business.entity.BasicSchool;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/excel/ExcelExport.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.util.excel;
 
-import com.qmth.distributed.print.business.annotation.ExcelProperty;
+import com.qmth.teachcloud.common.annotation.ExcelProperty;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

distributed-print-business/src/main/resources/mapper/BasicSchoolMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.distributed.print.business.mapper.BasicSchoolMapper">
+<mapper namespace="com.qmth.teachcloud.common.mapper.BasicSchoolMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.distributed.print.business.entity.BasicSchool">
+    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.common.entity.BasicSchool">
     <result column="id" property="id" />
         <result column="code" property="code" />
         <result column="name" property="name" />
@@ -20,7 +20,7 @@
         id,
         code, name, enable, access_key, access_secret, remark, create_time, update_time
     </sql>
-    <select id="listSchool" resultType="com.qmth.distributed.print.business.bean.dto.SchoolDto">
+    <select id="listSchool" resultType="com.qmth.teachcloud.common.bean.dto.SchoolDto">
         select id, name, enable, logo from basic_school where enable = true order by create_time desc
     </select>
 

distributed-print/src/main/java/com/qmth/distributed/print/DistributedPrintApplication.java

@@ -8,6 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ImportResource;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -15,12 +16,12 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 import javax.annotation.Resource;
 
 @SpringBootApplication(scanBasePackages = "com.qmth.*")
-@MapperScan({"com.qmth.distributed.print.business.mapper","com.qmth.teachcloud.report.business.mapper"})
+@MapperScan({"com.qmth.distributed.print.business.mapper","com.qmth.teachcloud.report.business.mapper","com.qmth.teachcloud.common.mapper"})
 //主要就是定义扫描的路径从中找出标识了需要装配的类自动装配到spring的bean容器中,做过web开发的同学一定都有用过@Controller，@Service，@Repository注解，查看其源码你会发现，他们中有一个共同的注解@Component，没错@ComponentScan注解默认就会装配标识了@Controller，@Service，@Repository，@Component注解的类到spring容器中
-@EntityScan(basePackages = {"com.qmth.distributed.print.business.entity","com.qmth.teachcloud.report.business.entity"}) // 用来扫描和发现指定包及其子包中的Entity定义
+@EntityScan(basePackages = {"com.qmth.distributed.print.business.entity","com.qmth.teachcloud.report.business.entity","com.qmth.teachcloud.common.entity"}) // 用来扫描和发现指定包及其子包中的Entity定义
 @EnableTransactionManagement // spring开启事务支持
 @EnableAsync // 开启异步任务
-@EnableCaching // 开启缓存注解
+@EnableCaching // 开启缓存注
 public class DistributedPrintApplication {
 
     public static void main(String[] args) {

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

@@ -1,11 +1,8 @@
 package com.qmth.distributed.print.api;
 
-
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.dto.SchoolDto;
-import com.qmth.distributed.print.business.service.BasicSchoolService;
+import com.qmth.teachcloud.common.bean.dto.SchoolDto;
+import com.qmth.teachcloud.common.service.BasicSchoolService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -15,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**

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

@@ -1,6 +1,5 @@
 package com.qmth.distributed.print.api;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.annotation.Aac;
@@ -10,13 +9,13 @@ import com.qmth.distributed.print.business.bean.auth.AuthBean;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.params.ClientLoginParam;
 import com.qmth.distributed.print.business.bean.result.LoginResult;
-import com.qmth.distributed.print.business.entity.BasicSchool;
 import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import com.qmth.distributed.print.business.service.CacheService;
 import com.qmth.distributed.print.business.service.ClientService;
 import com.qmth.distributed.print.business.service.CommonService;
 import com.qmth.distributed.print.business.service.SysUserService;
+import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;

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

@@ -10,7 +10,6 @@ import com.qmth.distributed.print.business.bean.dto.MenuDto;
 import com.qmth.distributed.print.business.bean.params.LoginParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.LoginResult;
-import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.DownloadFileEnum;
 import com.qmth.distributed.print.business.enums.RoleTypeEnum;
@@ -18,7 +17,9 @@ import com.qmth.distributed.print.business.enums.UploadFileEnum;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.RedisUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;

teachcloud-common/pom.xml

@@ -70,5 +70,17 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</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>
+        </dependency>
     </dependencies>
 </project>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +1,6 @@
-package com.qmth.distributed.print.business.base;
+package com.qmth.teachcloud.common.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;

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

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

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

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

distributed-print-business/src/main/java/com/qmth/distributed/print/business/config/DictionaryConfig.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/config/DictionaryConfig.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.business.config;
+package com.qmth.teachcloud.common.config;
 
-import com.qmth.distributed.print.business.domain.*;
+import com.qmth.teachcloud.common.domain.*;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

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

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.config;
+package com.qmth.teachcloud.common.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/config/MultipartConfig.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/config/MultipartConfig.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.config;
+package com.qmth.teachcloud.common.config;
 
 /**
 * @Description: Multipart 附件上传配置

distributed-print-business/src/main/java/com/qmth/distributed/print/business/domain/AliYunOssDomain.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/AliYunOssDomain.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.domain;
+package com.qmth.teachcloud.common.domain;
 
 import java.io.Serializable;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/domain/OrgCenterDomain.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/OrgCenterDomain.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.domain;
+package com.qmth.teachcloud.common.domain;
 
 /**
  * @Description: 机构用户中心配置

distributed-print-business/src/main/java/com/qmth/distributed/print/business/domain/PrefixUrlDomain.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/PrefixUrlDomain.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.domain;
+package com.qmth.teachcloud.common.domain;
 
 import java.io.Serializable;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/domain/SmsDomain.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/SmsDomain.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.domain;
+package com.qmth.teachcloud.common.domain;
 
 /**
  * 短信参数

distributed-print-business/src/main/java/com/qmth/distributed/print/business/domain/SyncDataDomain.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/SyncDataDomain.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.domain;
+package com.qmth.teachcloud.common.domain;
 
 /**
  * @Description: 同步云阅卷参数

distributed-print-business/src/main/java/com/qmth/distributed/print/business/domain/SysDomain.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/SysDomain.java

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

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

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

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

@@ -1,8 +1,8 @@
-package com.qmth.distributed.print.business.mapper;
+package com.qmth.teachcloud.common.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.bean.dto.SchoolDto;
+import com.qmth.teachcloud.common.entity.BasicSchool;
 
 import java.util.List;
 

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

@@ -1,8 +1,8 @@
-package com.qmth.distributed.print.business.service;
+package com.qmth.teachcloud.common.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.bean.dto.SchoolDto;
+import com.qmth.teachcloud.common.entity.BasicSchool;
 
 import java.util.List;
 

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

@@ -1,10 +1,10 @@
-package com.qmth.distributed.print.business.service.impl;
+package com.qmth.teachcloud.common.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.bean.dto.SchoolDto;
+import com.qmth.teachcloud.common.entity.BasicSchool;
+import com.qmth.teachcloud.common.mapper.BasicSchoolMapper;
+import com.qmth.teachcloud.common.service.BasicSchoolService;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/BasicSchoolController.java

@@ -2,8 +2,8 @@ package com.qmth.teachcloud.report.api;
 
 
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.distributed.print.business.bean.dto.SchoolDto;
-import com.qmth.distributed.print.business.service.BasicSchoolService;
+import com.qmth.teachcloud.common.bean.dto.SchoolDto;
+import com.qmth.teachcloud.common.service.BasicSchoolService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/SysController.java

@@ -10,7 +10,6 @@ import com.qmth.distributed.print.business.bean.dto.MenuDto;
 import com.qmth.distributed.print.business.bean.params.LoginParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.LoginResult;
-import com.qmth.distributed.print.business.config.DictionaryConfig;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.DownloadFileEnum;
 import com.qmth.distributed.print.business.enums.RoleTypeEnum;
@@ -18,7 +17,9 @@ import com.qmth.distributed.print.business.enums.UploadFileEnum;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.RedisUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
+import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;