Selaa lähdekoodia

update imports

deason 9 kuukautta sitten
vanhempi
commit
32c584de3b
100 muutettua tiedostoa jossa 412 lisäystä ja 693 poistoa
  1. 3 4
      src/main/java/cn/com/qmth/scancentral/bean/AnswerQueryDomain.java
  2. 3 4
      src/main/java/cn/com/qmth/scancentral/bean/AssignedQueryDomain.java
  3. 2 2
      src/main/java/cn/com/qmth/scancentral/bean/OmrTaskDto.java
  4. 2 2
      src/main/java/cn/com/qmth/scancentral/bean/OmrTaskPageDto.java
  5. 2 2
      src/main/java/cn/com/qmth/scancentral/bean/ScannerLoginInfo.java
  6. 1 2
      src/main/java/cn/com/qmth/scancentral/bean/SubjectConfigDomain.java
  7. 1 2
      src/main/java/cn/com/qmth/scancentral/bean/User.java
  8. 1 2
      src/main/java/cn/com/qmth/scancentral/bean/answersave/AnswerDomain.java
  9. 2 2
      src/main/java/cn/com/qmth/scancentral/bean/answersave/ArrayResult.java
  10. 6 7
      src/main/java/cn/com/qmth/scancentral/bean/card/CardFile.java
  11. 1 2
      src/main/java/cn/com/qmth/scancentral/bean/omredit/OmrEditDomain.java
  12. 1 2
      src/main/java/cn/com/qmth/scancentral/bean/papermigrate/PaperMigrateDomain.java
  13. 3 4
      src/main/java/cn/com/qmth/scancentral/bean/papermigrate/PaperMigratePage.java
  14. 1 2
      src/main/java/cn/com/qmth/scancentral/bean/refix/AnswerRefixDomain.java
  15. 4 5
      src/main/java/cn/com/qmth/scancentral/bean/refix/PageRefixDomain.java
  16. 4 6
      src/main/java/cn/com/qmth/scancentral/config/FillMetaObjectHandler.java
  17. 7 8
      src/main/java/cn/com/qmth/scancentral/config/InitData.java
  18. 1 2
      src/main/java/cn/com/qmth/scancentral/dao/AdapteFileDao.java
  19. 1 2
      src/main/java/cn/com/qmth/scancentral/dao/AnswerCardDao.java
  20. 4 6
      src/main/java/cn/com/qmth/scancentral/dao/AnswerCardSubjectDao.java
  21. 2 4
      src/main/java/cn/com/qmth/scancentral/dao/BatchPaperDao.java
  22. 3 5
      src/main/java/cn/com/qmth/scancentral/dao/ExamDao.java
  23. 1 2
      src/main/java/cn/com/qmth/scancentral/dao/FilePropertyDao.java
  24. 2 4
      src/main/java/cn/com/qmth/scancentral/dao/OmrGroupDao.java
  25. 4 6
      src/main/java/cn/com/qmth/scancentral/dao/OmrTaskDao.java
  26. 1 2
      src/main/java/cn/com/qmth/scancentral/dao/PackageCardDao.java
  27. 1 2
      src/main/java/cn/com/qmth/scancentral/dao/PackageResultDao.java
  28. 1 2
      src/main/java/cn/com/qmth/scancentral/dao/PackageTaskDao.java
  29. 4 6
      src/main/java/cn/com/qmth/scancentral/dao/PaperPageDao.java
  30. 1 2
      src/main/java/cn/com/qmth/scancentral/dao/PaperStructureDao.java
  31. 1 2
      src/main/java/cn/com/qmth/scancentral/dao/QuestionDao.java
  32. 1 2
      src/main/java/cn/com/qmth/scancentral/dao/ScannerCardDao.java
  33. 4 6
      src/main/java/cn/com/qmth/scancentral/dao/ScannerDao.java
  34. 7 19
      src/main/java/cn/com/qmth/scancentral/dao/StudentDao.java
  35. 4 6
      src/main/java/cn/com/qmth/scancentral/dao/StudentPaperDao.java
  36. 1 2
      src/main/java/cn/com/qmth/scancentral/dao/SubjectDao.java
  37. 1 2
      src/main/java/cn/com/qmth/scancentral/dao/SystemConfigDao.java
  38. 1 2
      src/main/java/cn/com/qmth/scancentral/dao/UserDao.java
  39. 2 3
      src/main/java/cn/com/qmth/scancentral/entity/AnswerCardEntity.java
  40. 1 2
      src/main/java/cn/com/qmth/scancentral/entity/AnswerCardSubjectEntity.java
  41. 1 2
      src/main/java/cn/com/qmth/scancentral/entity/BatchEntity.java
  42. 1 2
      src/main/java/cn/com/qmth/scancentral/entity/ExamSummaryEntity.java
  43. 1 2
      src/main/java/cn/com/qmth/scancentral/entity/FilePropertyEntity.java
  44. 4 5
      src/main/java/cn/com/qmth/scancentral/entity/OmrTaskEntity.java
  45. 0 1
      src/main/java/cn/com/qmth/scancentral/entity/PackageCardEntity.java
  46. 2 3
      src/main/java/cn/com/qmth/scancentral/entity/PackageResultEntity.java
  47. 0 1
      src/main/java/cn/com/qmth/scancentral/entity/PackageTaskEntity.java
  48. 1 2
      src/main/java/cn/com/qmth/scancentral/entity/PaperStructureEntity.java
  49. 1 2
      src/main/java/cn/com/qmth/scancentral/entity/QuestionEntity.java
  50. 4 5
      src/main/java/cn/com/qmth/scancentral/entity/RefixBatchEntity.java
  51. 1 2
      src/main/java/cn/com/qmth/scancentral/entity/ScannerCardEntity.java
  52. 1 2
      src/main/java/cn/com/qmth/scancentral/entity/ScannerEntity.java
  53. 1 2
      src/main/java/cn/com/qmth/scancentral/entity/StudentEntity.java
  54. 1 2
      src/main/java/cn/com/qmth/scancentral/entity/StudentPaperEntity.java
  55. 2 3
      src/main/java/cn/com/qmth/scancentral/entity/SubjectEntity.java
  56. 1 2
      src/main/java/cn/com/qmth/scancentral/entity/UserEntity.java
  57. 2 2
      src/main/java/cn/com/qmth/scancentral/entity/base/BaseEntity.java
  58. 9 10
      src/main/java/cn/com/qmth/scancentral/handle/ListTypeHandler.java
  59. 2 3
      src/main/java/cn/com/qmth/scancentral/handle/OmrTaskPageListTypeHandler.java
  60. 2 3
      src/main/java/cn/com/qmth/scancentral/handle/QueryConditionListTypeHandler.java
  61. 2 2
      src/main/java/cn/com/qmth/scancentral/model/AnswerCardInfo.java
  62. 2 2
      src/main/java/cn/com/qmth/scancentral/model/QueryCondition.java
  63. 14 16
      src/main/java/cn/com/qmth/scancentral/service/impl/AdapteFileServiceImpl.java
  64. 19 33
      src/main/java/cn/com/qmth/scancentral/service/impl/AnswerCardServiceImpl.java
  65. 11 13
      src/main/java/cn/com/qmth/scancentral/service/impl/AuthServiceImpl.java
  66. 23 64
      src/main/java/cn/com/qmth/scancentral/service/impl/BatchServiceImpl.java
  67. 18 20
      src/main/java/cn/com/qmth/scancentral/service/impl/OmrGroupServiceImpl.java
  68. 21 47
      src/main/java/cn/com/qmth/scancentral/service/impl/OmrTaskServiceImpl.java
  69. 4 6
      src/main/java/cn/com/qmth/scancentral/service/impl/PackageCardServiceImpl.java
  70. 4 6
      src/main/java/cn/com/qmth/scancentral/service/impl/PackageTaskServiceImpl.java
  71. 8 11
      src/main/java/cn/com/qmth/scancentral/service/impl/PaperPageServiceImpl.java
  72. 25 28
      src/main/java/cn/com/qmth/scancentral/service/impl/PaperServiceImpl.java
  73. 8 13
      src/main/java/cn/com/qmth/scancentral/service/impl/PictureCopyServiceImpl.java
  74. 10 12
      src/main/java/cn/com/qmth/scancentral/service/impl/ScannerServiceImpl.java
  75. 35 105
      src/main/java/cn/com/qmth/scancentral/service/impl/StudentServiceImpl.java
  76. 8 15
      src/main/java/cn/com/qmth/scancentral/service/impl/SubjectServiceImpl.java
  77. 9 14
      src/main/java/cn/com/qmth/scancentral/service/impl/UploadServiceImpl.java
  78. 14 16
      src/main/java/cn/com/qmth/scancentral/service/impl/UserServiceImpl.java
  79. 2 2
      src/main/java/cn/com/qmth/scancentral/util/BatchGetDataUtil.java
  80. 2 2
      src/main/java/cn/com/qmth/scancentral/util/DateUtil.java
  81. 2 4
      src/main/java/cn/com/qmth/scancentral/util/ExamStatusConvertor.java
  82. 2 10
      src/main/java/cn/com/qmth/scancentral/util/FileUtil.java
  83. 3 4
      src/main/java/cn/com/qmth/scancentral/util/MD5Util.java
  84. 3 3
      src/main/java/cn/com/qmth/scancentral/util/PageUtil.java
  85. 2 4
      src/main/java/cn/com/qmth/scancentral/util/ScanStatusConvertor.java
  86. 3 4
      src/main/java/cn/com/qmth/scancentral/util/ServletUtil.java
  87. 3 4
      src/main/java/cn/com/qmth/scancentral/util/ThreadLocalUtil.java
  88. 2 2
      src/main/java/cn/com/qmth/scancentral/vo/AnswerCardVo.java
  89. 1 2
      src/main/java/cn/com/qmth/scancentral/vo/AnswerExportK12Vo.java
  90. 1 2
      src/main/java/cn/com/qmth/scancentral/vo/AnswerExportVo.java
  91. 3 3
      src/main/java/cn/com/qmth/scancentral/vo/ExamInitVo.java
  92. 2 2
      src/main/java/cn/com/qmth/scancentral/vo/ExportCetVo.java
  93. 2 2
      src/main/java/cn/com/qmth/scancentral/vo/SubjectConfigVo.java
  94. 2 2
      src/main/java/cn/com/qmth/scancentral/vo/answerquery/AnswerPageVo.java
  95. 2 2
      src/main/java/cn/com/qmth/scancentral/vo/answerquery/AnswerPaperVo.java
  96. 2 2
      src/main/java/cn/com/qmth/scancentral/vo/answerquery/AnswerQueryVo.java
  97. 2 3
      src/main/java/cn/com/qmth/scancentral/vo/batchdetail/BatchDetailDO.java
  98. 2 2
      src/main/java/cn/com/qmth/scancentral/vo/examinfo/SubjectConfig.java
  99. 2 2
      src/main/java/cn/com/qmth/scancentral/vo/paper/PaperPageCetVo.java
  100. 2 2
      src/main/java/cn/com/qmth/scancentral/vo/scannerinfo/ScannerInfoCard.java

