增加report模块

distributed-print-business/pom.xml

@@ -32,8 +32,8 @@
             <version>2.0</version>
         </dependency>
         <dependency>
-            <groupId>com.qmth.distributed.print.common</groupId>
-            <artifactId>distributed-print-common</artifactId>
+            <groupId>com.qmth.teachcloud.common</groupId>
+            <artifactId>teachcloud-common</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>

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

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

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

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

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

@@ -1,7 +1,7 @@
 package com.qmth.distributed.print.business.cache;
 
 import com.qmth.distributed.print.business.util.RedisUtil;
-import com.qmth.distributed.print.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
 
 /**
  * @Description: 生成pdf cache

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

@@ -7,7 +7,7 @@ package com.qmth.distributed.print.business.config;
 * @Author: wangliang
 * @Date: 2020/7/29
 */
-import com.qmth.distributed.print.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.multipart.MultipartResolver;

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

@@ -7,7 +7,7 @@ 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.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

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

@@ -6,11 +6,10 @@ 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.distributed.print.common.contant.SpringContextHolder;
-import com.qmth.distributed.print.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.Length;
-import org.springframework.boot.SpringApplication;
 import sun.misc.BASE64Encoder;
 
 import javax.validation.constraints.NotBlank;

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.distributed.print.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

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

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

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

@@ -9,13 +9,11 @@ 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.distributed.print.business.enums.TaskTypeEnum;
-import com.qmth.distributed.print.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * <p>

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

@@ -5,7 +5,7 @@ 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.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

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

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

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

@@ -21,10 +21,10 @@ 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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.HexUtils;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.HexUtils;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;

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

@@ -16,9 +16,8 @@ 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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import org.apache.commons.lang3.StringUtils;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -85,7 +84,7 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
         cardRule.setSchoolId(schoolId);
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
 
-        if(cardRule.getTitleRule().length() > 200){
+        if (cardRule.getTitleRule().length() > 200) {
             throw ExceptionResultEnum.ERROR.exception("题卡标题规则长度不能超过200字符");
         }
 

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

@@ -13,8 +13,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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -55,7 +55,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
     @Override
     public List<BasicCourse> list(String param, Long printPlanId) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        if(printPlanId == null) {
+        if (printPlanId == null) {
             QueryWrapper<BasicCourse> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId);
             if (StringUtils.isNotBlank(param)) {
@@ -147,10 +147,10 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
     @Override
     public List<CourseInfoDto> findByUserLoginNameAndRealName(String loginName, String realName) {
         System.out.println("---");
-        if (loginName == null){
+        if (loginName == null) {
             loginName = "";
         }
-        if (realName == null){
+        if (realName == null) {
             realName = "";
         }
         return basicCourseMapper.findByUserLoginNameAndRealName(loginName, realName);

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

@@ -11,9 +11,9 @@ 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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.JacksonUtil;
+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

@@ -23,9 +23,9 @@ 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.distributed.print.common.contant.SpringContextHolder;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -113,6 +113,7 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
 
     /**
      * 发送短信
+     *
      * @param mobileNumber
      * @param templateCode
      * @param variableParams
@@ -250,7 +251,7 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
     @Override
     public void resendSmsTask() {
         SysConfig sysConfig = sysConfigService.getByKey("sys.message.resendCount");
-        if(sysConfig != null){
+        if (sysConfig != null) {
             Integer resendCount = StringUtils.isBlank(sysConfig.getConfigValue()) ? 0 : Integer.valueOf(sysConfig.getConfigValue());
             QueryWrapper<BasicMessage> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().ne(BasicMessage::getSendStatus, "OK").lt(BasicMessage::getResendCount, resendCount);
@@ -265,6 +266,7 @@ public class BasicMessageServiceImpl extends ServiceImpl<BasicMessageMapper, Bas
 
     /**
      * 自动重发
+     *
      * @param basicMessage
      */
     private void saveMessageResendLog(BasicMessage basicMessage) {

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

@@ -16,8 +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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -63,11 +63,11 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
                 List<SysOrg> sysOrgs = basicTemplateOrgService.listByTypeAndTemplateId(type, Long.valueOf(m.getId()));
                 m.setOrgs(sysOrgs);
 
-                if(type.equals(TemplateTypeEnum.GENERIC.name())){
+                if (type.equals(TemplateTypeEnum.GENERIC.name())) {
                     QueryWrapper<ExamCard> queryWrapper = new QueryWrapper<>();
                     queryWrapper.lambda().eq(ExamCard::getTemplateId, m.getId());
                     List<ExamCard> examCards = examCardService.list(queryWrapper);
-                    if(!CollectionUtils.isEmpty(examCards)){
+                    if (!CollectionUtils.isEmpty(examCards)) {
                         m.setCardId(examCards.get(0).getId().toString());
                     }
                 }
@@ -125,7 +125,7 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
             BasicAttachment attachment = basicAttachmentService.getById(template.getAttachmentId());
 
             ExamCard examCard1 = examCardService.getOneByTemplateId(template.getId());
-            if(examCard1 == null) {
+            if (examCard1 == null) {
                 ExamCard examCard = examCardService.getOneByTemplateId(template.getId());
                 ExamCardParams examCardParams = new ExamCardParams();
                 examCardParams.setId(examCard == null ? null : examCard.getId());

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

@@ -16,7 +16,7 @@ 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.distributed.print.common.enums.ExceptionResultEnum;
+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

@@ -5,7 +5,7 @@ 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.distributed.print.business.service.*;
-import com.qmth.distributed.print.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 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

@@ -6,8 +6,8 @@ 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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -11,8 +11,8 @@ import com.qmth.distributed.print.business.enums.ExamDetailStatusEnum;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.ExcelUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
 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/ClientStatusServiceImpl.java

@@ -7,8 +7,7 @@ import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 import com.qmth.distributed.print.business.mapper.ClientStatusMapper;
 import com.qmth.distributed.print.business.service.ClientStatusService;
 import com.qmth.distributed.print.business.service.ExamDetailCourseService;
-import com.qmth.distributed.print.business.service.ExamTaskService;
-import com.qmth.distributed.print.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -31,13 +30,13 @@ public class ClientStatusServiceImpl extends ServiceImpl<ClientStatusMapper, Cli
             QueryWrapper<ClientStatus> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(ClientStatus::getSchoolId, schoolId).eq(ClientStatus::getExamDetailId, examDetailCours.getExamDetailId()).eq(ClientStatus::getPrintPlanId, printPlanId).eq(ClientStatus::getCourseCode, courseCode).eq(ClientStatus::getPaperNumber, paperNumber).eq(ClientStatus::getMachineCode, machineCode);
             ClientStatus clientStatus = this.getOne(queryWrapper);
-            if(clientStatus != null){
+            if (clientStatus != null) {
                 clientStatus.setTry(true);
                 clientStatus.setPass(isPass);
                 clientStatus.setUpdateId(userId);
                 clientStatus.setUpdateTime(currentTime);
                 // 合格，更新打印时间
-                if(isPass){
+                if (isPass) {
                     clientStatus.setTryTime(currentTime);
                 }
                 this.updateById(clientStatus);

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

@@ -20,10 +20,10 @@ 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.distributed.print.common.contant.SpringContextHolder;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.SessionUtil;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.SessionUtil;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -415,7 +415,7 @@ public class CommonServiceImpl implements CommonService {
 
         }
         map.put("url", pathUrl);
-        if(attachment.getType().equals(".html")) {
+        if (attachment.getType().equals(".html")) {
             String htmlMd5 = (String) jsonObject.get("htmlMd5");
             map.put("md5", htmlMd5);
         } else {
@@ -742,14 +742,14 @@ public class CommonServiceImpl implements CommonService {
     @Override
     public Boolean checkExamDetailStatus(Long schoolId, Long printPlanId, String courseCode, String paperNumber) {
         List<ExamDetail> examDetails;
-        if(printPlanId != null) {
+        if (printPlanId != null) {
             examDetails = examDetailService.listByPrintPlanIdAndCourseCodeAndPaperNumber(schoolId, printPlanId, courseCode, paperNumber);
         } else {
             examDetails = examDetailService.listByCourseCodeAndPaperNumber(schoolId, courseCode, paperNumber);
         }
         if (examDetails != null && examDetails.size() > 0) {
-            long count = examDetails.stream().filter(m->!ExamDetailStatusEnum.NEW.name().equals(m.getStatus().name()) && !ExamDetailStatusEnum.READY.name().equals(m.getStatus().name())).count();
-            if(count > 0){
+            long count = examDetails.stream().filter(m -> !ExamDetailStatusEnum.NEW.name().equals(m.getStatus().name()) && !ExamDetailStatusEnum.READY.name().equals(m.getStatus().name())).count();
+            if (count > 0) {
                 throw ExceptionResultEnum.ERROR.exception("已有印刷任务进入打印状态，不能修改");
             }
         }

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

@@ -14,9 +14,9 @@ import com.qmth.distributed.print.business.enums.TaskResultEnum;
 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.distributed.print.common.SignatureEntityTest;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.SignatureEntityTest;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -16,8 +16,8 @@ import com.qmth.distributed.print.business.enums.MakeMethodEnum;
 import com.qmth.distributed.print.business.mapper.ExamCardMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
 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/ExamDetailServiceImpl.java

@@ -21,8 +21,8 @@ import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
 import com.qmth.distributed.print.business.util.ConvertUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.xssf.usermodel.*;

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

@@ -22,8 +22,8 @@ import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 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/ExamTaskDetailServiceImpl.java

@@ -16,8 +16,8 @@ import com.qmth.distributed.print.business.mapper.ExamTaskDetailMapper;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.templete.execute.AsyncCreatePdfTempleteService;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
 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/ExamTaskServiceImpl.java

@@ -1,6 +1,5 @@
 package com.qmth.distributed.print.business.service.impl;
 
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -21,10 +20,9 @@ import com.qmth.distributed.print.business.util.ConvertUtil;
 import com.qmth.distributed.print.business.util.ExcelUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.business.util.excel.ExcelError;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,8 +34,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -328,7 +324,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                 }
             }
             if (excelErrorTemp.size() > 0) {
-                List<String> errors = excelErrorTemp.stream().map(m-> m.getExcelErrorType()).collect(Collectors.toList());
+                List<String> errors = excelErrorTemp.stream().map(m -> m.getExcelErrorType()).collect(Collectors.toList());
                 throw ExceptionResultEnum.ERROR.exception(JSONObject.toJSONString(errors));
             }
             return finalExcelList;

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

@@ -8,8 +8,8 @@ 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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.entity.SysConfig;
 import com.qmth.distributed.print.business.mapper.SysConfigMapper;
 import com.qmth.distributed.print.business.service.SysConfigService;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 

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

@@ -12,10 +12,9 @@ import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
 import com.qmth.distributed.print.business.service.SysOrgService;
 import com.qmth.distributed.print.business.service.SysUserService;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -107,7 +106,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     @Override
     public boolean enable(SysOrg org) {
         // 禁用时，校验机构
-        if(!org.getEnable()){
+        if (!org.getEnable()) {
             validateOrg(org.getId());
         }
         UpdateWrapper<SysOrg> updateWrapper = new UpdateWrapper<>();
@@ -123,10 +122,10 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     }
 
 
-    private void validateOrg(Long id){
+    private void validateOrg(Long id) {
         // 机构下是否有用户
         List<SysUser> sysUsers = sysUserService.listByOrgId(id);
-        if(sysUsers != null && sysUsers.size() > 0){
+        if (sysUsers != null && sysUsers.size() > 0) {
             throw ExceptionResultEnum.ERROR.exception("该机构下有用户，不能删除");
         }
 
@@ -134,7 +133,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
         QueryWrapper<SysOrg> orgQueryWrapper = new QueryWrapper<>();
         orgQueryWrapper.lambda().eq(SysOrg::getParentId, id);
         List<SysOrg> sysOrgs = this.list(orgQueryWrapper);
-        if(sysOrgs != null && sysOrgs.size() > 0){
+        if (sysOrgs != null && sysOrgs.size() > 0) {
             throw ExceptionResultEnum.ERROR.exception("该机构下有子机构，不能删除");
         }
 

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

@@ -5,14 +5,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.PrivilegeDto;
 import com.qmth.distributed.print.business.entity.SysPrivilege;
 import com.qmth.distributed.print.business.entity.SysRolePrivilege;
-import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.enums.PrivilegePropertyEnum;
 import com.qmth.distributed.print.business.mapper.SysPrivilegeMapper;
 import com.qmth.distributed.print.business.service.SysPrivilegeService;
 import com.qmth.distributed.print.business.service.SysRolePrivilegeService;
-import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+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/SysRoleServiceImpl.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.entity.SysRole;
 import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.entity.SysUserRole;
-import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import com.qmth.distributed.print.business.mapper.SysRoleMapper;
 import com.qmth.distributed.print.business.service.CacheService;
 import com.qmth.distributed.print.business.service.SysRolePrivilegeService;
@@ -16,8 +15,8 @@ import com.qmth.distributed.print.business.service.SysRoleService;
 import com.qmth.distributed.print.business.service.SysUserRoleService;
 import com.qmth.distributed.print.business.util.ConvertUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -84,16 +83,16 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
             role.setUpdateTime(System.currentTimeMillis());
 
 //            if (RoleTypeEnum.CUSTOM.equals(role.getType())) {
-                //删除权限
-                sysRolePrivilegeService.removeByRoleId(role.getId());
+            //删除权限
+            sysRolePrivilegeService.removeByRoleId(role.getId());
 //            }
             isSuccess = this.updateById(role);
 
         }
 
 //        if (RoleTypeEnum.CUSTOM.equals(role.getType())) {
-            // 新增权限
-            sysRolePrivilegeService.saveBatch(role);
+        // 新增权限
+        sysRolePrivilegeService.saveBatch(role);
 //        }
 
         // 更新sys_user_role
@@ -157,12 +156,12 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
         try {
             Object object = ServletUtil.getRequestHeaderSchoolId();
             schoolId = Long.valueOf(object.toString());
-        } catch (Exception e){
+        } catch (Exception e) {
 
         }
         QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
         Long finalSchoolId = schoolId;
-        queryWrapper.lambda().eq(SysRole::getEnable, true).and(e->e.eq(SysRole::getSchoolId, finalSchoolId).or().isNull(SysRole::getSchoolId));
+        queryWrapper.lambda().eq(SysRole::getEnable, true).and(e -> e.eq(SysRole::getSchoolId, finalSchoolId).or().isNull(SysRole::getSchoolId));
         return this.list(queryWrapper);
     }
 }

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

@@ -18,8 +18,8 @@ import com.qmth.distributed.print.business.mapper.SysUserMapper;
 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.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;

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

@@ -7,8 +7,8 @@ import com.qmth.distributed.print.business.entity.TBSyncTask;
 import com.qmth.distributed.print.business.enums.TaskStatusEnum;
 import com.qmth.distributed.print.business.mapper.TBSyncTaskMapper;
 import com.qmth.distributed.print.business.service.TBSyncTaskService;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+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/TBTaskServiceImpl.java

@@ -2,7 +2,6 @@ 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;
@@ -22,10 +21,10 @@ 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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.JacksonUtil;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.JacksonUtil;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -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>
@@ -256,7 +254,7 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
         Map<String, Object> map = new HashMap<>();
         try {
             TBTask tbTask = saveTaskCommon(null, taskTypeEnum, map, sysUser);
-            if(Objects.nonNull(arraysParams)) {
+            if (Objects.nonNull(arraysParams)) {
                 tbTask.setRemark(JacksonUtil.parseJson(arraysParams.getIds()));
             }
             this.save(tbTask);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/create/AsyncCreateTaskTemplete.java

@@ -2,7 +2,7 @@ package com.qmth.distributed.print.business.templete.create;
 
 import com.qmth.distributed.print.business.templete.callback.CallbackCreatePdf;
 import com.qmth.distributed.print.business.templete.importData.AsyncImportTaskTemplete;
-import com.qmth.distributed.print.common.util.Result;
+import com.qmth.teachcloud.common.util.Result;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Async;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncCreatePdfTempleteService.java

@@ -9,18 +9,21 @@ import com.qmth.distributed.print.business.service.TBTaskService;
 import com.qmth.distributed.print.business.templete.callback.CallbackCreatePdf;
 import com.qmth.distributed.print.business.templete.create.AsyncCreateTaskTemplete;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
-import com.qmth.distributed.print.common.contant.SpringContextHolder;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.text.MessageFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.Map;
+import java.util.Objects;
+import java.util.StringJoiner;
 
 /**
  * @Description: 创建pdf模版

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncDownloadPdfTempleteService.java

@@ -8,10 +8,10 @@ import com.qmth.distributed.print.business.enums.TaskStatusEnum;
 import com.qmth.distributed.print.business.service.TBTaskService;
 import com.qmth.distributed.print.business.templete.export.AsyncExportTaskTemplete;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
-import com.qmth.distributed.print.common.contant.SpringContextHolder;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncExaminationExportTemplateService.java

@@ -9,10 +9,10 @@ import com.qmth.distributed.print.business.enums.TaskTypeEnum;
 import com.qmth.distributed.print.business.service.TBTaskService;
 import com.qmth.distributed.print.business.templete.export.AsyncExportTaskTemplete;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
-import com.qmth.distributed.print.common.contant.SpringContextHolder;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncExaminationImportTemplateService.java

@@ -11,11 +11,11 @@ import com.qmth.distributed.print.business.service.TBTaskService;
 import com.qmth.distributed.print.business.templete.callback.CallbackCreatePdf;
 import com.qmth.distributed.print.business.templete.importData.AsyncImportTaskTemplete;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
-import com.qmth.distributed.print.common.contant.SpringContextHolder;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import jdk.internal.dynalink.linker.LinkerServices;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncPaperReviewPdfExportService.java

@@ -2,17 +2,16 @@ package com.qmth.distributed.print.business.templete.execute;
 
 import cn.hutool.core.date.DateUtil;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.distributed.print.business.entity.ExamTask;
 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.service.TBTaskService;
 import com.qmth.distributed.print.business.templete.export.AsyncExportTaskTemplete;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
-import com.qmth.distributed.print.common.contant.SpringContextHolder;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -20,7 +19,6 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.text.MessageFormat;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.StringJoiner;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncTaskReviewSampleExportService.java

@@ -5,14 +5,13 @@ import com.qmth.boot.api.exception.ApiException;
 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.distributed.print.business.service.TBTaskService;
 import com.qmth.distributed.print.business.templete.export.AsyncExportTaskTemplete;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
-import com.qmth.distributed.print.common.contant.SpringContextHolder;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/export/AsyncExportTaskTemplete.java

@@ -10,11 +10,11 @@ import com.qmth.distributed.print.business.enums.UploadFileEnum;
 import com.qmth.distributed.print.business.service.TBTaskService;
 import com.qmth.distributed.print.business.templete.importData.AsyncImportTaskTemplete;
 import com.qmth.distributed.print.business.util.OssUtil;
-import com.qmth.distributed.print.common.contant.SpringContextHolder;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/export/SyncExportTaskTemplete.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.templete.export;
 
-import com.qmth.distributed.print.common.util.Result;
+import com.qmth.teachcloud.common.util.Result;
 
 import java.util.Map;
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/importData/AsyncImportTaskTemplete.java

@@ -10,10 +10,10 @@ import com.qmth.distributed.print.business.enums.TaskTypeEnum;
 import com.qmth.distributed.print.business.enums.UploadFileEnum;
 import com.qmth.distributed.print.business.service.TBTaskService;
 import com.qmth.distributed.print.business.util.OssUtil;
-import com.qmth.distributed.print.common.contant.SpringContextHolder;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,7 +27,6 @@ import java.util.Date;
 import java.util.Map;
 import java.util.Objects;
 import java.util.StringJoiner;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * @Description: 异步导入模版

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/importData/SyncImportTaskTemplete.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.templete.importData;
 
-import com.qmth.distributed.print.common.util.Result;
+import com.qmth.teachcloud.common.util.Result;
 
 import java.io.IOException;
 import java.util.Map;

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

@@ -20,11 +20,11 @@ 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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.FileUtil;
-import com.qmth.distributed.print.common.util.HexUtils;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.FileUtil;
+import com.qmth.teachcloud.common.util.HexUtils;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;

distributed-print-business/src/main/java/com/qmth/distributed/print/business/threadPool/MyThreadPool.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.threadPool;//package com.qmth.themis.business.threadPool;
 
-import com.qmth.distributed.print.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;

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

@@ -9,10 +9,10 @@ import com.qmth.distributed.print.business.entity.TBSession;
 import com.qmth.distributed.print.business.enums.PrivilegePropertyEnum;
 import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import com.qmth.distributed.print.business.service.CacheService;
-import com.qmth.distributed.print.common.SignatureEntityTest;
-import com.qmth.distributed.print.common.contant.SpringContextHolder;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.SignatureEntityTest;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

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

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.util;
 
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;

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

@@ -16,8 +16,8 @@ import com.qmth.distributed.print.business.enums.*;
 import com.qmth.distributed.print.business.service.BasicAttachmentService;
 import com.qmth.distributed.print.business.service.CommonService;
 import com.qmth.distributed.print.business.service.ExamDetailService;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

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

@@ -4,8 +4,8 @@ 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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;

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

@@ -8,8 +8,8 @@ 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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import org.apache.commons.codec.digest.DigestUtils;

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

@@ -2,7 +2,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.distributed.print.common.contant.SpringContextHolder;
+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/HttpKit.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.util;
 
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 
 import java.io.*;
 import java.net.HttpURLConnection;

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

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.util;
 
-import com.qmth.distributed.print.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;

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

@@ -4,7 +4,7 @@ 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.distributed.print.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 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/PdfUtil.java

@@ -5,8 +5,8 @@ import com.itextpdf.text.pdf.*;
 import com.qmth.distributed.print.business.bean.dto.PdfDto;
 import com.qmth.distributed.print.business.enums.PageSizeEnum;
 import com.qmth.distributed.print.business.enums.UploadFileEnum;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.util.JacksonUtil;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.util.JacksonUtil;
 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/RedisUtil.java

@@ -1,6 +1,6 @@
 package com.qmth.distributed.print.business.util;
 
-import com.qmth.distributed.print.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 

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

@@ -2,10 +2,10 @@ package com.qmth.distributed.print.business.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.core.enums.Platform;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -148,6 +148,7 @@ public class ServletUtil {
 
     /**
      * 获取header中schoolId
+     *
      * @return
      */
     public static Object getRequestHeaderSchoolId() {
@@ -160,6 +161,7 @@ public class ServletUtil {
 
     /**
      * 获取header中schoolId
+     *
      * @return
      */
     public static Object getRequestHeaderSchoolIdByNotVaild() {

distributed-print/pom.xml

@@ -15,8 +15,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.qmth.distributed.print.task</groupId>
-            <artifactId>distributed-print-task</artifactId>
+            <groupId>com.qmth.teachcloud.task</groupId>
+            <artifactId>teachcloud-task</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -1,13 +1,10 @@
 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.entity.BasicAttachment;
 import com.qmth.distributed.print.business.service.BasicAttachmentService;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +31,7 @@ public class BasicAttachmentController {
 
     /**
      * 文件查询
+     *
      * @return
      */
     @ApiOperation(value = "文件查询")

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

@@ -1,15 +1,12 @@
 package com.qmth.distributed.print.api;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.dto.CardRuleDto;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
 import com.qmth.distributed.print.business.service.BasicCardRuleService;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,16 +1,13 @@
 package com.qmth.distributed.print.api;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.entity.BasicCourse;
 import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.service.BasicCourseService;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +33,7 @@ public class BasicCourseController {
 
     /**
      * 查询
+     *
      * @param code
      * @param name
      * @param pageNumber
@@ -47,47 +45,50 @@ public class BasicCourseController {
     public Result list(@RequestParam(value = "code", required = false) String code,
                        @RequestParam(value = "name", required = false) String name,
                        @RequestParam Integer pageNumber,
-                       @RequestParam Integer pageSize){
+                       @RequestParam Integer pageSize) {
         IPage<BasicCourse> userDtos = basicCourseService.list(code, name, pageNumber, pageSize);
         return ResultUtil.ok(userDtos);
     }
 
     /**
      * 模糊查询
+     *
      * @param param
      * @return
      */
     @ApiOperation(value = "模糊查询")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
     public Result query(@RequestParam(value = "param", required = false) String param,
-                        @RequestParam(value = "printPlanId", required = false) Long printPlanId){
+                        @RequestParam(value = "printPlanId", required = false) Long printPlanId) {
         List<BasicCourse> userDtos = basicCourseService.list(param, printPlanId);
         return ResultUtil.ok(userDtos);
     }
 
     /**
      * 新增/修改
+     *
      * @param course
      * @return
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(@RequestBody BasicCourse course){
+    public Result save(@RequestBody BasicCourse course) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         course.setSchoolId(schoolId);
-        boolean isSuccess = basicCourseService.saveCourse(course,sysUser.getId());
+        boolean isSuccess = basicCourseService.saveCourse(course, sysUser.getId());
         return ResultUtil.ok(isSuccess);
     }
 
     /**
      * 删除
+     *
      * @param course
      * @return
      */
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public Result remove(@RequestBody BasicCourse course){
+    public Result remove(@RequestBody BasicCourse course) {
         boolean isSuccess = basicCourseService.remove(course.getId());
         return ResultUtil.ok(isSuccess);
     }

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

@@ -1,13 +1,10 @@
 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.entity.BasicExamRule;
 import com.qmth.distributed.print.business.service.BasicExamRuleService;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,21 +1,16 @@
 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.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
 
 /**
@@ -36,6 +31,7 @@ public class BasicSchoolController {
 
     /**
      * 学校查询
+     *
      * @return
      */
     @ApiOperation(value = "查询")

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

@@ -1,15 +1,12 @@
 package com.qmth.distributed.print.api;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.dto.TemplateDto;
 import com.qmth.distributed.print.business.entity.BasicTemplate;
 import com.qmth.distributed.print.business.service.BasicTemplateService;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +42,7 @@ public class BasicTemplateController {
      */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(@RequestParam(value = "enable",required = false) Boolean enable,
+    public Result list(@RequestParam(value = "enable", required = false) Boolean enable,
                        @RequestParam(value = "type", required = false) String type,
                        @RequestParam(value = "name", required = false) String name,
                        @RequestParam(value = "startTime", required = false) Long startTime,
@@ -59,12 +56,13 @@ public class BasicTemplateController {
 
     /**
      * 根据ID查询单个信息
+     *
      * @param id
      * @return
      */
     @ApiOperation(value = "根据ID查询单个信息")
     @RequestMapping(value = "/get_one", method = RequestMethod.POST)
-    public Result getOne(@RequestParam("id") Long id){
+    public Result getOne(@RequestParam("id") Long id) {
         BasicTemplate basicTemplate = basicTemplateService.getOne(id);
         return ResultUtil.ok(basicTemplate);
     }

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;
@@ -17,9 +16,9 @@ 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.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
@@ -439,6 +438,7 @@ public class ClientController {
 
     /**
      * 统计查询-查询列表
+     *
      * @param orgId
      * @param printPlanId
      * @param examPlace
@@ -467,6 +467,7 @@ public class ClientController {
 
     /**
      * 统计查询-汇总数据查询
+     *
      * @param orgId
      * @param printPlanId
      * @param examPlace

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

@@ -1,13 +1,11 @@
 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.enums.*;
 import com.qmth.distributed.print.business.enums.result.EnumResult;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -1,9 +1,6 @@
 package com.qmth.distributed.print.api;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.dto.CardCustDto;
 import com.qmth.distributed.print.business.bean.dto.CardDetailDto;
@@ -11,8 +8,8 @@ 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.distributed.print.business.service.ExamCardService;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -126,6 +123,7 @@ public class ExamCardController {
 
     /**
      * 批量下载客服制卡文件
+     *
      * @param response
      * @param arraysParams
      */

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

@@ -1,6 +1,5 @@
 package com.qmth.distributed.print.api;
 
-
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.TBTask;
@@ -12,11 +11,10 @@ import com.qmth.distributed.print.business.service.TBTaskService;
 import com.qmth.distributed.print.business.templete.execute.AsyncExaminationExportTemplateService;
 import com.qmth.distributed.print.business.templete.execute.AsyncExaminationImportTemplateService;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -80,7 +78,7 @@ public class ExamDetailController {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = commonService.listSubOrgIds(null);
         return ResultUtil.ok(examDetailService.findExaminationBriefPage(schoolId,
-                SystemConstant.convertIdToLong(printPlanId), courseCode, paperNumber, examPlace, examRoom, packageCode, pageNumber, pageSize,orgIds));
+                SystemConstant.convertIdToLong(printPlanId), courseCode, paperNumber, examPlace, examRoom, packageCode, pageNumber, pageSize, orgIds));
     }
 
     @ApiOperation(value = "考务数据导入-汇总数据查询")
@@ -96,7 +94,7 @@ public class ExamDetailController {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Set<Long> orgIds = commonService.listSubOrgIds(null);
         return ResultUtil.ok(examDetailService.findSummarizedData(schoolId,
-                SystemConstant.convertIdToLong(printPlanId), courseCode, paperNumber, examPlace, examRoom, packageCode,orgIds));
+                SystemConstant.convertIdToLong(printPlanId), courseCode, paperNumber, examPlace, examRoom, packageCode, orgIds));
     }
 
     @ApiOperation(value = "考务数据导入-查看明细")
@@ -112,7 +110,7 @@ public class ExamDetailController {
                                         @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
 
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        return ResultUtil.ok(examDetailService.findExaminationDetail(schoolId,SystemConstant.convertIdToLong(printPlanId),
+        return ResultUtil.ok(examDetailService.findExaminationDetail(schoolId, SystemConstant.convertIdToLong(printPlanId),
                 courseCode, paperNumber, examPlace, examRoom, studentParams, pageNumber, pageSize));
     }
 
@@ -128,11 +126,11 @@ public class ExamDetailController {
     @ApiOperation(value = "考务数据导入-查看明细弹窗")
     @RequestMapping(value = "/data_detail_list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
-    public Result findExaminationDetailById(@ApiParam(value = "考务场次id",required = true) @RequestParam String examDetailId,
-                                        @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                        @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+    public Result findExaminationDetailById(@ApiParam(value = "考务场次id", required = true) @RequestParam String examDetailId,
+                                            @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
+                                            @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
 
-        return ResultUtil.ok(examDetailService.findExaminationDetail(SystemConstant.convertIdToLong(examDetailId),pageNumber,pageSize));
+        return ResultUtil.ok(examDetailService.findExaminationDetail(SystemConstant.convertIdToLong(examDetailId), pageNumber, pageSize));
     }
 
     @ApiOperation(value = "考务数据导入-考点模糊查询")
@@ -163,20 +161,20 @@ public class ExamDetailController {
     @RequestMapping(value = "/data_export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
     public Result dataExport(@ApiParam(value = "印刷计划id") @RequestParam(required = false) String printPlanId,
-                           @ApiParam(value = "课程代码") @RequestParam(required = false) String courseCode,
-                           @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
-                           @ApiParam(value = "考点") @RequestParam(required = false) String examPlace,
-                           @ApiParam(value = "考场") @RequestParam(required = false) String examRoom,
-                           @ApiParam(value = "卷袋号") @RequestParam(required = false) String packageCode) {
+                             @ApiParam(value = "课程代码") @RequestParam(required = false) String courseCode,
+                             @ApiParam(value = "试卷编号") @RequestParam(required = false) String paperNumber,
+                             @ApiParam(value = "考点") @RequestParam(required = false) String examPlace,
+                             @ApiParam(value = "考场") @RequestParam(required = false) String examRoom,
+                             @ApiParam(value = "卷袋号") @RequestParam(required = false) String packageCode) {
         Set<Long> orgIds = commonService.listSubOrgIds(null);
-        Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.EXAMINATION_EXPORT,SystemConstant.convertIdToLong(printPlanId));
-        map.put("printPlanId",printPlanId);
-        map.put("courseCode",courseCode);
-        map.put("paperNumber",paperNumber);
-        map.put("examPlace",examPlace);
-        map.put("examRoom",examRoom);
-        map.put("packageCode",packageCode);
-        map.put("orgIds",orgIds);
+        Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.EXAMINATION_EXPORT, SystemConstant.convertIdToLong(printPlanId));
+        map.put("printPlanId", printPlanId);
+        map.put("courseCode", courseCode);
+        map.put("paperNumber", paperNumber);
+        map.put("examPlace", examPlace);
+        map.put("examRoom", examRoom);
+        map.put("packageCode", packageCode);
+        map.put("orgIds", orgIds);
         asyncExaminationExportTemplateService
                 .exportTask(map);
         TBTask tbTask = Objects.nonNull(map.get(SystemConstant.TASK)) ? (TBTask) map.get(SystemConstant.TASK) : null;

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

@@ -1,9 +1,6 @@
 package com.qmth.distributed.print.api;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskDetailDto;
 import com.qmth.distributed.print.business.bean.dto.PrintTaskDto;
@@ -23,10 +20,10 @@ import com.qmth.distributed.print.business.enums.TaskTypeEnum;
 import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.templete.execute.AsyncDownloadPdfTempleteService;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;

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

@@ -1,6 +1,5 @@
 package com.qmth.distributed.print.api;
 
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.annotation.Aac;
@@ -16,10 +15,10 @@ import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.templete.execute.AsyncPaperReviewPdfExportService;
 import com.qmth.distributed.print.business.templete.execute.AsyncTaskReviewSampleExportService;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,13 +1,12 @@
 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.entity.SysConfig;
 import com.qmth.distributed.print.business.service.SysConfigService;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -18,10 +18,10 @@ 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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

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

@@ -1,6 +1,5 @@
 package com.qmth.distributed.print.api;
 
-
 import com.itextpdf.text.log.SysoCounter;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
@@ -8,8 +7,8 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.dto.OrgDto;
 import com.qmth.distributed.print.business.entity.SysOrg;
 import com.qmth.distributed.print.business.service.SysOrgService;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,19 +1,15 @@
 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.PrivilegeDto;
 import com.qmth.distributed.print.business.entity.SysPrivilege;
 import com.qmth.distributed.print.business.service.SysPrivilegeService;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 /**
@@ -64,9 +60,9 @@ public class SysPrivilegeController {
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save( @RequestBody SysPrivilege privilege) {
+    public Result save(@RequestBody SysPrivilege privilege) {
         String id = sysPrivilegeService.savePrivilege(privilege);
-        return ResultUtil.ok(id,"");
+        return ResultUtil.ok(id, "");
     }
 
     /**

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

@@ -1,19 +1,15 @@
 package com.qmth.distributed.print.api;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.entity.SysRole;
 import com.qmth.distributed.print.business.service.SysRoleService;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 /**
@@ -53,6 +49,7 @@ public class SysRoleController {
 
     /**
      * 新增用户时查询角色方法
+     *
      * @return
      */
     @ApiOperation(value = "新增用户时查询角色方法")

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

@@ -1,16 +1,14 @@
 package com.qmth.distributed.print.api;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.dto.BlurryUserDto;
 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.distributed.print.business.service.SysUserService;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

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

@@ -15,9 +15,9 @@ import com.qmth.distributed.print.business.enums.TaskTypeEnum;
 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.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.*;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

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

@@ -1,18 +1,15 @@
 package com.qmth.distributed.print.api;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.boot.core.enums.Platform;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.util.Result;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -53,7 +50,7 @@ public class WorkController {
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
     public Result examTaskReadyCount() {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examTaskService.queryUserByMyWork(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.READY.name(),  ExamStatusEnum.STAGE.name()).getRecords().size());
+        return ResultUtil.ok(examTaskService.queryUserByMyWork(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.READY.name(), ExamStatusEnum.STAGE.name()).getRecords().size());
     }
 
     @ApiOperation(value = "命题分配待办接口")

distributed-print/src/main/java/com/qmth/distributed/print/aspect/ApiControllerAspect.java

@@ -2,8 +2,8 @@ package com.qmth.distributed.print.aspect;
 
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.util.JacksonUtil;
-import com.qmth.distributed.print.common.util.ResultUtil;
+import com.qmth.teachcloud.common.util.JacksonUtil;
+import com.qmth.teachcloud.common.util.ResultUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;

distributed-print/src/main/java/com/qmth/distributed/print/auth/DistributedPrintAuthenticationService.java

@@ -11,8 +11,8 @@ import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import com.qmth.distributed.print.business.service.CacheService;
 import com.qmth.distributed.print.business.service.TBSessionService;
 import com.qmth.distributed.print.business.util.ServletUtil;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

distributed-print/src/main/java/com/qmth/distributed/print/auth/DistributedPrintSession.java

@@ -4,7 +4,7 @@ import com.qmth.boot.core.security.model.AccessEntity;
 import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.distributed.print.business.entity.TBSession;
 import com.qmth.distributed.print.business.util.RedisUtil;
-import com.qmth.distributed.print.common.contant.SpringContextHolder;
+import com.qmth.teachcloud.common.contant.SpringContextHolder;
 
 import java.util.Collection;
 

distributed-print/src/main/java/com/qmth/distributed/print/config/SwaggerConfig.java

@@ -1,7 +1,7 @@
 package com.qmth.distributed.print.config;
 
 import com.google.common.base.Predicates;
-import com.qmth.distributed.print.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ParameterBuilder;

distributed-print/src/main/java/com/qmth/distributed/print/start/StartRunning.java

@@ -2,10 +2,13 @@ package com.qmth.distributed.print.start;
 
 import com.qmth.distributed.print.business.service.OrgCenterDataDisposeService;
 import com.qmth.distributed.print.business.service.TBTaskService;
-import com.qmth.distributed.print.common.contant.SystemConstant;
-import com.qmth.distributed.print.task.enums.JobEnum;
-import com.qmth.distributed.print.task.job.*;
-import com.qmth.distributed.print.task.service.QuartzService;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.task.enums.JobEnum;
+import com.qmth.teachcloud.task.job.ResendSmsJob;
+import com.qmth.teachcloud.task.job.SendSmsExpireJob;
+import com.qmth.teachcloud.task.job.SendSmsOverdueJob;
+import com.qmth.teachcloud.task.job.TimedSyncSchoolJob;
+import com.qmth.teachcloud.task.service.QuartzService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.CommandLineRunner;

distributed-print/src/test/java/com/qmth/distributed/print/BasicDataImportTest.java

@@ -1,23 +1,20 @@
 package com.qmth.distributed.print;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.itextpdf.text.log.SysoCounter;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import com.qmth.distributed.print.business.service.*;
-import com.qmth.distributed.print.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.xmlbeans.impl.schema.SchemaTypeSystemCompiler;
 import org.junit.Test;
 import org.junit.platform.commons.util.StringUtils;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -110,7 +107,7 @@ public class BasicDataImportTest {
             QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
             userQueryWrapper.lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getLoginName, loginName);
             SysUser sysUser = sysUserService.getOne(userQueryWrapper);
-            if(sysUser == null){
+            if (sysUser == null) {
                 sysUser = new SysUser();
                 sysUser.setId(SystemConstant.getDbUuid());
                 sysUser.setSchoolId(schoolId);
@@ -147,8 +144,8 @@ public class BasicDataImportTest {
 
             // sys_user_course
             String courseCodeses = userMap.get("courseCode");
-            if(roleType.equals(RoleTypeEnum.QUESTION_TEACHER.name())){
-                if(StringUtils.isBlank(courseCodeses)){
+            if (roleType.equals(RoleTypeEnum.QUESTION_TEACHER.name())) {
+                if (StringUtils.isBlank(courseCodeses)) {
                     throw new Exception("命题老师课程不能为空");
                 }
 
@@ -159,7 +156,7 @@ public class BasicDataImportTest {
                     QueryWrapper<BasicCourse> basicCourseQueryWrapper = new QueryWrapper<>();
                     basicCourseQueryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId).eq(BasicCourse::getCode, coursees[0]);
                     BasicCourse basicCourse = basicCourseService.getOne(basicCourseQueryWrapper);
-                    if(basicCourse == null){
+                    if (basicCourse == null) {
                         throw new Exception("命题老师对应课程不存在");
                     }
                     BasicUserCourse basicUserCourse = new BasicUserCourse();

distributed-print/src/test/java/com/qmth/distributed/print/BasicUserImportTest.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import com.qmth.distributed.print.business.service.*;
-import com.qmth.distributed.print.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -109,7 +109,7 @@ public class BasicUserImportTest {
             QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
             userQueryWrapper.lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getLoginName, loginName);
             SysUser sysUser = sysUserService.getOne(userQueryWrapper);
-            if(sysUser == null){
+            if (sysUser == null) {
                 sysUser = new SysUser();
                 sysUser.setId(SystemConstant.getDbUuid());
                 sysUser.setSchoolId(schoolId);
@@ -158,8 +158,8 @@ public class BasicUserImportTest {
 
             // sys_user_course
             String courseCodeses = userMap.get("courseCode");
-            if(roleType.equals(RoleTypeEnum.QUESTION_TEACHER.name())){
-                if(StringUtils.isBlank(courseCodeses)){
+            if (roleType.equals(RoleTypeEnum.QUESTION_TEACHER.name())) {
+                if (StringUtils.isBlank(courseCodeses)) {
                     throw new Exception("命题老师课程不能为空");
                 }
 
@@ -170,8 +170,8 @@ public class BasicUserImportTest {
                     QueryWrapper<BasicCourse> basicCourseQueryWrapper = new QueryWrapper<>();
                     basicCourseQueryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId).eq(BasicCourse::getCode, coursees[0]);
                     BasicCourse basicCourse = basicCourseService.getOne(basicCourseQueryWrapper);
-                    if(basicCourse == null){
-                        throw new Exception("命题老师对应课程不存在,"+ coursees[0]);
+                    if (basicCourse == null) {
+                        throw new Exception("命题老师对应课程不存在," + coursees[0]);
                     }
                     BasicUserCourse basicUserCourse = new BasicUserCourse();
                     basicUserCourse.setId(SystemConstant.getDbUuid());

pom.xml

@@ -10,9 +10,11 @@
     <modules>
         <module>distributed-print</module>
         <module>distributed-print-business</module>
-        <module>distributed-print-common</module>
-        <module>distributed-print-task</module>
+        <module>teachcloud-common</module>
+        <module>teachcloud-task</module>
         <module>teachcloud-report</module>
+        <module>teachcloud-common-business</module>
+        <module>teachcloud-report-business</module>
     </modules>
 
     <properties>
@@ -54,8 +56,8 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.qmth.distributed.print.common</groupId>
-                <artifactId>distributed-print-common</artifactId>
+                <groupId>com.qmth.teachcloud.common</groupId>
+                <artifactId>teachcloud-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -64,8 +66,8 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>com.qmth.distributed.print.task</groupId>
-                <artifactId>distributed-print-task</artifactId>
+                <groupId>com.qmth.teachcloud.task</groupId>
+                <artifactId>teachcloud-task</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

teachcloud-common-business/pom.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.5.0</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+	<groupId>com.qmth.teachcloud.common.business</groupId>
+	<artifactId>teachcloud-common-business</artifactId>
+	<version>1.0.0-SNAPSHOT</version>
+	<name>teachcloud-common-business</name>
+	<description>teachcloud-common-business</description>
+	<properties>
+		<java.version>1.8</java.version>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

teachcloud-common-business/src/main/java/com/qmth/teachcloud/common/business/TeachcloudCommonBusinessApplication.java

@@ -0,0 +1,13 @@
+package com.qmth.teachcloud.common.business;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class TeachcloudCommonBusinessApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(TeachcloudCommonBusinessApplication.class, args);
+	}
+
+}

teachcloud-common-business/src/main/resources/application.properties

@@ -0,0 +1 @@
+

teachcloud-common-business/src/test/java/com/qmth/teachcloud/common/business/TeachcloudCommonBusinessApplicationTests.java

@@ -0,0 +1,13 @@
+package com.qmth.teachcloud.common.business;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class TeachcloudCommonBusinessApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}

distributed-print-common/pom.xml → teachcloud-common/pom.xml

@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.qmth.distributed.print.common</groupId>
-    <artifactId>distributed-print-common</artifactId>
+    <groupId>com.qmth.teachcloud.common</groupId>
+    <artifactId>teachcloud-common</artifactId>
     <version>2.0.0</version>
     <packaging>jar</packaging>
 

distributed-print-common/src/main/java/com/qmth/distributed/print/common/SignatureEntityTest.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/SignatureEntityTest.java

@@ -1,8 +1,8 @@
-package com.qmth.distributed.print.common;
+package com.qmth.teachcloud.common;
 
 import com.qmth.boot.tools.signature.SignatureType;
-import com.qmth.distributed.print.common.util.Base64Util;
-import com.qmth.distributed.print.common.util.ShaUtils;
+import com.qmth.teachcloud.common.util.Base64Util;
+import com.qmth.teachcloud.common.util.ShaUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.text.MessageFormat;

distributed-print-common/src/main/java/com/qmth/distributed/print/common/contant/SpringContextHolder.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SpringContextHolder.java

@@ -1,6 +1,6 @@
-package com.qmth.distributed.print.common.contant;
+package com.qmth.teachcloud.common.contant;
 
-import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;