+ 3 - 4
src/main/java/cn/com/qmth/scancentral/bean/AnswerQueryDomain.java

@@ -1,14 +1,13 @@
 package cn.com.qmth.scancentral.bean;
 
-import java.util.List;
-
-import javax.validation.constraints.NotNull;
-
 import cn.com.qmth.scancentral.enums.ExamStatus;
 import cn.com.qmth.scancentral.enums.PaperTypeStatus;
 import cn.com.qmth.scancentral.enums.ScanStatus;
 import cn.com.qmth.scancentral.util.PagerQuery;
 
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
 public class AnswerQueryDomain extends PagerQuery {
 
     @NotNull(message = "考试ID不能为空")

+ 3 - 4
src/main/java/cn/com/qmth/scancentral/bean/AssignedQueryDomain.java

@@ -1,14 +1,13 @@
 package cn.com.qmth.scancentral.bean;
 
-import java.util.List;
-
-import javax.validation.constraints.NotNull;
-
 import cn.com.qmth.scancentral.enums.ExamStatus;
 import cn.com.qmth.scancentral.enums.PaperTypeStatus;
 import cn.com.qmth.scancentral.enums.ScanStatus;
 import cn.com.qmth.scancentral.util.PagerQuery;
 
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
 public class AssignedQueryDomain extends PagerQuery {
 
     @NotNull(message = "考试ID不能为空")

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/bean/OmrTaskDto.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.scancentral.bean;
 
+import cn.com.qmth.scancentral.entity.OmrTaskEntity;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.com.qmth.scancentral.entity.OmrTaskEntity;
-
 public class OmrTaskDto {
 
     private OmrTaskEntity task;

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/bean/OmrTaskPageDto.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.scancentral.bean;
 
+import cn.com.qmth.scancentral.model.OmrTaskItem;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.com.qmth.scancentral.model.OmrTaskItem;
-
 public class OmrTaskPageDto {
 
     private Integer pageIndex;

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/bean/ScannerLoginInfo.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.scancentral.bean;
 
-import java.io.Serializable;
-
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+
 /**
  * 登陆信息
  * 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/bean/SubjectConfigDomain.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.bean;
 
-import java.util.List;
-
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 public class SubjectConfigDomain {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/bean/User.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.bean;
 
-import com.qmth.boot.core.security.model.AccessEntity;
-
 import cn.com.qmth.scancentral.enums.Role;
+import com.qmth.boot.core.security.model.AccessEntity;
 
 public class User implements AccessEntity {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/bean/answersave/AnswerDomain.java

@@ -1,12 +1,11 @@
 package cn.com.qmth.scancentral.bean.answersave;
 
-import java.util.List;
-
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.util.List;
 
 public class AnswerDomain {
 

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/bean/answersave/ArrayResult.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.scancentral.bean.answersave;
 
-import java.util.List;
-
 import cn.com.qmth.scancentral.enums.OmrType;
 
+import java.util.List;
+
 public class ArrayResult {
 
     private OmrType type;

+ 6 - 7
src/main/java/cn/com/qmth/scancentral/bean/card/CardFile.java

@@ -1,18 +1,17 @@
 package cn.com.qmth.scancentral.bean.card;
 
-import java.awt.Image;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.qmth.boot.core.exception.ParameterException;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Base64;
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.imageio.ImageIO;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.qmth.boot.core.exception.ParameterException;
-
 /**
  * 卡格式文件内容结构
  */

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/bean/omredit/OmrEditDomain.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.scancentral.bean.omredit;
 
-import java.util.List;
-
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.util.List;
 
 public class OmrEditDomain {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/bean/papermigrate/PaperMigrateDomain.java

@@ -1,9 +1,8 @@
 package cn.com.qmth.scancentral.bean.papermigrate;
 
-import java.util.List;
-
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 public class PaperMigrateDomain {
 

+ 3 - 4
src/main/java/cn/com/qmth/scancentral/bean/papermigrate/PaperMigratePage.java

@@ -1,13 +1,12 @@
 package cn.com.qmth.scancentral.bean.papermigrate;
 
-import java.util.List;
-
-import com.qmth.boot.core.exception.ParameterException;
-
 import cn.com.qmth.scancentral.bean.answersave.ArrayResult;
 import cn.com.qmth.scancentral.bean.answersave.BoolResult;
 import cn.com.qmth.scancentral.bean.answersave.StringResult;
 import cn.com.qmth.scancentral.entity.PaperPageEntity;
+import com.qmth.boot.core.exception.ParameterException;
+
+import java.util.List;
 
 public class PaperMigratePage {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/bean/refix/AnswerRefixDomain.java

@@ -1,12 +1,11 @@
 package cn.com.qmth.scancentral.bean.refix;
 
-import java.util.List;
-
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import java.util.List;
 
 public class AnswerRefixDomain {
 

+ 4 - 5
src/main/java/cn/com/qmth/scancentral/bean/refix/PageRefixDomain.java

@@ -1,15 +1,14 @@
 package cn.com.qmth.scancentral.bean.refix;
 
-import java.util.List;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-
 import cn.com.qmth.scancentral.bean.answersave.ArrayResult;
 import cn.com.qmth.scancentral.bean.answersave.BoolResult;
 import cn.com.qmth.scancentral.bean.answersave.StringResult;
 import cn.com.qmth.scancentral.entity.PaperPageEntity;
 
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
 public class PageRefixDomain {
 
     @NotNull(message = "paper.page.index不能为空")

+ 4 - 6
src/main/java/cn/com/qmth/scancentral/config/FillMetaObjectHandler.java

@@ -1,13 +1,11 @@
 package cn.com.qmth.scancentral.config;
 
-import java.util.Date;
-
-import org.apache.ibatis.reflection.MetaObject;
-
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-
 import cn.com.qmth.scancentral.bean.User;
 import cn.com.qmth.scancentral.util.ServletUtil;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.apache.ibatis.reflection.MetaObject;
+
+import java.util.Date;
 
 public class FillMetaObjectHandler implements MetaObjectHandler {
 

+ 7 - 8
src/main/java/cn/com/qmth/scancentral/config/InitData.java

@@ -1,19 +1,18 @@
 package cn.com.qmth.scancentral.config;
 
-import java.io.File;
-import java.io.IOException;
-
+import cn.com.qmth.scancentral.entity.SystemConfigEntity;
+import cn.com.qmth.scancentral.entity.UserEntity;
+import cn.com.qmth.scancentral.enums.Role;
+import cn.com.qmth.scancentral.service.SystemConfigService;
+import cn.com.qmth.scancentral.service.UserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
-import cn.com.qmth.scancentral.entity.SystemConfigEntity;
-import cn.com.qmth.scancentral.entity.UserEntity;
-import cn.com.qmth.scancentral.enums.Role;
-import cn.com.qmth.scancentral.service.SystemConfigService;
-import cn.com.qmth.scancentral.service.UserService;
+import java.io.File;
+import java.io.IOException;
 
 @Component
 public class InitData implements CommandLineRunner {

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/dao/AdapteFileDao.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.dao;
 
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-
 import cn.com.qmth.scancentral.entity.AdapteFileEntity;
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 
 public interface AdapteFileDao extends MppBaseMapper<AdapteFileEntity> {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/dao/AnswerCardDao.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.dao;
 
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-
 import cn.com.qmth.scancentral.entity.AnswerCardEntity;
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 
 public interface AnswerCardDao extends MppBaseMapper<AnswerCardEntity> {
 

+ 4 - 6
src/main/java/cn/com/qmth/scancentral/dao/AnswerCardSubjectDao.java

@@ -1,13 +1,11 @@
 package cn.com.qmth.scancentral.dao;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-
 import cn.com.qmth.scancentral.entity.AnswerCardSubjectEntity;
 import cn.com.qmth.scancentral.vo.SubjectVo;
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface AnswerCardSubjectDao extends MppBaseMapper<AnswerCardSubjectEntity> {
 

+ 2 - 4
src/main/java/cn/com/qmth/scancentral/dao/BatchPaperDao.java

@@ -1,12 +1,10 @@
 package cn.com.qmth.scancentral.dao;
 
 import cn.com.qmth.scancentral.entity.BatchPaperEntity;
-
-import java.util.List;
-
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 import org.apache.ibatis.annotations.Param;
 
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import java.util.List;
 
 public interface BatchPaperDao extends MppBaseMapper<BatchPaperEntity> {
 

+ 3 - 5
src/main/java/cn/com/qmth/scancentral/dao/ExamDao.java

@@ -1,18 +1,16 @@
 package cn.com.qmth.scancentral.dao;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
 import cn.com.qmth.scancentral.entity.ExamEntity;
 import cn.com.qmth.scancentral.vo.ExamVo;
 import cn.com.qmth.scancentral.vo.examinfo.ExamQuery;
 import cn.com.qmth.scancentral.vo.scanexamlist.ScanExamListQuery;
 import cn.com.qmth.scancentral.vo.scanexamlist.ScanExamListVo;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface ExamDao extends BaseMapper<ExamEntity> {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/dao/FilePropertyDao.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import cn.com.qmth.scancentral.entity.FilePropertyEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface FilePropertyDao extends BaseMapper<FilePropertyEntity> {
 }

+ 2 - 4
src/main/java/cn/com/qmth/scancentral/dao/OmrGroupDao.java

@@ -1,10 +1,8 @@
 package cn.com.qmth.scancentral.dao;
 
-import org.apache.ibatis.annotations.Param;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import cn.com.qmth.scancentral.entity.OmrGroupEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 public interface OmrGroupDao extends BaseMapper<OmrGroupEntity> {
 

+ 4 - 6
src/main/java/cn/com/qmth/scancentral/dao/OmrTaskDao.java

@@ -1,13 +1,11 @@
 package cn.com.qmth.scancentral.dao;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import cn.com.qmth.scancentral.entity.OmrTaskEntity;
 import cn.com.qmth.scancentral.enums.TaskStatus;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface OmrTaskDao extends BaseMapper<OmrTaskEntity> {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/dao/PackageCardDao.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import cn.com.qmth.scancentral.entity.PackageCardEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface PackageCardDao extends BaseMapper<PackageCardEntity> {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/dao/PackageResultDao.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.dao;
 
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-
 import cn.com.qmth.scancentral.entity.PackageResultEntity;
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 
 public interface PackageResultDao extends MppBaseMapper<PackageResultEntity> {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/dao/PackageTaskDao.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import cn.com.qmth.scancentral.entity.PackageTaskEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface PackageTaskDao extends BaseMapper<PackageTaskEntity> {
 

+ 4 - 6
src/main/java/cn/com/qmth/scancentral/dao/PaperPageDao.java

@@ -1,13 +1,11 @@
 package cn.com.qmth.scancentral.dao;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-
 import cn.com.qmth.scancentral.entity.PaperPageEntity;
 import cn.com.qmth.scancentral.vo.paper.PaperPageCetVo;
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface PaperPageDao extends MppBaseMapper<PaperPageEntity> {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/dao/PaperStructureDao.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import cn.com.qmth.scancentral.entity.PaperStructureEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface PaperStructureDao extends BaseMapper<PaperStructureEntity> {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/dao/QuestionDao.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import cn.com.qmth.scancentral.entity.QuestionEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface QuestionDao extends BaseMapper<QuestionEntity> {
 }

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/dao/ScannerCardDao.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.dao;
 
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-
 import cn.com.qmth.scancentral.entity.ScannerCardEntity;
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 
 public interface ScannerCardDao extends MppBaseMapper<ScannerCardEntity> {
 

+ 4 - 6
src/main/java/cn/com/qmth/scancentral/dao/ScannerDao.java

@@ -1,13 +1,11 @@
 package cn.com.qmth.scancentral.dao;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import cn.com.qmth.scancentral.entity.ScannerEntity;
 import cn.com.qmth.scancentral.vo.scannerinfo.ScannerInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface ScannerDao extends BaseMapper<ScannerEntity> {
 

+ 7 - 19
src/main/java/cn/com/qmth/scancentral/dao/StudentDao.java

@@ -1,30 +1,18 @@
 package cn.com.qmth.scancentral.dao;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
 import cn.com.qmth.scancentral.bean.AbsentQueryDomain;
 import cn.com.qmth.scancentral.bean.AnswerQueryDomain;
 import cn.com.qmth.scancentral.bean.AssignedQueryDomain;
 import cn.com.qmth.scancentral.entity.StudentEntity;
-import cn.com.qmth.scancentral.vo.AbsentInfoVo;
-import cn.com.qmth.scancentral.vo.AbsentQueryVo;
-import cn.com.qmth.scancentral.vo.AnswerExportVo;
-import cn.com.qmth.scancentral.vo.CampusVo;
-import cn.com.qmth.scancentral.vo.ExamSiteVo;
-import cn.com.qmth.scancentral.vo.ExportCetMarkingQueryVo;
-import cn.com.qmth.scancentral.vo.ExportCetVo;
-import cn.com.qmth.scancentral.vo.ImportStudentQueryVo;
-import cn.com.qmth.scancentral.vo.ImportStudentVo;
-import cn.com.qmth.scancentral.vo.ScanAnswerInfoVo;
-import cn.com.qmth.scancentral.vo.StudentUploadVo;
+import cn.com.qmth.scancentral.vo.*;
 import cn.com.qmth.scancentral.vo.answerquery.AnswerQueryVo;
 import cn.com.qmth.scancentral.vo.assginedcheck.AssignedCheckExport;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface StudentDao extends BaseMapper<StudentEntity> {
 

+ 4 - 6
src/main/java/cn/com/qmth/scancentral/dao/StudentPaperDao.java

@@ -1,13 +1,11 @@
 package cn.com.qmth.scancentral.dao;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-
 import cn.com.qmth.scancentral.entity.StudentPaperEntity;
 import cn.com.qmth.scancentral.vo.StudentPaperCountVo;
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface StudentPaperDao extends MppBaseMapper<StudentPaperEntity> {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/dao/SubjectDao.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.dao;
 
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-
 import cn.com.qmth.scancentral.entity.SubjectEntity;
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 
 public interface SubjectDao extends MppBaseMapper<SubjectEntity> {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/dao/SystemConfigDao.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import cn.com.qmth.scancentral.entity.SystemConfigEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface SystemConfigDao extends BaseMapper<SystemConfigEntity> {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/dao/UserDao.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import cn.com.qmth.scancentral.entity.UserEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 public interface UserDao extends BaseMapper<UserEntity> {
 

+ 2 - 3
src/main/java/cn/com/qmth/scancentral/entity/AnswerCardEntity.java

@@ -2,14 +2,13 @@ package cn.com.qmth.scancentral.entity;
 
 import cn.com.qmth.scancentral.entity.base.AuditingWithoutIdEntity;
 import cn.com.qmth.scancentral.enums.CardSource;
-
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 
+import java.util.List;
+
 // 试卷卡格式
 @TableName(value = "sc_answer_card", autoResultMap = true)
 public class AnswerCardEntity extends AuditingWithoutIdEntity {

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/entity/AnswerCardSubjectEntity.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.scancentral.entity;
 
+import cn.com.qmth.scancentral.entity.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 
-import cn.com.qmth.scancentral.entity.base.BaseEntity;
-
 // 卡格式科目关联关系
 @TableName("sc_answer_card_subject")
 public class AnswerCardSubjectEntity extends BaseEntity {

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/entity/BatchEntity.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.scancentral.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import cn.com.qmth.scancentral.entity.base.AuditingEntity;
 import cn.com.qmth.scancentral.enums.BatchStatus;
 import cn.com.qmth.scancentral.enums.CheckStatus;
 import cn.com.qmth.scancentral.enums.VerifyStatus;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 // 扫描批次
 @TableName("sc_batch")

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/entity/ExamSummaryEntity.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.scancentral.entity;
 
+import cn.com.qmth.scancentral.vo.ScanAnswerInfoVo;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
-import cn.com.qmth.scancentral.vo.ScanAnswerInfoVo;
-
 // 考试汇总信息
 @TableName(value = "sc_exam_summary", autoResultMap = true)
 public class ExamSummaryEntity {

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/entity/FilePropertyEntity.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.scancentral.entity;
 
+import cn.com.qmth.scancentral.entity.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
-import cn.com.qmth.scancentral.entity.base.BaseEntity;
-
 @TableName("sc_file_property")
 public class FilePropertyEntity extends BaseEntity {
 

+ 4 - 5
src/main/java/cn/com/qmth/scancentral/entity/OmrTaskEntity.java

@@ -1,14 +1,13 @@
 package cn.com.qmth.scancentral.entity;
 
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import cn.com.qmth.scancentral.entity.base.AuditingEntity;
 import cn.com.qmth.scancentral.enums.TaskStatus;
 import cn.com.qmth.scancentral.handle.OmrTaskPageListTypeHandler;
 import cn.com.qmth.scancentral.model.OmrTaskPage;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.List;
 
 // 识别对照任务
 @TableName(value = "sc_omr_task", autoResultMap = true)

+ 0 - 1
src/main/java/cn/com/qmth/scancentral/entity/PackageCardEntity.java

@@ -2,7 +2,6 @@ package cn.com.qmth.scancentral.entity;
 
 import cn.com.qmth.scancentral.entity.base.AuditingEntity;
 import cn.com.qmth.scancentral.enums.CardSource;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 
 // 签到表卡格式

+ 2 - 3
src/main/java/cn/com/qmth/scancentral/entity/PackageResultEntity.java

@@ -1,14 +1,13 @@
 package cn.com.qmth.scancentral.entity;
 
-import java.util.List;
-
 import cn.com.qmth.scancentral.entity.base.AuditingWithoutIdEntity;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 
+import java.util.List;
+
 // 签到表
 @TableName(value = "sc_package_result", autoResultMap = true)
 public class PackageResultEntity extends AuditingWithoutIdEntity {

+ 0 - 1
src/main/java/cn/com/qmth/scancentral/entity/PackageTaskEntity.java

@@ -2,7 +2,6 @@ package cn.com.qmth.scancentral.entity;
 
 import cn.com.qmth.scancentral.entity.base.AuditingEntity;
 import cn.com.qmth.scancentral.enums.TaskStatus;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 
 // 签到表任务

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/entity/PaperStructureEntity.java

@@ -1,9 +1,8 @@
 package cn.com.qmth.scancentral.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import cn.com.qmth.scancentral.entity.base.AuditingEntity;
 import cn.com.qmth.scancentral.enums.OmrField;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 @TableName("sc_paper_structure")
 public class PaperStructureEntity extends AuditingEntity {

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/entity/QuestionEntity.java

@@ -1,8 +1,7 @@
 package cn.com.qmth.scancentral.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import cn.com.qmth.scancentral.entity.base.AuditingEntity;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 @TableName("sc_question")
 public class QuestionEntity extends AuditingEntity {

+ 4 - 5
src/main/java/cn/com/qmth/scancentral/entity/RefixBatchEntity.java

@@ -1,13 +1,12 @@
 package cn.com.qmth.scancentral.entity;
 
-import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import cn.com.qmth.scancentral.entity.base.AuditingEntity;
 import cn.com.qmth.scancentral.handle.QueryConditionListTypeHandler;
 import cn.com.qmth.scancentral.model.QueryCondition;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.List;
 
 // 二次识别批次
 @TableName(value = "sc_refix_batch", autoResultMap = true)

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/entity/ScannerCardEntity.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.scancentral.entity;
 
+import cn.com.qmth.scancentral.entity.base.AuditingWithoutIdEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 
-import cn.com.qmth.scancentral.entity.base.AuditingWithoutIdEntity;
-
 @TableName("sc_scanner_card")
 public class ScannerCardEntity extends AuditingWithoutIdEntity {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/entity/ScannerEntity.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.scancentral.entity;
 
+import cn.com.qmth.scancentral.entity.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
-import cn.com.qmth.scancentral.entity.base.BaseEntity;
-
 // 扫描员
 @TableName("sc_scanner")
 public class ScannerEntity extends BaseEntity {

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/entity/StudentEntity.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.scancentral.entity;
 
-import com.baomidou.mybatisplus.annotation.*;
-
 import cn.com.qmth.scancentral.entity.base.AuditingWithoutIdEntity;
 import cn.com.qmth.scancentral.enums.ExamStatus;
 import cn.com.qmth.scancentral.enums.ScanStatus;
 import cn.com.qmth.scancentral.enums.UploadStatus;
+import com.baomidou.mybatisplus.annotation.*;
 
 // 考生
 @TableName("sc_student")

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/entity/StudentPaperEntity.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.scancentral.entity;
 
+import cn.com.qmth.scancentral.entity.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 
-import cn.com.qmth.scancentral.entity.base.BaseEntity;
-
 import java.io.Serializable;
 
 // 考生和试卷绑定关系

+ 2 - 3
src/main/java/cn/com/qmth/scancentral/entity/SubjectEntity.java

@@ -1,13 +1,12 @@
 package cn.com.qmth.scancentral.entity;
 
-import java.util.List;
-
+import cn.com.qmth.scancentral.entity.base.AuditingWithoutIdEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 
-import cn.com.qmth.scancentral.entity.base.AuditingWithoutIdEntity;
+import java.util.List;
 
 // 科目
 @TableName(value = "sc_subject", autoResultMap = true)

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/entity/UserEntity.java

@@ -1,9 +1,8 @@
 package cn.com.qmth.scancentral.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-
 import cn.com.qmth.scancentral.entity.base.AuditingEntity;
 import cn.com.qmth.scancentral.enums.Role;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 // 管理员
 @TableName("sc_user")

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/entity/base/BaseEntity.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.scancentral.entity.base;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 
+import java.io.Serializable;
+
 /**
  * 实体类基类
  */

+ 9 - 10
src/main/java/cn/com/qmth/scancentral/handle/ListTypeHandler.java

@@ -1,21 +1,20 @@
 package cn.com.qmth.scancentral.handle;
 
-import java.sql.CallableStatement;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
+import com.github.xiaoymin.knife4j.core.util.StrUtil;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.MappedJdbcTypes;
 import org.apache.ibatis.type.MappedTypes;
 
-import com.github.xiaoymin.knife4j.core.util.StrUtil;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
 
 @MappedJdbcTypes(JdbcType.VARCHAR)
 @MappedTypes({ List.class })

+ 2 - 3
src/main/java/cn/com/qmth/scancentral/handle/OmrTaskPageListTypeHandler.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.scancentral.handle;
 
-import java.util.List;
-
+import cn.com.qmth.scancentral.model.OmrTaskPage;
 import com.google.gson.reflect.TypeToken;
 
-import cn.com.qmth.scancentral.model.OmrTaskPage;
+import java.util.List;
 
 public class OmrTaskPageListTypeHandler extends ListTypeHandler<OmrTaskPage> {
 

+ 2 - 3
src/main/java/cn/com/qmth/scancentral/handle/QueryConditionListTypeHandler.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.scancentral.handle;
 
-import java.util.List;
-
+import cn.com.qmth.scancentral.model.QueryCondition;
 import com.google.gson.reflect.TypeToken;
 
-import cn.com.qmth.scancentral.model.QueryCondition;
+import java.util.List;
 
 public class QueryConditionListTypeHandler extends ListTypeHandler<QueryCondition> {
 

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/model/AnswerCardInfo.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.scancentral.model;
 
-import java.util.List;
-
 import cn.com.qmth.scancentral.enums.CardSource;
 
+import java.util.List;
+
 /**
  * 云阅卷题卡格式
  */

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/model/QueryCondition.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.scancentral.model;
 
-import java.util.Set;
-
 import cn.com.qmth.scancentral.enums.QueryField;
 
+import java.util.Set;
+
 public class QueryCondition {
 
     private QueryField field;

+ 14 - 16
src/main/java/cn/com/qmth/scancentral/service/impl/AdapteFileServiceImpl.java

@@ -1,21 +1,5 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.qmth.boot.core.exception.ParameterException;
-import com.qmth.boot.core.exception.StatusException;
-
 import cn.com.qmth.scancentral.dao.AdapteFileDao;
 import cn.com.qmth.scancentral.entity.AdapteFileEntity;
 import cn.com.qmth.scancentral.entity.AnswerCardEntity;
@@ -24,6 +8,20 @@ import cn.com.qmth.scancentral.service.AdapteFileService;
 import cn.com.qmth.scancentral.service.AnswerCardService;
 import cn.com.qmth.scancentral.service.FileService;
 import cn.com.qmth.scancentral.vo.UriVo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.qmth.boot.core.exception.ParameterException;
+import com.qmth.boot.core.exception.StatusException;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Service
 public class AdapteFileServiceImpl extends MppServiceImpl<AdapteFileDao, AdapteFileEntity>

+ 19 - 33
src/main/java/cn/com/qmth/scancentral/service/impl/AnswerCardServiceImpl.java

@@ -1,11 +1,19 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
+import cn.com.qmth.scancentral.bean.User;
+import cn.com.qmth.scancentral.bean.card.CardFile;
+import cn.com.qmth.scancentral.dao.AnswerCardDao;
+import cn.com.qmth.scancentral.entity.*;
+import cn.com.qmth.scancentral.enums.CardSource;
+import cn.com.qmth.scancentral.enums.ExamMode;
+import cn.com.qmth.scancentral.service.*;
+import cn.com.qmth.scancentral.vo.AnswerCardVo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.qmth.boot.core.exception.ParameterException;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -15,33 +23,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.qmth.boot.core.exception.ParameterException;
-
-import cn.com.qmth.scancentral.bean.User;
-import cn.com.qmth.scancentral.bean.card.CardFile;
-import cn.com.qmth.scancentral.dao.AnswerCardDao;
-import cn.com.qmth.scancentral.entity.AnswerCardEntity;
-import cn.com.qmth.scancentral.entity.AnswerCardSubjectEntity;
-import cn.com.qmth.scancentral.entity.ExamEntity;
-import cn.com.qmth.scancentral.entity.ScannerCardEntity;
-import cn.com.qmth.scancentral.entity.SubjectEntity;
-import cn.com.qmth.scancentral.enums.CardSource;
-import cn.com.qmth.scancentral.enums.ExamMode;
-import cn.com.qmth.scancentral.service.AdapteFileService;
-import cn.com.qmth.scancentral.service.AnswerCardService;
-import cn.com.qmth.scancentral.service.AnswerCardSubjectService;
-import cn.com.qmth.scancentral.service.ExamService;
-import cn.com.qmth.scancentral.service.FileService;
-import cn.com.qmth.scancentral.service.PaperService;
-import cn.com.qmth.scancentral.service.PaperStructureService;
-import cn.com.qmth.scancentral.service.ScannerCardService;
-import cn.com.qmth.scancentral.service.SubjectService;
-import cn.com.qmth.scancentral.vo.AnswerCardVo;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 @Service
 public class AnswerCardServiceImpl extends MppServiceImpl<AnswerCardDao, AnswerCardEntity>

+ 11 - 13
src/main/java/cn/com/qmth/scancentral/service/impl/AuthServiceImpl.java

@@ -1,18 +1,5 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import org.apache.commons.lang3.RandomStringUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.qmth.boot.core.exception.ParameterException;
-import com.qmth.boot.core.security.annotation.AuthorizationComponent;
-import com.qmth.boot.core.security.service.AuthorizationService;
-import com.qmth.boot.tools.signature.SignatureType;
-
 import cn.com.qmth.scancentral.bean.ScannerLoginInfo;
 import cn.com.qmth.scancentral.bean.User;
 import cn.com.qmth.scancentral.entity.SystemConfigEntity;
@@ -24,6 +11,17 @@ import cn.com.qmth.scancentral.service.AuthService;
 import cn.com.qmth.scancentral.service.ScannerService;
 import cn.com.qmth.scancentral.service.SessionService;
 import cn.com.qmth.scancentral.service.UserService;
+import com.qmth.boot.core.exception.ParameterException;
+import com.qmth.boot.core.security.annotation.AuthorizationComponent;
+import com.qmth.boot.core.security.service.AuthorizationService;
+import com.qmth.boot.tools.signature.SignatureType;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @AuthorizationComponent

+ 23 - 64
src/main/java/cn/com/qmth/scancentral/service/impl/BatchServiceImpl.java

@@ -1,31 +1,5 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.math.RandomUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.boot.core.collection.PageResult;
-import com.qmth.boot.core.concurrent.service.ConcurrentService;
-import com.qmth.boot.core.exception.ParameterException;
-import com.qmth.boot.core.exception.StatusException;
-
 import cn.com.qmth.scancentral.bean.BatchCreateDomain;
 import cn.com.qmth.scancentral.bean.BatchQueryDomain;
 import cn.com.qmth.scancentral.bean.User;
@@ -33,49 +7,16 @@ import cn.com.qmth.scancentral.bean.WorkloadDomain;
 import cn.com.qmth.scancentral.bean.answersave.AnswerDomain;
 import cn.com.qmth.scancentral.bean.answersave.AnswerPaper;
 import cn.com.qmth.scancentral.dao.BatchDao;
-import cn.com.qmth.scancentral.entity.AnswerCardEntity;
-import cn.com.qmth.scancentral.entity.BatchEntity;
-import cn.com.qmth.scancentral.entity.BatchPaperEntity;
-import cn.com.qmth.scancentral.entity.ExamEntity;
-import cn.com.qmth.scancentral.entity.PaperEntity;
-import cn.com.qmth.scancentral.entity.PaperPageEntity;
-import cn.com.qmth.scancentral.entity.StudentEntity;
-import cn.com.qmth.scancentral.entity.StudentPaperEntity;
-import cn.com.qmth.scancentral.entity.SubjectEntity;
-import cn.com.qmth.scancentral.enums.BatchStatus;
-import cn.com.qmth.scancentral.enums.CheckStatus;
-import cn.com.qmth.scancentral.enums.LockType;
-import cn.com.qmth.scancentral.enums.Role;
-import cn.com.qmth.scancentral.enums.VerifyStatus;
+import cn.com.qmth.scancentral.entity.*;
+import cn.com.qmth.scancentral.enums.*;
 import cn.com.qmth.scancentral.exception.NotFoundExceptions;
 import cn.com.qmth.scancentral.exception.ParameterExceptions;
-import cn.com.qmth.scancentral.service.AnswerCardService;
-import cn.com.qmth.scancentral.service.AnswerCardSubjectService;
-import cn.com.qmth.scancentral.service.AssignedCheckHistoryService;
-import cn.com.qmth.scancentral.service.BatchPaperService;
-import cn.com.qmth.scancentral.service.BatchService;
-import cn.com.qmth.scancentral.service.ExamService;
-import cn.com.qmth.scancentral.service.FilePropertyService;
-import cn.com.qmth.scancentral.service.FileService;
-import cn.com.qmth.scancentral.service.PaperPageService;
-import cn.com.qmth.scancentral.service.PaperService;
-import cn.com.qmth.scancentral.service.StudentService;
-import cn.com.qmth.scancentral.service.SubjectService;
+import cn.com.qmth.scancentral.service.*;
 import cn.com.qmth.scancentral.support.TaskLock;
 import cn.com.qmth.scancentral.support.TaskLockUtil;
 import cn.com.qmth.scancentral.util.PageUtil;
-import cn.com.qmth.scancentral.vo.BatchFinishVo;
-import cn.com.qmth.scancentral.vo.BatchQueryVo;
-import cn.com.qmth.scancentral.vo.BatchVerifyVo;
-import cn.com.qmth.scancentral.vo.ScannerWorkloadVo;
-import cn.com.qmth.scancentral.vo.SheetUploadVo;
-import cn.com.qmth.scancentral.vo.SliceUploadVo;
-import cn.com.qmth.scancentral.vo.SubjectVo;
-import cn.com.qmth.scancentral.vo.batch.AnswerSaveVo;
-import cn.com.qmth.scancentral.vo.batch.BatchCreateVo;
-import cn.com.qmth.scancentral.vo.batch.BatchSubjectQuery;
-import cn.com.qmth.scancentral.vo.batch.Paper;
-import cn.com.qmth.scancentral.vo.batch.Rescan;
+import cn.com.qmth.scancentral.vo.*;
+import cn.com.qmth.scancentral.vo.batch.*;
 import cn.com.qmth.scancentral.vo.batchdetail.BatchDetailDO;
 import cn.com.qmth.scancentral.vo.batchdetail.BatchDetailVo;
 import cn.com.qmth.scancentral.vo.batchdetail.BatchStudentVo;
@@ -84,6 +25,24 @@ import cn.com.qmth.scancentral.vo.paper.PaperVo;
 import cn.com.qmth.scancentral.vo.task.TaskStatusVo;
 import cn.com.qmth.scancentral.vo.verify.VerifyStudentVo;
 import cn.com.qmth.scancentral.vo.verify.VerifyTaskVo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.boot.core.collection.PageResult;
+import com.qmth.boot.core.concurrent.service.ConcurrentService;
+import com.qmth.boot.core.exception.ParameterException;
+import com.qmth.boot.core.exception.StatusException;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.math.RandomUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.*;
 
 @Service
 public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> implements BatchService {

+ 18 - 20
src/main/java/cn/com/qmth/scancentral/service/impl/OmrGroupServiceImpl.java

@@ -1,25 +1,5 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.boot.core.concurrent.service.ConcurrentService;
-import com.qmth.boot.core.exception.ParameterException;
-import com.qmth.boot.core.exception.ReentrantException;
-import com.qmth.boot.core.exception.StatusException;
-
 import cn.com.qmth.scancentral.dao.OmrGroupDao;
 import cn.com.qmth.scancentral.entity.OmrGroupEntity;
 import cn.com.qmth.scancentral.entity.OmrTaskEntity;
@@ -34,6 +14,24 @@ import cn.com.qmth.scancentral.service.StudentPaperService;
 import cn.com.qmth.scancentral.util.BatchSetDataUtil;
 import cn.com.qmth.scancentral.vo.OmrConditionVo;
 import cn.com.qmth.scancentral.vo.OmrGroupVo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.boot.core.concurrent.service.ConcurrentService;
+import com.qmth.boot.core.exception.ParameterException;
+import com.qmth.boot.core.exception.ReentrantException;
+import com.qmth.boot.core.exception.StatusException;
+import org.apache.commons.collections4.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 @Service
 public class OmrGroupServiceImpl extends ServiceImpl<OmrGroupDao, OmrGroupEntity> implements OmrGroupService {

+ 21 - 47
src/main/java/cn/com/qmth/scancentral/service/impl/OmrTaskServiceImpl.java

@@ -1,63 +1,37 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.constraints.NotNull;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.boot.core.concurrent.service.ConcurrentService;
-import com.qmth.boot.core.exception.ParameterException;
-
 import cn.com.qmth.scancentral.bean.OmrTaskDto;
 import cn.com.qmth.scancentral.bean.OmrTaskPageDto;
 import cn.com.qmth.scancentral.bean.User;
 import cn.com.qmth.scancentral.dao.OmrTaskDao;
-import cn.com.qmth.scancentral.entity.OmrGroupEntity;
-import cn.com.qmth.scancentral.entity.OmrTaskEntity;
-import cn.com.qmth.scancentral.entity.PaperEntity;
-import cn.com.qmth.scancentral.entity.PaperPageEntity;
-import cn.com.qmth.scancentral.entity.StudentEntity;
-import cn.com.qmth.scancentral.entity.StudentPaperEntity;
-import cn.com.qmth.scancentral.entity.SubjectEntity;
-import cn.com.qmth.scancentral.enums.ConditionType;
-import cn.com.qmth.scancentral.enums.LockType;
-import cn.com.qmth.scancentral.enums.OmrField;
-import cn.com.qmth.scancentral.enums.ScanStatus;
-import cn.com.qmth.scancentral.enums.Stage;
-import cn.com.qmth.scancentral.enums.TaskStatus;
+import cn.com.qmth.scancentral.entity.*;
+import cn.com.qmth.scancentral.enums.*;
 import cn.com.qmth.scancentral.exception.NotFoundExceptions;
 import cn.com.qmth.scancentral.model.OmrCondition;
 import cn.com.qmth.scancentral.model.OmrTaskItem;
 import cn.com.qmth.scancentral.model.OmrTaskPage;
-import cn.com.qmth.scancentral.service.OmrGroupService;
-import cn.com.qmth.scancentral.service.OmrTaskService;
-import cn.com.qmth.scancentral.service.PaperPageService;
-import cn.com.qmth.scancentral.service.PaperService;
-import cn.com.qmth.scancentral.service.PaperStructureService;
-import cn.com.qmth.scancentral.service.StudentPaperService;
-import cn.com.qmth.scancentral.service.StudentService;
-import cn.com.qmth.scancentral.service.SubjectService;
+import cn.com.qmth.scancentral.service.*;
 import cn.com.qmth.scancentral.support.TaskLock;
 import cn.com.qmth.scancentral.support.TaskLockUtil;
 import cn.com.qmth.scancentral.vo.paperstructureinfo.PaperStructure;
-import cn.com.qmth.scancentral.vo.task.TaskPageVo;
-import cn.com.qmth.scancentral.vo.task.TaskResultPageVo;
-import cn.com.qmth.scancentral.vo.task.TaskResultVo;
-import cn.com.qmth.scancentral.vo.task.TaskSaveVo;
-import cn.com.qmth.scancentral.vo.task.TaskStatusVo;
-import cn.com.qmth.scancentral.vo.task.TaskVo;
+import cn.com.qmth.scancentral.vo.task.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.boot.core.concurrent.service.ConcurrentService;
+import com.qmth.boot.core.exception.ParameterException;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class OmrTaskServiceImpl extends ServiceImpl<OmrTaskDao, OmrTaskEntity> implements OmrTaskService {

+ 4 - 6
src/main/java/cn/com/qmth/scancentral/service/impl/PackageCardServiceImpl.java

@@ -1,14 +1,12 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import cn.com.qmth.scancentral.dao.PackageCardDao;
 import cn.com.qmth.scancentral.entity.PackageCardEntity;
 import cn.com.qmth.scancentral.service.PackageCardService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
 
 @Service
 public class PackageCardServiceImpl extends ServiceImpl<PackageCardDao, PackageCardEntity>

+ 4 - 6
src/main/java/cn/com/qmth/scancentral/service/impl/PackageTaskServiceImpl.java

@@ -1,15 +1,13 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import cn.com.qmth.scancentral.dao.PackageTaskDao;
 import cn.com.qmth.scancentral.entity.PackageTaskEntity;
 import cn.com.qmth.scancentral.enums.TaskStatus;
 import cn.com.qmth.scancentral.service.PackageTaskService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
 
 @Service
 public class PackageTaskServiceImpl extends ServiceImpl<PackageTaskDao, PackageTaskEntity>

+ 8 - 11
src/main/java/cn/com/qmth/scancentral/service/impl/PaperPageServiceImpl.java

@@ -1,22 +1,19 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.util.List;
-
-import javax.validation.constraints.NotNull;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
+import cn.com.qmth.scancentral.dao.PaperPageDao;
+import cn.com.qmth.scancentral.entity.PaperPageEntity;
+import cn.com.qmth.scancentral.service.PaperPageService;
+import cn.com.qmth.scancentral.vo.paper.PaperPageCetVo;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.qmth.boot.core.exception.ParameterException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import cn.com.qmth.scancentral.dao.PaperPageDao;
-import cn.com.qmth.scancentral.entity.PaperPageEntity;
-import cn.com.qmth.scancentral.service.PaperPageService;
-import cn.com.qmth.scancentral.vo.paper.PaperPageCetVo;
+import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Service
 public class PaperPageServiceImpl extends MppServiceImpl<PaperPageDao, PaperPageEntity> implements PaperPageService {

+ 25 - 28
src/main/java/cn/com/qmth/scancentral/service/impl/PaperServiceImpl.java

@@ -1,33 +1,5 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.validation.constraints.NotNull;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.boot.core.collection.PageResult;
-import com.qmth.boot.core.concurrent.service.ConcurrentService;
-import com.qmth.boot.core.exception.ParameterException;
-import com.qmth.boot.core.exception.StatusException;
-import com.qmth.boot.core.fss.store.FileStore;
-
 import cn.com.qmth.scancentral.bean.MismatchQueryDomain;
 import cn.com.qmth.scancentral.bean.MismatchToggleDomain;
 import cn.com.qmth.scancentral.bean.User;
@@ -47,6 +19,31 @@ import cn.com.qmth.scancentral.vo.mismatchquery.MismatchQueryVo;
 import cn.com.qmth.scancentral.vo.mismatchquery.PaperPageDO;
 import cn.com.qmth.scancentral.vo.paper.PaperCetVo;
 import cn.com.qmth.scancentral.vo.paper.PaperVo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.boot.core.collection.PageResult;
+import com.qmth.boot.core.concurrent.service.ConcurrentService;
+import com.qmth.boot.core.exception.ParameterException;
+import com.qmth.boot.core.exception.StatusException;
+import com.qmth.boot.core.fss.store.FileStore;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotNull;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> implements PaperService {

+ 8 - 13
src/main/java/cn/com/qmth/scancentral/service/impl/PictureCopyServiceImpl.java

@@ -1,24 +1,19 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.scancentral.consumer.PictureCopyConsumer;
 import cn.com.qmth.scancentral.enums.SystemMode;
 import cn.com.qmth.scancentral.service.PictureCopyService;
 import cn.com.qmth.scancentral.service.StudentService;
 import cn.com.qmth.scancentral.support.SpringContextHolder;
 import cn.com.qmth.scancentral.vo.StudentUploadVo;
+import org.apache.commons.collections4.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.concurrent.*;
 
 @Service
 public class PictureCopyServiceImpl implements PictureCopyService {

+ 10 - 12
src/main/java/cn/com/qmth/scancentral/service/impl/ScannerServiceImpl.java

@@ -1,17 +1,5 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.boot.core.exception.ParameterException;
-
 import cn.com.qmth.scancentral.dao.ScannerDao;
 import cn.com.qmth.scancentral.entity.AnswerCardEntity;
 import cn.com.qmth.scancentral.entity.ScannerEntity;
@@ -24,6 +12,16 @@ import cn.com.qmth.scancentral.vo.scannerinfo.Control;
 import cn.com.qmth.scancentral.vo.scannerinfo.ScannerInfo;
 import cn.com.qmth.scancentral.vo.scannerinfo.ScannerInfoCard;
 import cn.com.qmth.scancentral.vo.scannerinfo.ScannerInfoVo;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.boot.core.exception.ParameterException;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class ScannerServiceImpl extends ServiceImpl<ScannerDao, ScannerEntity> implements ScannerService {

+ 35 - 105
src/main/java/cn/com/qmth/scancentral/service/impl/StudentServiceImpl.java

@@ -1,57 +1,6 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.validation.constraints.NotNull;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.boot.core.collection.PageResult;
-import com.qmth.boot.core.concurrent.service.ConcurrentService;
-import com.qmth.boot.core.exception.ParameterException;
-import com.qmth.boot.core.exception.StatusException;
-import com.qmth.boot.core.retrofit.utils.SignatureInfo;
-import com.qmth.boot.tools.excel.ExcelReader;
-import com.qmth.boot.tools.excel.enums.ExcelType;
-import com.qmth.boot.tools.io.IOUtils;
-import com.qmth.boot.tools.signature.SignatureType;
-
-import cn.com.qmth.scancentral.bean.AbsentQueryDomain;
-import cn.com.qmth.scancentral.bean.AnswerDeleteDomain;
-import cn.com.qmth.scancentral.bean.AnswerQueryDomain;
-import cn.com.qmth.scancentral.bean.AssignedQueryDomain;
-import cn.com.qmth.scancentral.bean.ImportCetAbsentDomain;
-import cn.com.qmth.scancentral.bean.ImportStudentDomain;
-import cn.com.qmth.scancentral.bean.PageDeleteDomain;
-import cn.com.qmth.scancentral.bean.SchoolSession;
-import cn.com.qmth.scancentral.bean.User;
+import cn.com.qmth.scancentral.bean.*;
 import cn.com.qmth.scancentral.bean.answersave.ArrayResult;
 import cn.com.qmth.scancentral.bean.answersave.StringResult;
 import cn.com.qmth.scancentral.bean.omredit.OmrEditDomain;
@@ -61,67 +10,18 @@ import cn.com.qmth.scancentral.bean.refix.PageRefixDomain;
 import cn.com.qmth.scancentral.bean.refix.PaperRefixDomain;
 import cn.com.qmth.scancentral.config.SysProperty;
 import cn.com.qmth.scancentral.dao.StudentDao;
-import cn.com.qmth.scancentral.entity.AnswerCardEntity;
-import cn.com.qmth.scancentral.entity.ExamEntity;
-import cn.com.qmth.scancentral.entity.OmrGroupEntity;
-import cn.com.qmth.scancentral.entity.PaperEntity;
-import cn.com.qmth.scancentral.entity.PaperPageEntity;
-import cn.com.qmth.scancentral.entity.QuestionEntity;
-import cn.com.qmth.scancentral.entity.StudentEntity;
-import cn.com.qmth.scancentral.entity.StudentPaperEntity;
-import cn.com.qmth.scancentral.entity.SubjectEntity;
-import cn.com.qmth.scancentral.entity.UserEntity;
-import cn.com.qmth.scancentral.enums.ExamMode;
-import cn.com.qmth.scancentral.enums.ExamStatus;
-import cn.com.qmth.scancentral.enums.ExamStatusCheckMode;
-import cn.com.qmth.scancentral.enums.GroupType;
-import cn.com.qmth.scancentral.enums.LockType;
-import cn.com.qmth.scancentral.enums.OmrType;
-import cn.com.qmth.scancentral.enums.Role;
-import cn.com.qmth.scancentral.enums.ScanStatus;
-import cn.com.qmth.scancentral.enums.UploadStatus;
+import cn.com.qmth.scancentral.entity.*;
+import cn.com.qmth.scancentral.enums.*;
 import cn.com.qmth.scancentral.exception.NotFoundExceptions;
 import cn.com.qmth.scancentral.exception.ParameterExceptions;
 import cn.com.qmth.scancentral.model.ManualAbsentImportDTO;
-import cn.com.qmth.scancentral.service.AnswerCardService;
-import cn.com.qmth.scancentral.service.AnswerCardSubjectService;
-import cn.com.qmth.scancentral.service.AssignedCheckHistoryService;
-import cn.com.qmth.scancentral.service.BatchService;
-import cn.com.qmth.scancentral.service.ExamService;
-import cn.com.qmth.scancentral.service.OmrGroupService;
-import cn.com.qmth.scancentral.service.OmrTaskService;
-import cn.com.qmth.scancentral.service.PaperPageService;
-import cn.com.qmth.scancentral.service.PaperService;
-import cn.com.qmth.scancentral.service.QuestionService;
-import cn.com.qmth.scancentral.service.SessionService;
-import cn.com.qmth.scancentral.service.StudentPaperService;
-import cn.com.qmth.scancentral.service.StudentService;
-import cn.com.qmth.scancentral.service.SubjectService;
-import cn.com.qmth.scancentral.service.ToolExportService;
-import cn.com.qmth.scancentral.service.UserService;
+import cn.com.qmth.scancentral.service.*;
 import cn.com.qmth.scancentral.support.TaskLock;
 import cn.com.qmth.scancentral.support.TaskLockUtil;
 import cn.com.qmth.scancentral.util.BatchGetDataUtil;
 import cn.com.qmth.scancentral.util.BatchSetDataUtil;
 import cn.com.qmth.scancentral.util.PageUtil;
-import cn.com.qmth.scancentral.vo.AbsentInfoVo;
-import cn.com.qmth.scancentral.vo.AbsentManualImportVo;
-import cn.com.qmth.scancentral.vo.AbsentQueryVo;
-import cn.com.qmth.scancentral.vo.AnswerDeleteVo;
-import cn.com.qmth.scancentral.vo.AnswerExportK12Vo;
-import cn.com.qmth.scancentral.vo.AnswerExportVo;
-import cn.com.qmth.scancentral.vo.AnswerRefixVo;
-import cn.com.qmth.scancentral.vo.CampusVo;
-import cn.com.qmth.scancentral.vo.ExamSiteVo;
-import cn.com.qmth.scancentral.vo.ExportCetMarkingQueryVo;
-import cn.com.qmth.scancentral.vo.ExportCetVo;
-import cn.com.qmth.scancentral.vo.ImportResult;
-import cn.com.qmth.scancentral.vo.ImportStudentQueryVo;
-import cn.com.qmth.scancentral.vo.ImportStudentVo;
-import cn.com.qmth.scancentral.vo.PaperDeleteVo;
-import cn.com.qmth.scancentral.vo.ScanAnswerInfoVo;
-import cn.com.qmth.scancentral.vo.StudentUploadVo;
-import cn.com.qmth.scancentral.vo.UpdateTimeVo;
+import cn.com.qmth.scancentral.vo.*;
 import cn.com.qmth.scancentral.vo.answerquery.AnswerPageVo;
 import cn.com.qmth.scancentral.vo.answerquery.AnswerPaperVo;
 import cn.com.qmth.scancentral.vo.answerquery.AnswerQueryVo;
@@ -135,6 +35,36 @@ import cn.com.qmth.scancentral.vo.paper.PaperPageCetVo;
 import cn.com.qmth.scancentral.vo.student.StudentQuery;
 import cn.com.qmth.scancentral.vo.student.StudentVo;
 import cn.com.qmth.scancentral.vo.task.TaskStatusVo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.boot.core.collection.PageResult;
+import com.qmth.boot.core.concurrent.service.ConcurrentService;
+import com.qmth.boot.core.exception.ParameterException;
+import com.qmth.boot.core.exception.StatusException;
+import com.qmth.boot.core.retrofit.utils.SignatureInfo;
+import com.qmth.boot.tools.excel.ExcelReader;
+import com.qmth.boot.tools.excel.enums.ExcelType;
+import com.qmth.boot.tools.io.IOUtils;
+import com.qmth.boot.tools.signature.SignatureType;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotNull;
+import java.io.*;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> implements StudentService {

+ 8 - 15
src/main/java/cn/com/qmth/scancentral/service/impl/SubjectServiceImpl.java

@@ -1,20 +1,5 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
-import com.qmth.boot.core.exception.ParameterException;
-
 import cn.com.qmth.scancentral.bean.ImportSubjectDomain;
 import cn.com.qmth.scancentral.bean.SubjectConfigDomain;
 import cn.com.qmth.scancentral.bean.User;
@@ -23,6 +8,14 @@ import cn.com.qmth.scancentral.entity.SubjectEntity;
 import cn.com.qmth.scancentral.service.SubjectService;
 import cn.com.qmth.scancentral.vo.SubjectConfigVo;
 import cn.com.qmth.scancentral.vo.examinfo.SubjectConfig;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
+import com.qmth.boot.core.exception.ParameterException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
 
 @Service
 public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity> implements SubjectService {

+ 9 - 14
src/main/java/cn/com/qmth/scancentral/service/impl/UploadServiceImpl.java

@@ -1,19 +1,5 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import cn.com.qmth.scancentral.bean.SchoolSession;
 import cn.com.qmth.scancentral.consumer.UploadConsumer;
 import cn.com.qmth.scancentral.enums.SystemMode;
@@ -22,6 +8,15 @@ import cn.com.qmth.scancentral.service.StudentService;
 import cn.com.qmth.scancentral.service.UploadService;
 import cn.com.qmth.scancentral.support.SpringContextHolder;
 import cn.com.qmth.scancentral.vo.StudentUploadVo;
+import org.apache.commons.collections4.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.*;
 
 @Service
 public class UploadServiceImpl implements UploadService {

+ 14 - 16
src/main/java/cn/com/qmth/scancentral/service/impl/UserServiceImpl.java

@@ -1,21 +1,5 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import cn.com.qmth.scancentral.vo.UserVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.boot.core.exception.ParameterException;
-
 import cn.com.qmth.scancentral.bean.ImportUserDomain;
 import cn.com.qmth.scancentral.dao.UserDao;
 import cn.com.qmth.scancentral.entity.UserEntity;
@@ -25,6 +9,20 @@ import cn.com.qmth.scancentral.service.UserService;
 import cn.com.qmth.scancentral.vo.AuditorVo;
 import cn.com.qmth.scancentral.vo.CreateCountVo;
 import cn.com.qmth.scancentral.vo.UpdateCountVo;
+import cn.com.qmth.scancentral.vo.UserVo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.boot.core.exception.ParameterException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 @Service
 public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements UserService {

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/util/BatchGetDataUtil.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.scancentral.util;
 
+import org.apache.commons.collections4.CollectionUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.collections4.CollectionUtils;
-
 /**
  * 多次批量获取数据
  * 

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/util/DateUtil.java

@@ -1,13 +1,13 @@
 package cn.com.qmth.scancentral.util;
 
+import com.qmth.boot.core.exception.StatusException;
+
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
-import com.qmth.boot.core.exception.StatusException;
-
 /**
  * 日期工具
  * 

+ 2 - 4
src/main/java/cn/com/qmth/scancentral/util/ExamStatusConvertor.java

@@ -1,11 +1,9 @@
 package cn.com.qmth.scancentral.util;
 
-import org.apache.poi.ss.usermodel.Cell;
-
+import cn.com.qmth.scancentral.enums.ExamStatus;
 import com.qmth.boot.tools.excel.convertor.ValueConvertor;
 import com.qmth.boot.tools.excel.model.FieldParam;
-
-import cn.com.qmth.scancentral.enums.ExamStatus;
+import org.apache.poi.ss.usermodel.Cell;
 
 public class ExamStatusConvertor implements ValueConvertor<ExamStatus> {
 

+ 2 - 10
src/main/java/cn/com/qmth/scancentral/util/FileUtil.java

@@ -1,17 +1,9 @@
 package cn.com.qmth.scancentral.util;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
 import com.qmth.boot.core.exception.StatusException;
 
+import java.io.*;
+
 public class FileUtil {
 
     public static String readFileContent(InputStream in) {

+ 3 - 4
src/main/java/cn/com/qmth/scancentral/util/MD5Util.java

@@ -1,5 +1,8 @@
 package cn.com.qmth.scancentral.util;
 
+import cn.com.qmth.scancentral.support.ScanConstants;
+import org.apache.commons.codec.digest.DigestUtils;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -9,10 +12,6 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Optional;
 import java.util.StringJoiner;
 
-import org.apache.commons.codec.digest.DigestUtils;
-
-import cn.com.qmth.scancentral.support.ScanConstants;
-
 /**
  * @Description: MD5加密工具类
  */

+ 3 - 3
src/main/java/cn/com/qmth/scancentral/util/PageUtil.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.scancentral.util;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.core.collection.PageResult;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class PageUtil {
 
     public static <T> PageResult<T> of(IPage<T> iPage) {

+ 2 - 4
src/main/java/cn/com/qmth/scancentral/util/ScanStatusConvertor.java

@@ -1,11 +1,9 @@
 package cn.com.qmth.scancentral.util;
 
-import org.apache.poi.ss.usermodel.Cell;
-
+import cn.com.qmth.scancentral.enums.ScanStatus;
 import com.qmth.boot.tools.excel.convertor.ValueConvertor;
 import com.qmth.boot.tools.excel.model.FieldParam;
-
-import cn.com.qmth.scancentral.enums.ScanStatus;
+import org.apache.poi.ss.usermodel.Cell;
 
 public class ScanStatusConvertor implements ValueConvertor<ScanStatus> {
 

+ 3 - 4
src/main/java/cn/com/qmth/scancentral/util/ServletUtil.java

@@ -1,12 +1,11 @@
 package cn.com.qmth.scancentral.util;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import cn.com.qmth.scancentral.bean.User;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import cn.com.qmth.scancentral.bean.User;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * servlet 工具

+ 3 - 4
src/main/java/cn/com/qmth/scancentral/util/ThreadLocalUtil.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.scancentral.util;
 
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.common.collect.Maps;
 import com.qmth.boot.tools.uuid.FastUUID;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Map;
 
 /**
  * 线程本地化工具

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/vo/AnswerCardVo.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.scancentral.vo;
 
-import java.util.List;
-
 import cn.com.qmth.scancentral.entity.AdapteFileEntity;
 import cn.com.qmth.scancentral.entity.AnswerCardEntity;
 import cn.com.qmth.scancentral.enums.CardSource;
 
+import java.util.List;
+
 public class AnswerCardVo {
 
     private Integer number;

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/vo/AnswerExportK12Vo.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.scancentral.vo;
 
-import com.qmth.boot.tools.excel.annotation.ExcelColumn;
-
 import cn.com.qmth.scancentral.enums.ExamStatus;
 import cn.com.qmth.scancentral.enums.ScanStatus;
 import cn.com.qmth.scancentral.util.ExamStatusConvertor;
 import cn.com.qmth.scancentral.util.ScanStatusConvertor;
+import com.qmth.boot.tools.excel.annotation.ExcelColumn;
 
 public class AnswerExportK12Vo {
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/vo/AnswerExportVo.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.scancentral.vo;
 
-import com.qmth.boot.tools.excel.annotation.ExcelColumn;
-
 import cn.com.qmth.scancentral.enums.ExamStatus;
 import cn.com.qmth.scancentral.enums.ScanStatus;
 import cn.com.qmth.scancentral.util.ExamStatusConvertor;
 import cn.com.qmth.scancentral.util.ScanStatusConvertor;
+import com.qmth.boot.tools.excel.annotation.ExcelColumn;
 
 public class AnswerExportVo {
 

+ 3 - 3
src/main/java/cn/com/qmth/scancentral/vo/ExamInitVo.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.scancentral.vo;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import cn.com.qmth.scancentral.vo.examinfo.ExamConfig;
 import cn.com.qmth.scancentral.vo.examinfo.SubjectConfig;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class ExamInitVo {
 
     private Long id;

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/vo/ExportCetVo.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.scancentral.vo;
 
-import java.util.List;
-
 import cn.com.qmth.scancentral.enums.ExamStatus;
 
+import java.util.List;
+
 public class ExportCetVo {
 
     private Long examId;

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/vo/SubjectConfigVo.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.scancentral.vo;
 
-import java.util.List;
-
 import cn.com.qmth.scancentral.entity.SubjectEntity;
 
+import java.util.List;
+
 public class SubjectConfigVo {
 
     private List<String> paperTypeBarcodeContent;

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/vo/answerquery/AnswerPageVo.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.scancentral.vo.answerquery;
 
-import java.util.List;
-
 import cn.com.qmth.scancentral.bean.answersave.ArrayResult;
 import cn.com.qmth.scancentral.bean.answersave.BoolResult;
 import cn.com.qmth.scancentral.bean.answersave.StringResult;
 
+import java.util.List;
+
 public class AnswerPageVo {
 
     private Integer index;

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/vo/answerquery/AnswerPaperVo.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.scancentral.vo.answerquery;
 
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import java.util.List;
+
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class AnswerPaperVo {
 

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/vo/answerquery/AnswerQueryVo.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.scancentral.vo.answerquery;
 
-import java.util.List;
-
 import cn.com.qmth.scancentral.enums.ExamStatus;
 import cn.com.qmth.scancentral.enums.ScanStatus;
 
+import java.util.List;
+
 public class AnswerQueryVo {
 
     private Long id;

+ 2 - 3
src/main/java/cn/com/qmth/scancentral/vo/batchdetail/BatchDetailDO.java

@@ -1,11 +1,10 @@
 package cn.com.qmth.scancentral.vo.batchdetail;
 
-import java.util.List;
-
+import cn.com.qmth.scancentral.bean.answersave.BoolResult;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 
-import cn.com.qmth.scancentral.bean.answersave.BoolResult;
+import java.util.List;
 
 public class BatchDetailDO {
 

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/vo/examinfo/SubjectConfig.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.scancentral.vo.examinfo;
 
-import java.util.List;
-
 import cn.com.qmth.scancentral.entity.SubjectEntity;
 
+import java.util.List;
+
 public class SubjectConfig {
 
     private List<String> paperTypeBarcodeContent;

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/vo/paper/PaperPageCetVo.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.scancentral.vo.paper;
 
-import java.util.List;
-
 import cn.com.qmth.scancentral.bean.answersave.ArrayResult;
 import cn.com.qmth.scancentral.bean.answersave.BoolResult;
 import cn.com.qmth.scancentral.bean.answersave.StringResult;
 
+import java.util.List;
+
 public class PaperPageCetVo {
 
     private Long id;

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/vo/scannerinfo/ScannerInfoCard.java

@@ -1,9 +1,9 @@
 package cn.com.qmth.scancentral.vo.scannerinfo;
 
-import java.util.List;
-
 import cn.com.qmth.scancentral.vo.SubjectVo;
 
+import java.util.List;
+
 public class ScannerInfoCard {
 
     private Integer number;

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä