xiatian 9 сар өмнө
parent
commit
4cbb690050
100 өөрчлөгдсөн 731 нэмэгдсэн , 703 устгасан
  1. 2 3
      src/main/java/cn/com/qmth/scancentral/bean/BatchCreateDomain.java
  2. 31 22
      src/main/java/cn/com/qmth/scancentral/bean/CardAnswerDomain.java
  3. 17 24
      src/main/java/cn/com/qmth/scancentral/bean/ImportStudentDomain.java
  4. 8 10
      src/main/java/cn/com/qmth/scancentral/bean/ImportUserDomain.java
  5. 26 19
      src/main/java/cn/com/qmth/scancentral/bean/OmrTaskDto.java
  6. 46 36
      src/main/java/cn/com/qmth/scancentral/bean/OmrTaskPageDto.java
  7. 11 17
      src/main/java/cn/com/qmth/scancentral/bean/SchoolSession.java
  8. 0 1
      src/main/java/cn/com/qmth/scancentral/bean/SubjectConfigDomain.java
  9. 31 22
      src/main/java/cn/com/qmth/scancentral/bean/WorkloadDomain.java
  10. 14 14
      src/main/java/cn/com/qmth/scancentral/bean/answersave/ArrayResult.java
  11. 14 14
      src/main/java/cn/com/qmth/scancentral/bean/answersave/BoolResult.java
  12. 2 4
      src/main/java/cn/com/qmth/scancentral/bean/answertask/ReleaseVo.java
  13. 3 3
      src/main/java/cn/com/qmth/scancentral/bean/answertask/StudentAnswerTaskPaperVo.java
  14. 0 7
      src/main/java/cn/com/qmth/scancentral/bean/answertask/StudentAnswerTaskSaveVo.java
  15. 0 5
      src/main/java/cn/com/qmth/scancentral/bean/answertask/StudentAnswerTaskStatusVo.java
  16. 8 8
      src/main/java/cn/com/qmth/scancentral/bean/card/CardFile.java
  17. 1 1
      src/main/java/cn/com/qmth/scancentral/bean/refix/PageRefixDomain.java
  18. 20 20
      src/main/java/cn/com/qmth/scancentral/config/FillMetaObjectHandler.java
  19. 0 1
      src/main/java/cn/com/qmth/scancentral/config/MyBatisPlusConfig.java
  20. 21 18
      src/main/java/cn/com/qmth/scancentral/consumer/PictureCopyConsumer.java
  21. 21 18
      src/main/java/cn/com/qmth/scancentral/consumer/UploadConsumer.java
  22. 3 3
      src/main/java/cn/com/qmth/scancentral/controller/SystemController.java
  23. 4 3
      src/main/java/cn/com/qmth/scancentral/controller/admin/ArbitrateController.java
  24. 1 0
      src/main/java/cn/com/qmth/scancentral/controller/admin/AssignedCheckController.java
  25. 3 2
      src/main/java/cn/com/qmth/scancentral/controller/admin/AuthController.java
  26. 1 1
      src/main/java/cn/com/qmth/scancentral/controller/admin/ExamController.java
  27. 10 3
      src/main/java/cn/com/qmth/scancentral/controller/admin/ExamStatusCheckController.java
  28. 2 3
      src/main/java/cn/com/qmth/scancentral/controller/admin/OmrGroupController.java
  29. 5 5
      src/main/java/cn/com/qmth/scancentral/controller/admin/ToolController.java
  30. 3 3
      src/main/java/cn/com/qmth/scancentral/controller/scan/AnswerController.java
  31. 4 3
      src/main/java/cn/com/qmth/scancentral/controller/scan/OmrTaskController.java
  32. 2 2
      src/main/java/cn/com/qmth/scancentral/controller/scan/ScanExamController.java
  33. 5 3
      src/main/java/cn/com/qmth/scancentral/dao/BatchDao.java
  34. 1 1
      src/main/java/cn/com/qmth/scancentral/dao/BatchPaperDao.java
  35. 2 1
      src/main/java/cn/com/qmth/scancentral/dao/OmrGroupDao.java
  36. 3 2
      src/main/java/cn/com/qmth/scancentral/dao/OmrTaskDao.java
  37. 1 1
      src/main/java/cn/com/qmth/scancentral/dao/PaperDao.java
  38. 1 2
      src/main/java/cn/com/qmth/scancentral/dao/PaperPageDao.java
  39. 1 1
      src/main/java/cn/com/qmth/scancentral/dao/PaperStructureDao.java
  40. 2 1
      src/main/java/cn/com/qmth/scancentral/dao/ScannerDao.java
  41. 3 3
      src/main/java/cn/com/qmth/scancentral/dao/StudentPaperDao.java
  42. 3 3
      src/main/java/cn/com/qmth/scancentral/entity/AdapteFileEntity.java
  43. 7 8
      src/main/java/cn/com/qmth/scancentral/entity/AnswerCardEntity.java
  44. 1 1
      src/main/java/cn/com/qmth/scancentral/entity/AnswerCardSubjectEntity.java
  45. 2 2
      src/main/java/cn/com/qmth/scancentral/entity/AssignedCheckHistoryEntity.java
  46. 1 1
      src/main/java/cn/com/qmth/scancentral/entity/BatchEntity.java
  47. 3 3
      src/main/java/cn/com/qmth/scancentral/entity/BatchPaperEntity.java
  48. 6 5
      src/main/java/cn/com/qmth/scancentral/entity/ExamEntity.java
  49. 19 22
      src/main/java/cn/com/qmth/scancentral/entity/FilePropertyEntity.java
  50. 1 1
      src/main/java/cn/com/qmth/scancentral/entity/OmrTaskEntity.java
  51. 3 1
      src/main/java/cn/com/qmth/scancentral/entity/PackageResultEntity.java
  52. 3 3
      src/main/java/cn/com/qmth/scancentral/entity/PaperPageEntity.java
  53. 75 58
      src/main/java/cn/com/qmth/scancentral/entity/PaperStructureEntity.java
  54. 0 16
      src/main/java/cn/com/qmth/scancentral/entity/QuestionEntity.java
  55. 1 1
      src/main/java/cn/com/qmth/scancentral/entity/RefixBatchEntity.java
  56. 57 45
      src/main/java/cn/com/qmth/scancentral/entity/UserEntity.java
  57. 0 1
      src/main/java/cn/com/qmth/scancentral/entity/base/AuditingEntity.java
  58. 0 1
      src/main/java/cn/com/qmth/scancentral/entity/base/AuditingWithoutIdEntity.java
  59. 0 2
      src/main/java/cn/com/qmth/scancentral/entity/base/IdEntity.java
  60. 2 1
      src/main/java/cn/com/qmth/scancentral/enums/CheckStatus.java
  61. 3 7
      src/main/java/cn/com/qmth/scancentral/enums/ConditionType.java
  62. 1 1
      src/main/java/cn/com/qmth/scancentral/enums/ExamMode.java
  63. 1 4
      src/main/java/cn/com/qmth/scancentral/enums/ExamStatus.java
  64. 4 8
      src/main/java/cn/com/qmth/scancentral/enums/FileType.java
  65. 2 6
      src/main/java/cn/com/qmth/scancentral/enums/GroupType.java
  66. 8 13
      src/main/java/cn/com/qmth/scancentral/enums/LockType.java
  67. 1 4
      src/main/java/cn/com/qmth/scancentral/enums/PaperTypeStatus.java
  68. 4 4
      src/main/java/cn/com/qmth/scancentral/enums/UploadStatus.java
  69. 1 2
      src/main/java/cn/com/qmth/scancentral/enums/VerifyStatus.java
  70. 2 1
      src/main/java/cn/com/qmth/scancentral/exception/ForbiddenExceptions.java
  71. 7 7
      src/main/java/cn/com/qmth/scancentral/exception/NotFoundExceptions.java
  72. 6 3
      src/main/java/cn/com/qmth/scancentral/exception/UnauthorizedExceptions.java
  73. 13 12
      src/main/java/cn/com/qmth/scancentral/handle/ListTypeHandler.java
  74. 5 5
      src/main/java/cn/com/qmth/scancentral/handle/OmrTaskPageListTypeHandler.java
  75. 5 5
      src/main/java/cn/com/qmth/scancentral/handle/QueryConditionListTypeHandler.java
  76. 4 8
      src/main/java/cn/com/qmth/scancentral/model/AnswerCardInfo.java
  77. 21 17
      src/main/java/cn/com/qmth/scancentral/model/DataUploadResponse.java
  78. 1 3
      src/main/java/cn/com/qmth/scancentral/model/ExamInfoDto.java
  79. 51 36
      src/main/java/cn/com/qmth/scancentral/model/FileUploadDto.java
  80. 21 16
      src/main/java/cn/com/qmth/scancentral/model/FileUploadResponse.java
  81. 16 17
      src/main/java/cn/com/qmth/scancentral/model/QueryCondition.java
  82. 1 1
      src/main/java/cn/com/qmth/scancentral/service/AdapteFileService.java
  83. 1 1
      src/main/java/cn/com/qmth/scancentral/service/AnswerCardService.java
  84. 2 2
      src/main/java/cn/com/qmth/scancentral/service/AssignedCheckHistoryService.java
  85. 9 11
      src/main/java/cn/com/qmth/scancentral/service/AuthService.java
  86. 2 2
      src/main/java/cn/com/qmth/scancentral/service/BatchPaperService.java
  87. 1 1
      src/main/java/cn/com/qmth/scancentral/service/ExamService.java
  88. 1 2
      src/main/java/cn/com/qmth/scancentral/service/FilePropertyService.java
  89. 3 3
      src/main/java/cn/com/qmth/scancentral/service/OmrGroupService.java
  90. 2 2
      src/main/java/cn/com/qmth/scancentral/service/OmrTaskService.java
  91. 1 1
      src/main/java/cn/com/qmth/scancentral/service/PackageCardService.java
  92. 1 1
      src/main/java/cn/com/qmth/scancentral/service/PackageResultService.java
  93. 1 1
      src/main/java/cn/com/qmth/scancentral/service/PaperPageService.java
  94. 1 1
      src/main/java/cn/com/qmth/scancentral/service/QuestionService.java
  95. 1 1
      src/main/java/cn/com/qmth/scancentral/service/ScannerCardService.java
  96. 3 3
      src/main/java/cn/com/qmth/scancentral/service/ScannerService.java
  97. 1 1
      src/main/java/cn/com/qmth/scancentral/service/SessionService.java
  98. 2 2
      src/main/java/cn/com/qmth/scancentral/service/SubjectService.java
  99. 3 2
      src/main/java/cn/com/qmth/scancentral/service/ToolExportService.java
  100. 1 1
      src/main/java/cn/com/qmth/scancentral/service/UploadService.java

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

@@ -12,7 +12,7 @@ public class BatchCreateDomain {
     @NotNull(message = "准考证号不能为空")
     @Size(min = 1, message = "准考证号不能为空")
     private List<String> examNumbers;
-    
+
     private String subjectCode;
 
     public Long getExamId() {
@@ -31,11 +31,10 @@ public class BatchCreateDomain {
         this.examNumbers = examNumbers;
     }
 
-    
     public String getSubjectCode() {
         return subjectCode;
     }
-    
+
     public void setSubjectCode(String subjectCode) {
         this.subjectCode = subjectCode;
     }

+ 31 - 22
src/main/java/cn/com/qmth/scancentral/bean/CardAnswerDomain.java

@@ -3,26 +3,35 @@ package cn.com.qmth.scancentral.bean;
 import java.util.List;
 
 public class CardAnswerDomain {
-	private Long examId;
-	private List<String> device;
-	private Integer cardNumber;
-	public Long getExamId() {
-		return examId;
-	}
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-	public List<String> getDevice() {
-		return device;
-	}
-	public void setDevice(List<String> device) {
-		this.device = device;
-	}
-	public Integer getCardNumber() {
-		return cardNumber;
-	}
-	public void setCardNumber(Integer cardNumber) {
-		this.cardNumber = cardNumber;
-	}
-	
+
+    private Long examId;
+
+    private List<String> device;
+
+    private Integer cardNumber;
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public List<String> getDevice() {
+        return device;
+    }
+
+    public void setDevice(List<String> device) {
+        this.device = device;
+    }
+
+    public Integer getCardNumber() {
+        return cardNumber;
+    }
+
+    public void setCardNumber(Integer cardNumber) {
+        this.cardNumber = cardNumber;
+    }
+
 }

+ 17 - 24
src/main/java/cn/com/qmth/scancentral/bean/ImportStudentDomain.java

@@ -3,16 +3,27 @@ package cn.com.qmth.scancentral.bean;
 public class ImportStudentDomain {
 
     private Long examId;
+
     private String subjectCode;
+
     private String subjectName;
+
     private String examNumber;
+
     private String name;
+
     private String packageCode;
+
     private String examSite;
+
     private String examSiteName;
+
     private String examRoom;
+
     private String seatNumber;
+
     private String campusName;
+
     private String campusCode;
 
     public Long getExamId() {
@@ -31,22 +42,18 @@ public class ImportStudentDomain {
         this.subjectCode = subjectCode;
     }
 
-    
     public String getExamNumber() {
         return examNumber;
     }
 
-    
     public void setExamNumber(String examNumber) {
         this.examNumber = examNumber;
     }
 
-    
     public String getName() {
         return name;
     }
 
-    
     public void setName(String name) {
         this.name = name;
     }
@@ -55,78 +62,64 @@ public class ImportStudentDomain {
         return packageCode;
     }
 
-    
     public void setPackageCode(String packageCode) {
         this.packageCode = packageCode;
     }
 
-    
     public String getExamSite() {
         return examSite;
     }
 
-    
     public void setExamSite(String examSite) {
         this.examSite = examSite;
     }
 
-    
     public String getExamRoom() {
         return examRoom;
     }
 
-    
     public void setExamRoom(String examRoom) {
         this.examRoom = examRoom;
     }
 
-    
     public String getSeatNumber() {
         return seatNumber;
     }
 
-    
     public void setSeatNumber(String seatNumber) {
         this.seatNumber = seatNumber;
     }
 
-    
     public String getCampusName() {
         return campusName;
     }
 
-    
     public void setCampusName(String campusName) {
         this.campusName = campusName;
     }
 
-	public String getSubjectName() {
-		return subjectName;
-	}
+    public String getSubjectName() {
+        return subjectName;
+    }
 
-	public void setSubjectName(String subjectName) {
-		this.subjectName = subjectName;
-	}
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
 
-    
     public String getExamSiteName() {
         return examSiteName;
     }
 
-    
     public void setExamSiteName(String examSiteName) {
         this.examSiteName = examSiteName;
     }
 
-    
     public String getCampusCode() {
         return campusCode;
     }
 
-    
     public void setCampusCode(String campusCode) {
         this.campusCode = campusCode;
     }
 
-
 }

+ 8 - 10
src/main/java/cn/com/qmth/scancentral/bean/ImportUserDomain.java

@@ -4,8 +4,8 @@ import cn.com.qmth.scancentral.enums.Role;
 
 public class ImportUserDomain {
 
-	private Long schoolId;
-	
+    private Long schoolId;
+
     private String name;
 
     private String loginName;
@@ -46,14 +46,12 @@ public class ImportUserDomain {
         this.role = role;
     }
 
-	public Long getSchoolId() {
-		return schoolId;
-	}
+    public Long getSchoolId() {
+        return schoolId;
+    }
 
-	public void setSchoolId(Long schoolId) {
-		this.schoolId = schoolId;
-	}
-    
-    
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
 
 }

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

@@ -6,23 +6,30 @@ import java.util.List;
 import cn.com.qmth.scancentral.entity.OmrTaskEntity;
 
 public class OmrTaskDto {
-	private OmrTaskEntity task;
-	List<OmrTaskPageDto> page=new ArrayList<>();
-	public OmrTaskDto(OmrTaskEntity task) {
-		super();
-		this.task = task;
-	}
-	public OmrTaskEntity getTask() {
-		return task;
-	}
-	public void setTask(OmrTaskEntity task) {
-		this.task = task;
-	}
-	public List<OmrTaskPageDto> getPage() {
-		return page;
-	}
-	public void setPage(List<OmrTaskPageDto> page) {
-		this.page = page;
-	}
-	
+
+    private OmrTaskEntity task;
+
+    List<OmrTaskPageDto> page = new ArrayList<>();
+
+    public OmrTaskDto(OmrTaskEntity task) {
+        super();
+        this.task = task;
+    }
+
+    public OmrTaskEntity getTask() {
+        return task;
+    }
+
+    public void setTask(OmrTaskEntity task) {
+        this.task = task;
+    }
+
+    public List<OmrTaskPageDto> getPage() {
+        return page;
+    }
+
+    public void setPage(List<OmrTaskPageDto> page) {
+        this.page = page;
+    }
+
 }

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

@@ -6,40 +6,50 @@ import java.util.List;
 import cn.com.qmth.scancentral.model.OmrTaskItem;
 
 public class OmrTaskPageDto {
-	private Integer pageIndex;
-	List<OmrTaskItem> items=new ArrayList<>();
-	List<OmrTaskItem> pageMultiBlankItems=new ArrayList<>();
-	List<OmrTaskItem> pageSingleBlankItems=new ArrayList<>();
-	
-	
-	public OmrTaskPageDto(Integer pageIndex) {
-		super();
-		this.pageIndex = pageIndex;
-	}
-	public Integer getPageIndex() {
-		return pageIndex;
-	}
-	public void setPageIndex(Integer pageIndex) {
-		this.pageIndex = pageIndex;
-	}
-	public List<OmrTaskItem> getItems() {
-		return items;
-	}
-	public void setItems(List<OmrTaskItem> items) {
-		this.items = items;
-	}
-	public List<OmrTaskItem> getPageMultiBlankItems() {
-		return pageMultiBlankItems;
-	}
-	public void setPageMultiBlankItems(List<OmrTaskItem> pageMultiBlankItems) {
-		this.pageMultiBlankItems = pageMultiBlankItems;
-	}
-	public List<OmrTaskItem> getPageSingleBlankItems() {
-		return pageSingleBlankItems;
-	}
-	public void setPageSingleBlankItems(List<OmrTaskItem> pageSingleBlankItems) {
-		this.pageSingleBlankItems = pageSingleBlankItems;
-	}
-
-	
+
+    private Integer pageIndex;
+
+    List<OmrTaskItem> items = new ArrayList<>();
+
+    List<OmrTaskItem> pageMultiBlankItems = new ArrayList<>();
+
+    List<OmrTaskItem> pageSingleBlankItems = new ArrayList<>();
+
+    public OmrTaskPageDto(Integer pageIndex) {
+        super();
+        this.pageIndex = pageIndex;
+    }
+
+    public Integer getPageIndex() {
+        return pageIndex;
+    }
+
+    public void setPageIndex(Integer pageIndex) {
+        this.pageIndex = pageIndex;
+    }
+
+    public List<OmrTaskItem> getItems() {
+        return items;
+    }
+
+    public void setItems(List<OmrTaskItem> items) {
+        this.items = items;
+    }
+
+    public List<OmrTaskItem> getPageMultiBlankItems() {
+        return pageMultiBlankItems;
+    }
+
+    public void setPageMultiBlankItems(List<OmrTaskItem> pageMultiBlankItems) {
+        this.pageMultiBlankItems = pageMultiBlankItems;
+    }
+
+    public List<OmrTaskItem> getPageSingleBlankItems() {
+        return pageSingleBlankItems;
+    }
+
+    public void setPageSingleBlankItems(List<OmrTaskItem> pageSingleBlankItems) {
+        this.pageSingleBlankItems = pageSingleBlankItems;
+    }
+
 }

+ 11 - 17
src/main/java/cn/com/qmth/scancentral/bean/SchoolSession.java

@@ -2,16 +2,15 @@ package cn.com.qmth.scancentral.bean;
 
 import cn.com.qmth.scancentral.enums.Role;
 
-public class SchoolSession{
+public class SchoolSession {
 
     private Long id;
 
     private String account;
 
     private Role role;
-    
-    private String markingCloudToken;
 
+    private String markingCloudToken;
 
     public String getAccount() {
         return account;
@@ -21,7 +20,6 @@ public class SchoolSession{
         this.account = account;
     }
 
-
     public Role getRole() {
         return role;
     }
@@ -30,7 +28,6 @@ public class SchoolSession{
         this.role = role;
     }
 
-
     public Long getId() {
         return id;
     }
@@ -39,24 +36,21 @@ public class SchoolSession{
         this.id = id;
     }
 
-
-    
     public String getMarkingCloudToken() {
         return markingCloudToken;
     }
 
-    
     public void setMarkingCloudToken(String markingCloudToken) {
         this.markingCloudToken = markingCloudToken;
     }
-    
+
     public static SchoolSession of(User user) {
-    	SchoolSession s=new SchoolSession();
-    	// s.setId(user.getSchoolId());
-    	s.setAccount(user.getAccount());
-    	s.setMarkingCloudToken(user.getMarkingCloudToken());
-    	s.setRole(user.getRole());
-    	return s;
-    }
-    
+        SchoolSession s = new SchoolSession();
+        // s.setId(user.getSchoolId());
+        s.setAccount(user.getAccount());
+        s.setMarkingCloudToken(user.getMarkingCloudToken());
+        s.setRole(user.getRole());
+        return s;
+    }
+
 }

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

@@ -18,7 +18,6 @@ public class SubjectConfigDomain {
         return examId;
     }
 
-    
     public void setExamId(Long examId) {
         this.examId = examId;
     }

+ 31 - 22
src/main/java/cn/com/qmth/scancentral/bean/WorkloadDomain.java

@@ -1,26 +1,35 @@
 package cn.com.qmth.scancentral.bean;
 
 public class WorkloadDomain {
-	private Long examId;
-	private Long startTime;
-	private Long endTime;
-	public Long getExamId() {
-		return examId;
-	}
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-	public Long getStartTime() {
-		return startTime;
-	}
-	public void setStartTime(Long startTime) {
-		this.startTime = startTime;
-	}
-	public Long getEndTime() {
-		return endTime;
-	}
-	public void setEndTime(Long endTime) {
-		this.endTime = endTime;
-	}
-	
+
+    private Long examId;
+
+    private Long startTime;
+
+    private Long endTime;
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Long getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Long startTime) {
+        this.startTime = startTime;
+    }
+
+    public Long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Long endTime) {
+        this.endTime = endTime;
+    }
+
 }

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

@@ -5,25 +5,25 @@ import java.util.List;
 import cn.com.qmth.scancentral.enums.OmrType;
 
 public class ArrayResult {
+
     private OmrType type;
 
     private List<String> result;
 
-	public OmrType getType() {
-		return type;
-	}
+    public OmrType getType() {
+        return type;
+    }
+
+    public void setType(OmrType type) {
+        this.type = type;
+    }
 
-	public void setType(OmrType type) {
-		this.type = type;
-	}
+    public List<String> getResult() {
+        return result;
+    }
 
-	public List<String> getResult() {
-		return result;
-	}
+    public void setResult(List<String> result) {
+        this.result = result;
+    }
 
-	public void setResult(List<String> result) {
-		this.result = result;
-	}
-    
-    
 }

+ 14 - 14
src/main/java/cn/com/qmth/scancentral/bean/answersave/BoolResult.java

@@ -3,25 +3,25 @@ package cn.com.qmth.scancentral.bean.answersave;
 import cn.com.qmth.scancentral.enums.OmrType;
 
 public class BoolResult {
+
     private OmrType type;
 
     private Boolean result;
 
-	public OmrType getType() {
-		return type;
-	}
+    public OmrType getType() {
+        return type;
+    }
+
+    public void setType(OmrType type) {
+        this.type = type;
+    }
 
-	public void setType(OmrType type) {
-		this.type = type;
-	}
+    public Boolean getResult() {
+        return result;
+    }
 
-	public Boolean getResult() {
-		return result;
-	}
+    public void setResult(Boolean result) {
+        this.result = result;
+    }
 
-	public void setResult(Boolean result) {
-		this.result = result;
-	}
-    
-    
 }

+ 2 - 4
src/main/java/cn/com/qmth/scancentral/bean/answertask/ReleaseVo.java

@@ -1,17 +1,15 @@
 package cn.com.qmth.scancentral.bean.answertask;
 
-
 public class ReleaseVo {
+
     private Boolean success;
 
-    
     public Boolean getSuccess() {
         return success;
     }
 
-    
     public void setSuccess(Boolean success) {
         this.success = success;
     }
-    
+
 }

+ 3 - 3
src/main/java/cn/com/qmth/scancentral/bean/answertask/StudentAnswerTaskPaperVo.java

@@ -34,10 +34,10 @@ public class StudentAnswerTaskPaperVo {
     public void setPages(List<StudentAnswerTaskPageVo> pages) {
         this.pages = pages;
     }
-    
+
     public void addPage(StudentAnswerTaskPageVo page) {
-        if(pages==null) {
-            pages=new ArrayList<>();
+        if (pages == null) {
+            pages = new ArrayList<>();
         }
         pages.add(page);
     }

+ 0 - 7
src/main/java/cn/com/qmth/scancentral/bean/answertask/StudentAnswerTaskSaveVo.java

@@ -6,27 +6,20 @@ public class StudentAnswerTaskSaveVo {
 
     private StudentAnswerTaskStatusVo status;
 
-    
     public Long getId() {
         return id;
     }
 
-    
     public void setId(Long id) {
         this.id = id;
     }
 
-    
     public StudentAnswerTaskStatusVo getStatus() {
         return status;
     }
 
-    
     public void setStatus(StudentAnswerTaskStatusVo status) {
         this.status = status;
     }
 
-    
-
-
 }

+ 0 - 5
src/main/java/cn/com/qmth/scancentral/bean/answertask/StudentAnswerTaskStatusVo.java

@@ -6,25 +6,20 @@ public class StudentAnswerTaskStatusVo {
 
     private Integer todoCount;
 
-    
     public Integer getFinishCount() {
         return finishCount;
     }
 
-    
     public void setFinishCount(Integer finishCount) {
         this.finishCount = finishCount;
     }
 
-    
     public Integer getTodoCount() {
         return todoCount;
     }
 
-    
     public void setTodoCount(Integer todoCount) {
         this.todoCount = todoCount;
     }
 
-
 }

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

@@ -27,7 +27,7 @@ public class CardFile {
 
     @JsonIgnore
     private SliceConfig sliceConfig;
-    
+
     @JsonIgnore
     private List<String> sliceName;
 
@@ -68,14 +68,14 @@ public class CardFile {
                 for (CardPageWrapper pageWrapper : pages) {
                     pageNumber++;
                     CardPage page = pageWrapper.getExchange();
-                    //遮盖模式
+                    // 遮盖模式
                     if (page.getInfoArea() != null && page.getInfoArea().length > 0) {
                         sliceConfig.addConfig(pageNumber, 0, 0, 0, 0);
                     }
-                    //裁切模式
+                    // 裁切模式
                     else if (page.getAnswerArea() != null && !page.getAnswerArea().isEmpty()) {
-                        //获取卡格式图片原始尺寸
-                        //此处图片base64编码特殊,需要采用Mime标准
+                        // 获取卡格式图片原始尺寸
+                        // 此处图片base64编码特殊,需要采用Mime标准
                         Image image = ImageIO
                                 .read(new ByteArrayInputStream(Base64.getMimeDecoder().decode(page.getPageImage())));
                         int width = image.getWidth(null);
@@ -91,14 +91,14 @@ public class CardFile {
         }
         return sliceConfig;
     }
-    
+
     public List<String> getSliceName() throws IOException {
-        List<String> sliceName=new LinkedList<String>();
+        List<String> sliceName = new LinkedList<String>();
         if (pages != null) {
             for (CardPageWrapper pageWrapper : pages) {
                 CardPage page = pageWrapper.getExchange();
                 for (AnswerArea area : page.getAnswerArea()) {
-                    if(area.getMainNumber()==null) {
+                    if (area.getMainNumber() == null) {
                         throw new ParameterException("CET模式下裁切图必须指定大题号");
                     }
                     sliceName.add(area.getMainNumber().toString());

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

@@ -94,7 +94,7 @@ public class PageRefixDomain {
         this.recogData = recogData;
     }
 
-    public PaperPageEntity update(PaperPageEntity page,List<String> barcodeContents) {
+    public PaperPageEntity update(PaperPageEntity page, List<String> barcodeContents) {
         page.setSlicePath(sliceUri);
         page.setAbsent(absent);
         page.setBreach(breach);

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

@@ -11,25 +11,25 @@ import cn.com.qmth.scancentral.util.ServletUtil;
 
 public class FillMetaObjectHandler implements MetaObjectHandler {
 
-	@Override
-	public void insertFill(MetaObject metaObject) {
-		User user = ServletUtil.getSessionUser();
-		if (user != null) {
-			this.setFieldValByName("creatorId", user.getId(), metaObject);
-		}
-		if(this.getFieldValByName("createTime", metaObject)==null) {
-			this.setFieldValByName("createTime", new Date().getTime(), metaObject);
-		}
-		this.setFieldValByName("updateTime", new Date().getTime(), metaObject);
-	}
-
-	@Override
-	public void updateFill(MetaObject metaObject) {
-		User user = ServletUtil.getSessionUser();
-		if (user != null) {
-			this.setFieldValByName("updaterId", user.getId(), metaObject);
-		}
-		this.setFieldValByName("updateTime", new Date().getTime(), metaObject);
-	}
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        User user = ServletUtil.getSessionUser();
+        if (user != null) {
+            this.setFieldValByName("creatorId", user.getId(), metaObject);
+        }
+        if (this.getFieldValByName("createTime", metaObject) == null) {
+            this.setFieldValByName("createTime", new Date().getTime(), metaObject);
+        }
+        this.setFieldValByName("updateTime", new Date().getTime(), metaObject);
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        User user = ServletUtil.getSessionUser();
+        if (user != null) {
+            this.setFieldValByName("updaterId", user.getId(), metaObject);
+        }
+        this.setFieldValByName("updateTime", new Date().getTime(), metaObject);
+    }
 
 }

+ 0 - 1
src/main/java/cn/com/qmth/scancentral/config/MyBatisPlusConfig.java

@@ -6,7 +6,6 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class MyBatisPlusConfig {
 
-
     @Bean
     public FillMetaObjectHandler metaObjectHandler() {
         return new FillMetaObjectHandler();

+ 21 - 18
src/main/java/cn/com/qmth/scancentral/consumer/PictureCopyConsumer.java

@@ -12,34 +12,37 @@ import cn.com.qmth.scancentral.vo.StudentUploadVo;
 @Scope("prototype")
 @Service
 public class PictureCopyConsumer implements Runnable {
-	private CountDownLatch endGate;
+
+    private CountDownLatch endGate;
+
     private StudentUploadVo vo;
+
     @Autowired
     private StudentService studentService;
 
     @Override
     public void run() {
-    	try {
-			studentService.pictureCopy(vo);
-		} finally {
-			endGate.countDown();
-		}
+        try {
+            studentService.pictureCopy(vo);
+        } finally {
+            endGate.countDown();
+        }
     }
 
-	public StudentUploadVo getVo() {
-		return vo;
-	}
+    public StudentUploadVo getVo() {
+        return vo;
+    }
 
-	public void setVo(StudentUploadVo vo) {
-		this.vo = vo;
-	}
+    public void setVo(StudentUploadVo vo) {
+        this.vo = vo;
+    }
 
-	public CountDownLatch getEndGate() {
-		return endGate;
-	}
+    public CountDownLatch getEndGate() {
+        return endGate;
+    }
 
-	public void setEndGate(CountDownLatch endGate) {
-		this.endGate = endGate;
-	}
+    public void setEndGate(CountDownLatch endGate) {
+        this.endGate = endGate;
+    }
 
 }

+ 21 - 18
src/main/java/cn/com/qmth/scancentral/consumer/UploadConsumer.java

@@ -12,34 +12,37 @@ import cn.com.qmth.scancentral.vo.StudentUploadVo;
 @Scope("prototype")
 @Service
 public class UploadConsumer implements Runnable {
-	private CountDownLatch endGate;
+
+    private CountDownLatch endGate;
+
     private StudentUploadVo vo;
+
     @Autowired
     private StudentService studentService;
 
     @Override
     public void run() {
-    	try {
-			studentService.uploadData(vo);
-		} finally {
-			endGate.countDown();
-		}
+        try {
+            studentService.uploadData(vo);
+        } finally {
+            endGate.countDown();
+        }
     }
 
-	public StudentUploadVo getVo() {
-		return vo;
-	}
+    public StudentUploadVo getVo() {
+        return vo;
+    }
 
-	public void setVo(StudentUploadVo vo) {
-		this.vo = vo;
-	}
+    public void setVo(StudentUploadVo vo) {
+        this.vo = vo;
+    }
 
-	public CountDownLatch getEndGate() {
-		return endGate;
-	}
+    public CountDownLatch getEndGate() {
+        return endGate;
+    }
 
-	public void setEndGate(CountDownLatch endGate) {
-		this.endGate = endGate;
-	}
+    public void setEndGate(CountDownLatch endGate) {
+        this.endGate = endGate;
+    }
 
 }

+ 3 - 3
src/main/java/cn/com/qmth/scancentral/controller/SystemController.java

@@ -52,7 +52,7 @@ public class SystemController extends BaseController {
 
     @Autowired
     private AdapteFileService adapteFileService;
-    
+
     @Autowired
     private AnswerCardSubjectService answerCardSubjectService;
 
@@ -103,8 +103,8 @@ public class SystemController extends BaseController {
         AnswerCardVo vo = new AnswerCardVo(card);
         User user = getAccessUser();
         if (user.getRole().equals(Role.SCANNER)) {
-            vo.setAdapteFile(adapteFileService
-                    .listByExamIdAndCardNumberForScanner(examId, number, RequestUtil.getIpAddress(request)));
+            vo.setAdapteFile(adapteFileService.listByExamIdAndCardNumberForScanner(examId, number,
+                    RequestUtil.getIpAddress(request)));
         } else {
             vo.setAdapteFile(adapteFileService.listByExamIdAndCardNumber(examId, card.getNumber()));
         }

+ 4 - 3
src/main/java/cn/com/qmth/scancentral/controller/admin/ArbitrateController.java

@@ -61,11 +61,12 @@ public class ArbitrateController extends BaseController {
         omrTaskService.releaseByUser(examId, user.getAccount());
         return success(true);
     }
-    
+
     @ApiOperation(value = "识别对照仲裁任务历史")
     @RequestMapping(value = "/history", method = RequestMethod.POST)
-    public TaskVo history(@RequestParam Long examId,@RequestParam(required = false) Long id,@RequestParam(required = false) Boolean next) {
+    public TaskVo history(@RequestParam Long examId, @RequestParam(required = false) Long id,
+            @RequestParam(required = false) Boolean next) {
         User user = getAccessUser();
-        return omrTaskService.getArbitrateHistory(examId, id, user.getAccount(),next);
+        return omrTaskService.getArbitrateHistory(examId, id, user.getAccount(), next);
     }
 }

+ 1 - 0
src/main/java/cn/com/qmth/scancentral/controller/admin/AssignedCheckController.java

@@ -59,6 +59,7 @@ public class AssignedCheckController extends BaseController {
         User user = getAccessUser();
         ExcelWriter writer = ExcelWriter.create(ExcelType.XLSX);
         PageListIterator<AssignedCheckExport> iterator = new PageListIterator<AssignedCheckExport>(100) {
+
             @Override
             public Collection<AssignedCheckExport> getPageList(int pageNumber, int pageSize) {
                 query1.setPageNumber(pageNumber);

+ 3 - 2
src/main/java/cn/com/qmth/scancentral/controller/admin/AuthController.java

@@ -27,8 +27,9 @@ public class AuthController extends BaseController {
 
     @ApiOperation(value = "管理员登录")
     @PostMapping("/login")
-    public AdminLoginVo login(@RequestParam String loginName, @RequestParam String password, HttpServletRequest request) {
-        return AdminLoginVo.of(authService.adminLogin(loginName, password,RequestUtil.getIpAddress(request)));
+    public AdminLoginVo login(@RequestParam String loginName, @RequestParam String password,
+            HttpServletRequest request) {
+        return AdminLoginVo.of(authService.adminLogin(loginName, password, RequestUtil.getIpAddress(request)));
     }
 
 }

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/controller/admin/ExamController.java

@@ -121,7 +121,7 @@ public class ExamController extends BaseController {
     @RequestMapping(value = "/syncVerify", method = RequestMethod.POST)
     public Map<String, Object> syncVerify(@RequestParam Long examId, @RequestParam Boolean enable) {
         User user = getAccessUser();
-        ExamEntity exam = examService.updateEnableSyncVerify(user,examId, enable);
+        ExamEntity exam = examService.updateEnableSyncVerify(user, examId, enable);
         Map<String, Object> result = new HashMap<String, Object>();
         result.put("enable", enable);
         result.put("updateTime", exam.getUpdateTime());

+ 10 - 3
src/main/java/cn/com/qmth/scancentral/controller/admin/ExamStatusCheckController.java

@@ -44,10 +44,13 @@ public class ExamStatusCheckController extends BaseController {
 
     @Autowired
     private StudentService studentService;
+
     @Resource
     private ConcurrentService concurrentService;
+
     @Autowired
     private ExamService examService;
+
     @Autowired
     private AsyncTaskExecutor taskExecutor;
 
@@ -66,7 +69,8 @@ public class ExamStatusCheckController extends BaseController {
 
     @ApiOperation(value = "导入")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
-    public JSONObject importFile(@RequestParam Long examId, @RequestParam ExamStatusCheckMode mode, @RequestParam MultipartFile file) throws IOException {
+    public JSONObject importFile(@RequestParam Long examId, @RequestParam ExamStatusCheckMode mode,
+            @RequestParam MultipartFile file) throws IOException {
         User user = getAccessUser();
         ExamEntity exam = examService.getById(examId);
         if (exam == null) {
@@ -74,7 +78,8 @@ public class ExamStatusCheckController extends BaseController {
         }
 
         if (!concurrentService.isLocked(LockType.EXAM_STATUS_RESET + "-" + examId)) {
-            taskExecutor.submit(new ExamStatusImportThread( examId,mode, file.getInputStream(), studentService, concurrentService));
+            taskExecutor.submit(
+                    new ExamStatusImportThread(examId, mode, file.getInputStream(), studentService, concurrentService));
         } else {
             throw new ReentrantException("正在导入,请稍后再试");
         }
@@ -108,7 +113,8 @@ public class ExamStatusCheckController extends BaseController {
         }
 
         if (!concurrentService.isLocked(LockType.EXAM_STATUS_RESET + "-" + examId)) {
-            taskExecutor.submit(new ExamStatusResetThread( examId,examNumberFillCount, studentService, concurrentService));
+            taskExecutor
+                    .submit(new ExamStatusResetThread(examId, examNumberFillCount, studentService, concurrentService));
         } else {
             throw new ReentrantException("正在重新生成,请稍后再试");
         }
@@ -117,6 +123,7 @@ public class ExamStatusCheckController extends BaseController {
         result.put("synching", true);
         return result;
     }
+
     @ApiOperation(value = "重新生成状态")
     @RequestMapping(value = "/reset/status", method = RequestMethod.POST)
     public Map<String, Object> resetStatus(@RequestParam Long examId) {

+ 2 - 3
src/main/java/cn/com/qmth/scancentral/controller/admin/OmrGroupController.java

@@ -55,9 +55,8 @@ public class OmrGroupController extends BaseController {
     @ApiOperation(value = "创建修改识别对照任务组")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     public JSONObject save(@RequestBody OmrGroupUpdateVo omrGroupUpdateVo) {
-        OmrGroupEntity group = groupService
-                .save(omrGroupUpdateVo.getId(), omrGroupUpdateVo.getExamId(), omrGroupUpdateVo.getConditionList(),
-                        getAccessUser().getId());
+        OmrGroupEntity group = groupService.save(omrGroupUpdateVo.getId(), omrGroupUpdateVo.getExamId(),
+                omrGroupUpdateVo.getConditionList(), getAccessUser().getId());
         JSONObject result = new JSONObject();
         result.accumulate("id", group.getId());
         result.accumulate("updateTime", System.currentTimeMillis());

+ 5 - 5
src/main/java/cn/com/qmth/scancentral/controller/admin/ToolController.java

@@ -146,16 +146,16 @@ public class ToolController extends BaseController {
 
     @ApiOperation(value = "保存卡格式")
     @PostMapping("/import/card/save")
-    public Integer importCard(@RequestParam Long examId,
-                              @RequestParam String subjectCode, @RequestParam Integer paperCount,
-                              @RequestParam Boolean singlePage, @RequestParam String md5, @RequestParam(required = false) Integer dpi, @RequestParam MultipartFile file) {
+    public Integer importCard(@RequestParam Long examId, @RequestParam String subjectCode,
+            @RequestParam Integer paperCount, @RequestParam Boolean singlePage, @RequestParam String md5,
+            @RequestParam(required = false) Integer dpi, @RequestParam MultipartFile file) {
         if (!SystemMode.STANDALONE.equals(SystemMode.current())) {
             throw new ParameterException("非独立模式不可调用");
         }
         if (concurrentService.getLock(LockType.CARD_SYNC + "-" + examId).tryLock()) {
             try {
-                AnswerCardEntity card = answerCardService.save(null, examId, null, subjectCode,
-                        null, null, paperCount, singlePage, md5, dpi, file);
+                AnswerCardEntity card = answerCardService.save(null, examId, null, subjectCode, null, null, paperCount,
+                        singlePage, md5, dpi, file);
                 return card.getNumber();
             } finally {
                 concurrentService.getLock(LockType.CARD_SYNC + "-" + examId).unlock();

+ 3 - 3
src/main/java/cn/com/qmth/scancentral/controller/scan/AnswerController.java

@@ -65,9 +65,9 @@ public class AnswerController extends BaseController {
     @ApiOperation(value = "答题卡适配卡格式上传")
     @RequestMapping(value = "/card/adapte/upload", method = RequestMethod.POST)
     public UriVo adapteUpload(HttpServletRequest request, @RequestParam Long examId, @RequestParam Integer cardNumber,
-            @RequestParam MultipartFile file, @RequestParam String md5,@RequestParam Integer dpi) {
-        return adapteFileService
-                .save(RequestUtil.getIpAddress(request), getAccessUser().getRole(), examId, cardNumber, md5,dpi, file);
+            @RequestParam MultipartFile file, @RequestParam String md5, @RequestParam Integer dpi) {
+        return adapteFileService.save(RequestUtil.getIpAddress(request), getAccessUser().getRole(), examId, cardNumber,
+                md5, dpi, file);
     }
 
     @ApiOperation(value = "答题卡扫描批次创建")

+ 4 - 3
src/main/java/cn/com/qmth/scancentral/controller/scan/OmrTaskController.java

@@ -62,11 +62,12 @@ public class OmrTaskController extends BaseController {
         omrTaskService.releaseByUser(examId, user.getAccount());
         return success(true);
     }
-    
+
     @ApiOperation(value = "识别对照任务历史")
     @RequestMapping(value = "/history", method = RequestMethod.POST)
-    public TaskVo history(@RequestParam Long examId,@RequestParam(required = false) Long id,@RequestParam(required = false) Boolean next) {
+    public TaskVo history(@RequestParam Long examId, @RequestParam(required = false) Long id,
+            @RequestParam(required = false) Boolean next) {
         User user = getAccessUser();
-        return omrTaskService.history(examId, id, user.getAccount(),next);
+        return omrTaskService.history(examId, id, user.getAccount(), next);
     }
 }

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/controller/scan/ScanExamController.java

@@ -30,9 +30,9 @@ public class ScanExamController extends BaseController {
     @ApiOperation(value = "考试详情")
     @RequestMapping(value = "/info", method = RequestMethod.POST)
     public ScanExamInfoVo info(@RequestParam Long id) {
-        return examService.getScanExamInfo(id,getAccessUser());
+        return examService.getScanExamInfo(id, getAccessUser());
     }
-    
+
     @ApiOperation(value = "考试列表")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public List<ScanExamListVo> list() {

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

@@ -37,10 +37,12 @@ public interface BatchDao extends BaseMapper<BatchEntity> {
     List<ScannerWorkloadVo> workload(@Param(value = "examId") Long examId, @Param(value = "startTime") Long startTime,
             @Param(value = "endTime") Long endTime);
 
-    IPage<BatchEntity> findUnCheck(Page<BatchEntity> page,@Param("examId") Long examId,@Param("batchStatus")BatchStatus batchStatus,@Param("checkStatus") CheckStatus checkStatus);
+    IPage<BatchEntity> findUnCheck(Page<BatchEntity> page, @Param("examId") Long examId,
+            @Param("batchStatus") BatchStatus batchStatus, @Param("checkStatus") CheckStatus checkStatus);
 
-    List<BatchDetailDO> batchDetailListToCheck(@Param("id")Long id,@Param("needCheck")Boolean needCheck);
+    List<BatchDetailDO> batchDetailListToCheck(@Param("id") Long id, @Param("needCheck") Boolean needCheck);
 
-    BatchEntity getHistory(@Param(value = "examId")Long examId,@Param("batchId") Long batchId,@Param("userId") Long userId,@Param("status") CheckStatus status);
+    BatchEntity getHistory(@Param(value = "examId") Long examId, @Param("batchId") Long batchId,
+            @Param("userId") Long userId, @Param("status") CheckStatus status);
 
 }

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

@@ -10,6 +10,6 @@ import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
 
 public interface BatchPaperDao extends MppBaseMapper<BatchPaperEntity> {
 
-    List<Long> findStudentIdByBatchId(@Param("batchId")Long batchId);
+    List<Long> findStudentIdByBatchId(@Param("batchId") Long batchId);
 
 }

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

@@ -7,5 +7,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.com.qmth.scancentral.entity.OmrGroupEntity;
 
 public interface OmrGroupDao extends BaseMapper<OmrGroupEntity> {
-	void updateTotalCount(@Param(value = "id") Long id);
+
+    void updateTotalCount(@Param(value = "id") Long id);
 }

+ 3 - 2
src/main/java/cn/com/qmth/scancentral/dao/OmrTaskDao.java

@@ -11,7 +11,8 @@ import cn.com.qmth.scancentral.enums.TaskStatus;
 
 public interface OmrTaskDao extends BaseMapper<OmrTaskEntity> {
 
-    List<OmrTaskEntity> findUnMarked(@Param(value = "examId") Long examId, @Param(value = "startNumber") int startNumber,
-            @Param(value = "pageSize") int pageSize, @Param(value = "status") TaskStatus status);
+    List<OmrTaskEntity> findUnMarked(@Param(value = "examId") Long examId,
+            @Param(value = "startNumber") int startNumber, @Param(value = "pageSize") int pageSize,
+            @Param(value = "status") TaskStatus status);
 
 }

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

@@ -25,6 +25,6 @@ public interface PaperDao extends BaseMapper<PaperEntity> {
 
     IPage<MismatchQueryVo> mismatchQueryPage(Page<MismatchQueryVo> page, @Param("query") MismatchQueryDomain query);
 
-    List<PaperCetVo> findByStudentIds(@Param("studentIds")List<Long> studentIds);
+    List<PaperCetVo> findByStudentIds(@Param("studentIds") List<Long> studentIds);
 
 }

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

@@ -11,7 +11,6 @@ import cn.com.qmth.scancentral.vo.paper.PaperPageCetVo;
 
 public interface PaperPageDao extends MppBaseMapper<PaperPageEntity> {
 
-
-    List<PaperPageCetVo> listByStudentIds(@Param("studentIds")List<Long> studentIds);
+    List<PaperPageCetVo> listByStudentIds(@Param("studentIds") List<Long> studentIds);
 
 }

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

@@ -5,5 +5,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.com.qmth.scancentral.entity.PaperStructureEntity;
 
 public interface PaperStructureDao extends BaseMapper<PaperStructureEntity> {
-	
+
 }

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

@@ -10,5 +10,6 @@ import cn.com.qmth.scancentral.entity.ScannerEntity;
 import cn.com.qmth.scancentral.vo.scannerinfo.ScannerInfo;
 
 public interface ScannerDao extends BaseMapper<ScannerEntity> {
-	public List<ScannerInfo> getInfoByExam(@Param(value = "examId") Long examId);
+
+    public List<ScannerInfo> getInfoByExam(@Param(value = "examId") Long examId);
 }

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

@@ -12,8 +12,8 @@ import cn.com.qmth.scancentral.vo.StudentPaperCountVo;
 public interface StudentPaperDao extends MppBaseMapper<StudentPaperEntity> {
 
     List<StudentPaperEntity> findPaperIdByExamId(@Param("examId") Long examId);
-    
-    public List<StudentPaperCountVo> findStudentPaperCount(@Param(value = "paramList")List<Long> paramList);
 
-    List<Long> findStudentIdByExamId(@Param("examId")Long examId);
+    public List<StudentPaperCountVo> findStudentPaperCount(@Param(value = "paramList") List<Long> paramList);
+
+    List<Long> findStudentIdByExamId(@Param("examId") Long examId);
 }

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

@@ -22,7 +22,7 @@ public class AdapteFileEntity extends BaseEntity {
 
     @MppMultiId
     private String device;
-    
+
     private Integer dpi;
 
     private String uri;
@@ -76,11 +76,11 @@ public class AdapteFileEntity extends BaseEntity {
     public void setRole(Role role) {
         this.role = role;
     }
-    
+
     public Integer getDpi() {
         return dpi;
     }
-    
+
     public void setDpi(Integer dpi) {
         this.dpi = dpi;
     }

+ 7 - 8
src/main/java/cn/com/qmth/scancentral/entity/AnswerCardEntity.java

@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 
 // 试卷卡格式
-@TableName(value="sc_answer_card", autoResultMap = true)
+@TableName(value = "sc_answer_card", autoResultMap = true)
 public class AnswerCardEntity extends AuditingWithoutIdEntity {
 
     private static final long serialVersionUID = -7904338527706136352L;
@@ -21,7 +21,7 @@ public class AnswerCardEntity extends AuditingWithoutIdEntity {
 
     @MppMultiId
     private Integer number;
-    
+
     private String code;
 
     private Integer paperCount;
@@ -39,9 +39,9 @@ public class AnswerCardEntity extends AuditingWithoutIdEntity {
     private String parameter;
 
     private String sliceConfig;
-    
+
     private Integer dpi;
-    
+
     @TableField(value = "slice_name", typeHandler = JacksonTypeHandler.class)
     private List<String> sliceName;
 
@@ -135,7 +135,6 @@ public class AnswerCardEntity extends AuditingWithoutIdEntity {
         this.sliceConfig = sliceConfig;
     }
 
-    
     public List<String> getSliceName() {
         return sliceName;
     }
@@ -143,11 +142,11 @@ public class AnswerCardEntity extends AuditingWithoutIdEntity {
     public void setSliceName(List<String> sliceName) {
         this.sliceName = sliceName;
     }
-    
+
     public Integer getDpi() {
         return dpi;
     }
-    
+
     public void setDpi(Integer dpi) {
         this.dpi = dpi;
     }
@@ -159,5 +158,5 @@ public class AnswerCardEntity extends AuditingWithoutIdEntity {
     public void setCode(String code) {
         this.code = code;
     }
-    
+
 }

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

@@ -19,7 +19,7 @@ public class AnswerCardSubjectEntity extends BaseEntity {
 
     @MppMultiId
     private String subjectCode;
-    
+
     public Long getExamId() {
         return examId;
     }

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

@@ -18,10 +18,10 @@ public class AssignedCheckHistoryEntity extends AuditingEntity implements Serial
     public AssignedCheckHistoryEntity() {
     }
 
-    public AssignedCheckHistoryEntity(Long userId, Long studentId,Long examId) {
+    public AssignedCheckHistoryEntity(Long userId, Long studentId, Long examId) {
         this.studentId = studentId;
         this.userId = userId;
-        this.examId=examId;
+        this.examId = examId;
     }
 
     public Long getStudentId() {

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

@@ -22,7 +22,7 @@ public class BatchEntity extends AuditingEntity {
 
     // 可选
     private String packageCode;
-    
+
     // 可选
     private String subjectCode;
 

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

@@ -25,7 +25,7 @@ public class BatchPaperEntity implements Serializable {
     private Integer cardNumber;
 
     private Boolean assigned;
-    
+
     private Boolean needCheck;
 
     public Long getStudentId() {
@@ -75,11 +75,11 @@ public class BatchPaperEntity implements Serializable {
     public void setAssigned(Boolean assigned) {
         this.assigned = assigned;
     }
-    
+
     public Boolean getNeedCheck() {
         return needCheck;
     }
-    
+
     public void setNeedCheck(Boolean needCheck) {
         this.needCheck = needCheck;
     }

+ 6 - 5
src/main/java/cn/com/qmth/scancentral/entity/ExamEntity.java

@@ -42,14 +42,16 @@ public class ExamEntity extends AuditingWithoutIdEntity {
 
     private String absentBarcodeContent;
 
-    //图片抽查比例
+    // 图片抽查比例
     private Double imageCheckRatio;
-    //考生同步时间
+
+    // 考生同步时间
     private Long dataSyncTime;
-    //卡格式同步时间
+
+    // 卡格式同步时间
     private Long cardSyncTime;
 
-    //缺考校验生成位数
+    // 缺考校验生成位数
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Integer examNumberFillCount;
 
@@ -157,7 +159,6 @@ public class ExamEntity extends AuditingWithoutIdEntity {
         this.absentBarcodeContent = absentBarcodeContent;
     }
 
-
     public Double getImageCheckRatio() {
         return imageCheckRatio;
     }

+ 19 - 22
src/main/java/cn/com/qmth/scancentral/entity/FilePropertyEntity.java

@@ -20,42 +20,39 @@ public class FilePropertyEntity extends BaseEntity {
     private String path;
 
     private String md5;
-    
+
     private Long fileSize;
 
-	public Long getExamId() {
-		return examId;
-	}
+    public Long getExamId() {
+        return examId;
+    }
 
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
 
-	public String getPath() {
-		return path;
-	}
+    public String getPath() {
+        return path;
+    }
 
-	public void setPath(String path) {
-		this.path = path;
-	}
+    public void setPath(String path) {
+        this.path = path;
+    }
 
-	public String getMd5() {
-		return md5;
-	}
+    public String getMd5() {
+        return md5;
+    }
 
-	public void setMd5(String md5) {
-		this.md5 = md5;
-	}
+    public void setMd5(String md5) {
+        this.md5 = md5;
+    }
 
-    
     public Long getFileSize() {
         return fileSize;
     }
 
-    
     public void setFileSize(Long fileSize) {
         this.fileSize = fileSize;
     }
 
-
 }

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

@@ -11,7 +11,7 @@ import cn.com.qmth.scancentral.handle.OmrTaskPageListTypeHandler;
 import cn.com.qmth.scancentral.model.OmrTaskPage;
 
 // 识别对照任务
-@TableName(value ="sc_omr_task",autoResultMap = true)
+@TableName(value = "sc_omr_task", autoResultMap = true)
 public class OmrTaskEntity extends AuditingEntity {
 
     /**

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

@@ -10,15 +10,17 @@ import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 
 // 签到表
-@TableName(value ="sc_package_result",autoResultMap = true)
+@TableName(value = "sc_package_result", autoResultMap = true)
 public class PackageResultEntity extends AuditingWithoutIdEntity {
 
     /**
      * 
      */
     private static final long serialVersionUID = -2443714675814813665L;
+
     @MppMultiId
     private Long examId;
+
     @MppMultiId
     private String packageCode;
 

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

@@ -31,7 +31,7 @@ public class PaperPageEntity extends AuditingWithoutIdEntity {
     @TableField(value = "breach", typeHandler = JacksonTypeHandler.class)
     private BoolResult breach;
 
-    //?属于异常 ,#属于空白
+    // ?属于异常 ,#属于空白
     @TableField(value = "paper_type", typeHandler = JacksonTypeHandler.class)
     private StringResult paperType;
 
@@ -149,8 +149,8 @@ public class PaperPageEntity extends AuditingWithoutIdEntity {
             if (paperType.getType() == OmrType.BARCODE) {
                 if (paperType.getResult().length() == 0) {
                     paperType.setResult("#");
-                } else if (CollectionUtils.isNotEmpty(barcodeContents) && !barcodeContents
-                        .contains(paperType.getResult())) {
+                } else if (CollectionUtils.isNotEmpty(barcodeContents)
+                        && !barcodeContents.contains(paperType.getResult())) {
                     paperType.setResult("?");
                 }
             } else if (paperType.getType() == OmrType.FILL_AREA) {

+ 75 - 58
src/main/java/cn/com/qmth/scancentral/entity/PaperStructureEntity.java

@@ -8,62 +8,79 @@ import cn.com.qmth.scancentral.enums.OmrField;
 @TableName("sc_paper_structure")
 public class PaperStructureEntity extends AuditingEntity {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 7509644639392197500L;
-	
-	private Long examId;
-	private Integer cardNumber;
-	private Integer paperNumber;
-	private Integer pageIndex;
-	private OmrField field;
-	private Integer questionNumber;
-	private Boolean single;
-	
-	
-	public Integer getCardNumber() {
-		return cardNumber;
-	}
-	public void setCardNumber(Integer cardNumber) {
-		this.cardNumber = cardNumber;
-	}
-	public Long getExamId() {
-		return examId;
-	}
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-	public Integer getPaperNumber() {
-		return paperNumber;
-	}
-	public void setPaperNumber(Integer paperNumber) {
-		this.paperNumber = paperNumber;
-	}
-	public Integer getPageIndex() {
-		return pageIndex;
-	}
-	public void setPageIndex(Integer pageIndex) {
-		this.pageIndex = pageIndex;
-	}
-	public OmrField getField() {
-		return field;
-	}
-	public void setField(OmrField field) {
-		this.field = field;
-	}
-	public Integer getQuestionNumber() {
-		return questionNumber;
-	}
-	public void setQuestionNumber(Integer questionNumber) {
-		this.questionNumber = questionNumber;
-	}
-	public Boolean getSingle() {
-		return single;
-	}
-	public void setSingle(Boolean single) {
-		this.single = single;
-	}
-
-	
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 7509644639392197500L;
+
+    private Long examId;
+
+    private Integer cardNumber;
+
+    private Integer paperNumber;
+
+    private Integer pageIndex;
+
+    private OmrField field;
+
+    private Integer questionNumber;
+
+    private Boolean single;
+
+    public Integer getCardNumber() {
+        return cardNumber;
+    }
+
+    public void setCardNumber(Integer cardNumber) {
+        this.cardNumber = cardNumber;
+    }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public Integer getPaperNumber() {
+        return paperNumber;
+    }
+
+    public void setPaperNumber(Integer paperNumber) {
+        this.paperNumber = paperNumber;
+    }
+
+    public Integer getPageIndex() {
+        return pageIndex;
+    }
+
+    public void setPageIndex(Integer pageIndex) {
+        this.pageIndex = pageIndex;
+    }
+
+    public OmrField getField() {
+        return field;
+    }
+
+    public void setField(OmrField field) {
+        this.field = field;
+    }
+
+    public Integer getQuestionNumber() {
+        return questionNumber;
+    }
+
+    public void setQuestionNumber(Integer questionNumber) {
+        this.questionNumber = questionNumber;
+    }
+
+    public Boolean getSingle() {
+        return single;
+    }
+
+    public void setSingle(Boolean single) {
+        this.single = single;
+    }
+
 }

+ 0 - 16
src/main/java/cn/com/qmth/scancentral/entity/QuestionEntity.java

@@ -25,82 +25,66 @@ public class QuestionEntity extends AuditingEntity {
 
     private Double totalScore;
 
-    
     public Long getExamId() {
         return examId;
     }
 
-    
     public void setExamId(Long examId) {
         this.examId = examId;
     }
 
-    
     public String getSubjectCode() {
         return subjectCode;
     }
 
-    
     public void setSubjectCode(String subjectCode) {
         this.subjectCode = subjectCode;
     }
 
-    
     public String getPaperType() {
         return paperType;
     }
 
-    
     public void setPaperType(String paperType) {
         this.paperType = paperType;
     }
 
-    
     public Boolean getObjective() {
         return objective;
     }
 
-    
     public void setObjective(Boolean objective) {
         this.objective = objective;
     }
 
-    
     public Integer getMainNumber() {
         return mainNumber;
     }
 
-    
     public void setMainNumber(Integer mainNumber) {
         this.mainNumber = mainNumber;
     }
 
-    
     public String getSubNumber() {
         return subNumber;
     }
 
-    
     public void setSubNumber(String subNumber) {
         this.subNumber = subNumber;
     }
 
-    
     public String getMainTitle() {
         return mainTitle;
     }
 
-    
     public void setMainTitle(String mainTitle) {
         this.mainTitle = mainTitle;
     }
 
-    
     public Double getTotalScore() {
         return totalScore;
     }
 
-    
     public void setTotalScore(Double totalScore) {
         this.totalScore = totalScore;
     }

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

@@ -10,7 +10,7 @@ import cn.com.qmth.scancentral.handle.QueryConditionListTypeHandler;
 import cn.com.qmth.scancentral.model.QueryCondition;
 
 // 二次识别批次
-@TableName(value ="sc_refix_batch",autoResultMap = true)
+@TableName(value = "sc_refix_batch", autoResultMap = true)
 public class RefixBatchEntity extends AuditingEntity {
 
     /**

+ 57 - 45
src/main/java/cn/com/qmth/scancentral/entity/UserEntity.java

@@ -5,59 +5,71 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import cn.com.qmth.scancentral.entity.base.AuditingEntity;
 import cn.com.qmth.scancentral.enums.Role;
 
-//管理员
+// 管理员
 @TableName("sc_user")
 public class UserEntity extends AuditingEntity {
 
-
     /**
-	 * 
-	 */
-	private static final long serialVersionUID = -4846284398208292028L;
-
-	private String loginName;
-	private String name;
-	private String password;
-	private Role role;
-	private Boolean enable;
-	private String device;
-	
-	
-	public String getLoginName() {
-		return loginName;
-	}
-	public void setLoginName(String loginName) {
-		this.loginName = loginName;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getPassword() {
-		return password;
-	}
-	public void setPassword(String password) {
-		this.password = password;
-	}
-	public Role getRole() {
-		return role;
-	}
-	public void setRole(Role role) {
-		this.role = role;
-	}
-	public Boolean getEnable() {
-		return enable;
-	}
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
+     * 
+     */
+    private static final long serialVersionUID = -4846284398208292028L;
+
+    private String loginName;
+
+    private String name;
+
+    private String password;
+
+    private Role role;
+
+    private Boolean enable;
+
+    private String device;
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public Role getRole() {
+        return role;
+    }
+
+    public void setRole(Role role) {
+        this.role = role;
+    }
+
+    public Boolean getEnable() {
+        return enable;
+    }
+
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
+    }
 
     public String getDevice() {
         return device;
     }
-    
+
     public void setDevice(String device) {
         this.device = device;
     }

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

@@ -22,7 +22,6 @@ public abstract class AuditingEntity extends IdEntity {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updaterId;
 
-
     public Long getCreatorId() {
         return creatorId;
     }

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

@@ -22,7 +22,6 @@ public abstract class AuditingWithoutIdEntity extends BaseEntity {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updaterId;
 
-
     public Long getCreatorId() {
         return creatorId;
     }

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

@@ -13,7 +13,6 @@ public abstract class IdEntity extends BaseEntity {
     @TableId(type = IdType.AUTO)
     protected Long id;
 
-
     public Long getId() {
         return id;
     }
@@ -22,5 +21,4 @@ public abstract class IdEntity extends BaseEntity {
         this.id = id;
     }
 
-
 }

+ 2 - 1
src/main/java/cn/com/qmth/scancentral/enums/CheckStatus.java

@@ -1,10 +1,11 @@
 package cn.com.qmth.scancentral.enums;
+
 /**
  * 图片检查状态
  */
 public enum CheckStatus {
 
-	WAITING("未处理"),
+    WAITING("未处理"),
 
     FINISH("已处理");
 

+ 3 - 7
src/main/java/cn/com/qmth/scancentral/enums/ConditionType.java

@@ -5,13 +5,9 @@ public enum ConditionType {
     FILL_SUSPECT("填涂识别嫌疑", false),
     // ABSENT_FILL("缺考已填涂"),
     // BREACH_FILL("违纪已填涂"),
-    QUESTION_SINGLE_EXCEED("单选题多填涂", false),
-    QUESTION_SINGLE_BLANK("单选题空选题数大于", true),
-    QUESTION_MULTI_BLANK("多选题空选题数大于", true),
-    SELECTIVE_EXCEED("选做题填涂超过", true),
-    SELECTIVE_BLANK("选做题空选题数大于", true),
-    PAPER_TYPE_EXCEED("卷型多填涂", false),
-    PAPER_TYPE_BLANK("卷型空选", false);
+    QUESTION_SINGLE_EXCEED("单选题多填涂", false), QUESTION_SINGLE_BLANK("单选题空选题数大于", true), QUESTION_MULTI_BLANK("多选题空选题数大于",
+            true), SELECTIVE_EXCEED("选做题填涂超过", true), SELECTIVE_BLANK("选做题空选题数大于",
+                    true), PAPER_TYPE_EXCEED("卷型多填涂", false), PAPER_TYPE_BLANK("卷型空选", false);
 
     private String name;
 

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/enums/ExamMode.java

@@ -7,7 +7,7 @@ public enum ExamMode {
     K12("基础教育"),
 
     POSTGRADUATE("研究生"),
-    
+
     CET("四六级");
 
     private String name;

+ 1 - 4
src/main/java/cn/com/qmth/scancentral/enums/ExamStatus.java

@@ -2,10 +2,7 @@ package cn.com.qmth.scancentral.enums;
 
 public enum ExamStatus {
 
-    OK("正常"),
-    ABSENT("缺考"),
-    UNCHECK("待确认"),
-    ;
+    OK("正常"), ABSENT("缺考"), UNCHECK("待确认"),;
 
     private String name;
 

+ 4 - 8
src/main/java/cn/com/qmth/scancentral/enums/FileType.java

@@ -5,14 +5,10 @@ package cn.com.qmth.scancentral.enums;
  */
 public enum FileType {
 
-    SHEET("原图", "%d/answer/%d/%s/%d-%d.%s"),
-    SLICE("裁切图", "%d/answer/%d/%s/%d-%d-%d.%s"),
-    PACKAGE("签到表", "%d/card/package.%s"),
-    CARD("题卡", "%d/card/answer/%d.%s"),
-    ADMIN_SLICE("管理员上传裁切图", "%d/upload/%s/%d-%d-%d/%s.%s"),
-    ADMIN_SHEET("管理员上传裁原图", "%d/upload/%s/%d-%d/%s.%s"),
-    ADAPTE_FILE("适配题卡", "%d/card/answer/%d/%s.%s"),
-    ;
+    SHEET("原图", "%d/answer/%d/%s/%d-%d.%s"), SLICE("裁切图", "%d/answer/%d/%s/%d-%d-%d.%s"), PACKAGE("签到表",
+            "%d/card/package.%s"), CARD("题卡", "%d/card/answer/%d.%s"), ADMIN_SLICE("管理员上传裁切图",
+                    "%d/upload/%s/%d-%d-%d/%s.%s"), ADMIN_SHEET("管理员上传裁原图",
+                            "%d/upload/%s/%d-%d/%s.%s"), ADAPTE_FILE("适配题卡", "%d/card/answer/%d/%s.%s"),;
 
     private String name;
 

+ 2 - 6
src/main/java/cn/com/qmth/scancentral/enums/GroupType.java

@@ -2,12 +2,8 @@ package cn.com.qmth.scancentral.enums;
 
 public enum GroupType {
 
-    SUBJECT("科目", "subject_code"),
-    PACKAGE("卷袋", "package_code"),
-    CAMPUS("学习中心", "campus_name"),
-    EXAM_SITE("考点", "exam_site"),
-    EXAM_ROOM("考场", "exam_room"),
-    STUDENT_CODE("学号", "student_code");
+    SUBJECT("科目", "subject_code"), PACKAGE("卷袋", "package_code"), CAMPUS("学习中心", "campus_name"), EXAM_SITE("考点",
+            "exam_site"), EXAM_ROOM("考场", "exam_room"), STUDENT_CODE("学号", "student_code");
 
     private String name;
 

+ 8 - 13
src/main/java/cn/com/qmth/scancentral/enums/LockType.java

@@ -1,19 +1,14 @@
 package cn.com.qmth.scancentral.enums;
 
 public enum LockType {
-    EXAM_SYNC("exam_sync"),
-    STUDENT("student"),
-    CARD_SYNC("card_sync"),
-    OMR_GROUP("omr_group"),
-    OMR_GROUP_DELETE("omr_group_delete"),
-    OMR_GROUP_RESET("omr_group_reset"),
-    OMR_GROUP_BUILD("omr_group_build"),
-    STUDENT_ANSWER_GROUP("student_answer_group"),
-    STUDENT_ANSWER_GROUP_DELETE("student_answer_group_delete"),
-    STUDENT_ANSWER_GROUP_RESET("student_answer_group_reset"),
-    STUDENT_ANSWER_GROUP_BUILD("student_answer_group_build"),
-    USER("user"),
-    EXAM_STATUS_RESET("exam_status_reset"),;
+
+    EXAM_SYNC("exam_sync"), STUDENT("student"), CARD_SYNC("card_sync"), OMR_GROUP("omr_group"), OMR_GROUP_DELETE(
+            "omr_group_delete"), OMR_GROUP_RESET("omr_group_reset"), OMR_GROUP_BUILD(
+                    "omr_group_build"), STUDENT_ANSWER_GROUP("student_answer_group"), STUDENT_ANSWER_GROUP_DELETE(
+                            "student_answer_group_delete"), STUDENT_ANSWER_GROUP_RESET(
+                                    "student_answer_group_reset"), STUDENT_ANSWER_GROUP_BUILD(
+                                            "student_answer_group_build"), USER(
+                                                    "user"), EXAM_STATUS_RESET("exam_status_reset"),;
 
     private String name;
 

+ 1 - 4
src/main/java/cn/com/qmth/scancentral/enums/PaperTypeStatus.java

@@ -2,10 +2,7 @@ package cn.com.qmth.scancentral.enums;
 
 public enum PaperTypeStatus {
 
-     OK("正常"),
-     BLANK("空白"),
-     ERROR("异常"),
-     ;
+    OK("正常"), BLANK("空白"), ERROR("异常"),;
 
     private String name;
 

+ 4 - 4
src/main/java/cn/com/qmth/scancentral/enums/UploadStatus.java

@@ -2,11 +2,11 @@ package cn.com.qmth.scancentral.enums;
 
 public enum UploadStatus {
 
-	WAITING_UPLOAD("待上传"),
+    WAITING_UPLOAD("待上传"),
 
-	UPLOADED("已上传"),
-	
-	ERROR("出错");
+    UPLOADED("已上传"),
+
+    ERROR("出错");
 
     private String name;
 

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/enums/VerifyStatus.java

@@ -6,8 +6,7 @@ public enum VerifyStatus {
 
     REJECT("拒绝"),
 
-    CONFIRM("通过"),
-    CANCEL("取消");
+    CONFIRM("通过"), CANCEL("取消");
 
     private String name;
 

+ 2 - 1
src/main/java/cn/com/qmth/scancentral/exception/ForbiddenExceptions.java

@@ -3,5 +3,6 @@ package cn.com.qmth.scancentral.exception;
 import com.qmth.boot.core.exception.ForbiddenException;
 
 public interface ForbiddenExceptions {
-	public static final ForbiddenException SCANNER_LOGIN_DISABLE = new ForbiddenException(101, null, "扫描员已禁止登陆", null);
+
+    public static final ForbiddenException SCANNER_LOGIN_DISABLE = new ForbiddenException(101, null, "扫描员已禁止登陆", null);
 }

+ 7 - 7
src/main/java/cn/com/qmth/scancentral/exception/NotFoundExceptions.java

@@ -4,7 +4,6 @@ import com.qmth.boot.core.exception.NotFoundException;
 
 public class NotFoundExceptions {
 
-    
     public static final NotFoundException NO_OMR_TASK = new NotFoundException(101, "no omr task", "没有识别对照任务", null);
 
     public static final NotFoundException NO_OMR_ARBITRATE_TASK = new NotFoundException(102, "no omr arbitrate task",
@@ -12,13 +11,14 @@ public class NotFoundExceptions {
 
     public static final NotFoundException NO_SYNC_VERIFY_TASK = new NotFoundException(102, "no sync verify task",
             "没有实时审核任务", null);
-    
+
     public static final NotFoundException NO_CHECK_IMAGE_TASK = new NotFoundException(102, "no check image task",
             "没有图片审核任务", null);
-    
-    
-    public static final NotFoundException NO_STUDENT_ANSWER_TASK = new NotFoundException(101, "no student answer task", "没有数据检查任务", null);
 
-    public static final NotFoundException NO_STUDENT_ANSWER_GROUP = new NotFoundException(101, "no student answer group", "没有数据抽查任务组", null);
-    
+    public static final NotFoundException NO_STUDENT_ANSWER_TASK = new NotFoundException(101, "no student answer task",
+            "没有数据检查任务", null);
+
+    public static final NotFoundException NO_STUDENT_ANSWER_GROUP = new NotFoundException(101,
+            "no student answer group", "没有数据抽查任务组", null);
+
 }

+ 6 - 3
src/main/java/cn/com/qmth/scancentral/exception/UnauthorizedExceptions.java

@@ -3,7 +3,10 @@ package cn.com.qmth.scancentral.exception;
 import com.qmth.boot.core.exception.UnauthorizedException;
 
 public interface UnauthorizedExceptions {
-	public static final UnauthorizedException SCANNER_PASSWORD_INVALID = new UnauthorizedException(101, null, "密码错误", null);
-	
-	public static final UnauthorizedException MARKINGCLOUD_LOGIN_ERROR = new UnauthorizedException(101, null, "云阅卷鉴权失败", null);
+
+    public static final UnauthorizedException SCANNER_PASSWORD_INVALID = new UnauthorizedException(101, null, "密码错误",
+            null);
+
+    public static final UnauthorizedException MARKINGCLOUD_LOGIN_ERROR = new UnauthorizedException(101, null, "云阅卷鉴权失败",
+            null);
 }

+ 13 - 12
src/main/java/cn/com/qmth/scancentral/handle/ListTypeHandler.java

@@ -18,41 +18,42 @@ import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
 @MappedJdbcTypes(JdbcType.VARCHAR)
-@MappedTypes({List.class})
+@MappedTypes({ List.class })
 public abstract class ListTypeHandler<T> extends BaseTypeHandler<List<T>> {
-	private static Gson gson = new Gson();
+
+    private static Gson gson = new Gson();
+
     @Override
-    public void setNonNullParameter(PreparedStatement ps, int i, List<T> parameter, JdbcType jdbcType) throws SQLException {
+    public void setNonNullParameter(PreparedStatement ps, int i, List<T> parameter, JdbcType jdbcType)
+            throws SQLException {
         String content = CollectionUtils.isEmpty(parameter) ? null : gson.toJson(parameter);
         ps.setString(i, content);
     }
- 
+
     @Override
     public List<T> getNullableResult(ResultSet rs, String columnName) throws SQLException {
         return this.getListByJsonArrayString(rs.getString(columnName));
     }
- 
+
     @Override
     public List<T> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
         return this.getListByJsonArrayString(rs.getString(columnIndex));
     }
- 
+
     @Override
     public List<T> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
         return this.getListByJsonArrayString(cs.getString(columnIndex));
     }
- 
- 
+
     private List<T> getListByJsonArrayString(String content) {
-        return StrUtil.isBlank(content) ? new ArrayList<>() :  gson.fromJson(content, this.specificType().getType());
+        return StrUtil.isBlank(content) ? new ArrayList<>() : gson.fromJson(content, this.specificType().getType());
     }
- 
+
     /**
      * 具体类型,由子类提供
      *
      * @return 具体类型
      */
     protected abstract TypeToken<List<T>> specificType();
- 
- 
+
 }

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

@@ -8,10 +8,10 @@ import cn.com.qmth.scancentral.model.OmrTaskPage;
 
 public class OmrTaskPageListTypeHandler extends ListTypeHandler<OmrTaskPage> {
 
-	@Override
-	protected TypeToken<List<OmrTaskPage>> specificType() {
-		return new TypeToken<List<OmrTaskPage>>() {
-		};
-	}
+    @Override
+    protected TypeToken<List<OmrTaskPage>> specificType() {
+        return new TypeToken<List<OmrTaskPage>>() {
+        };
+    }
 
 }

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

@@ -8,10 +8,10 @@ import cn.com.qmth.scancentral.model.QueryCondition;
 
 public class QueryConditionListTypeHandler extends ListTypeHandler<QueryCondition> {
 
-	@Override
-	protected TypeToken<List<QueryCondition>> specificType() {
-		return new TypeToken<List<QueryCondition>>() {
-		};
-	}
+    @Override
+    protected TypeToken<List<QueryCondition>> specificType() {
+        return new TypeToken<List<QueryCondition>>() {
+        };
+    }
 
 }

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

@@ -12,9 +12,9 @@ public class AnswerCardInfo {
     private Long examId;
 
     private Integer number;
-    
+
     private String code;
-    
+
     private Integer dpi;
 
     private List<String> subjectList;
@@ -41,7 +41,7 @@ public class AnswerCardInfo {
     }
 
     public AnswerCardInfo(Long examId, Integer number, List<String> subjectList, String parameter, String remark,
-            Integer paperCount, Boolean singlePage,Integer dpi) {
+            Integer paperCount, Boolean singlePage, Integer dpi) {
         this.examId = examId;
         this.number = number;
         this.subjectList = subjectList;
@@ -50,7 +50,7 @@ public class AnswerCardInfo {
         this.paperCount = paperCount;
         this.singlePage = singlePage;
         this.source = CardSource.CLIENT;
-        this.dpi=dpi;
+        this.dpi = dpi;
     }
 
     public Long getExamId() {
@@ -141,17 +141,14 @@ public class AnswerCardInfo {
         this.updateTime = updateTime;
     }
 
-    
     public List<String> getSubjectList() {
         return subjectList;
     }
 
-    
     public void setSubjectList(List<String> subjectList) {
         this.subjectList = subjectList;
     }
 
-    
     public String getCode() {
         return code;
     }
@@ -160,7 +157,6 @@ public class AnswerCardInfo {
         this.code = code;
     }
 
-    
     public Integer getDpi() {
         return dpi;
     }

+ 21 - 17
src/main/java/cn/com/qmth/scancentral/model/DataUploadResponse.java

@@ -1,21 +1,25 @@
 package cn.com.qmth.scancentral.model;
 
 public class DataUploadResponse {
-	private String examNumber;
-	private String updateTime;
-	public String getExamNumber() {
-		return examNumber;
-	}
-	public void setExamNumber(String examNumber) {
-		this.examNumber = examNumber;
-	}
-	public String getUpdateTime() {
-		return updateTime;
-	}
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	
-	
+
+    private String examNumber;
+
+    private String updateTime;
+
+    public String getExamNumber() {
+        return examNumber;
+    }
+
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
 }

+ 1 - 3
src/main/java/cn/com/qmth/scancentral/model/ExamInfoDto.java

@@ -10,7 +10,7 @@ public class ExamInfoDto {
     private Long id;
 
     private String name;
-    
+
     private String schoolName;
 
     private Long examTime;
@@ -52,12 +52,10 @@ public class ExamInfoDto {
         this.config = config;
     }
 
-    
     public String getSchoolName() {
         return schoolName;
     }
 
-    
     public void setSchoolName(String schoolName) {
         this.schoolName = schoolName;
     }

+ 51 - 36
src/main/java/cn/com/qmth/scancentral/model/FileUploadDto.java

@@ -3,40 +3,55 @@ package cn.com.qmth.scancentral.model;
 import java.io.File;
 
 public class FileUploadDto {
-	private Long examId;
-	private String examNumber;
-	private Integer index;
-	private File file;
-	private String md5;
-	public Long getExamId() {
-		return examId;
-	}
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-	public String getExamNumber() {
-		return examNumber;
-	}
-	public void setExamNumber(String examNumber) {
-		this.examNumber = examNumber;
-	}
-	public Integer getIndex() {
-		return index;
-	}
-	public void setIndex(Integer index) {
-		this.index = index;
-	}
-	public File getFile() {
-		return file;
-	}
-	public void setFile(File file) {
-		this.file = file;
-	}
-	public String getMd5() {
-		return md5;
-	}
-	public void setMd5(String md5) {
-		this.md5 = md5;
-	}
-	
+
+    private Long examId;
+
+    private String examNumber;
+
+    private Integer index;
+
+    private File file;
+
+    private String md5;
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public String getExamNumber() {
+        return examNumber;
+    }
+
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
+    }
+
+    public Integer getIndex() {
+        return index;
+    }
+
+    public void setIndex(Integer index) {
+        this.index = index;
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    public void setFile(File file) {
+        this.file = file;
+    }
+
+    public String getMd5() {
+        return md5;
+    }
+
+    public void setMd5(String md5) {
+        this.md5 = md5;
+    }
+
 }

+ 21 - 16
src/main/java/cn/com/qmth/scancentral/model/FileUploadResponse.java

@@ -1,20 +1,25 @@
 package cn.com.qmth.scancentral.model;
 
 public class FileUploadResponse {
-	private Boolean success;
-	private String url;
-	public Boolean getSuccess() {
-		return success;
-	}
-	public void setSuccess(Boolean success) {
-		this.success = success;
-	}
-	public String getUrl() {
-		return url;
-	}
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	
+
+    private Boolean success;
+
+    private String url;
+
+    public Boolean getSuccess() {
+        return success;
+    }
+
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
 }

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

@@ -10,21 +10,20 @@ public class QueryCondition {
 
     private Set<String> value;
 
-	public QueryField getField() {
-		return field;
-	}
-
-	public void setField(QueryField field) {
-		this.field = field;
-	}
-
-	public Set<String> getValue() {
-		return value;
-	}
-
-	public void setValue(Set<String> value) {
-		this.value = value;
-	}
-    
-    
+    public QueryField getField() {
+        return field;
+    }
+
+    public void setField(QueryField field) {
+        this.field = field;
+    }
+
+    public Set<String> getValue() {
+        return value;
+    }
+
+    public void setValue(Set<String> value) {
+        this.value = value;
+    }
+
 }

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/service/AdapteFileService.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 public interface AdapteFileService {
 
-    UriVo save(String device, Role role, Long examId, Integer number, String md5,Integer dpi, MultipartFile file);
+    UriVo save(String device, Role role, Long examId, Integer number, String md5, Integer dpi, MultipartFile file);
 
     List<AdapteFileEntity> listByExamIdAndCardNumber(Long examId, Integer number);
 

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/service/AnswerCardService.java

@@ -15,7 +15,7 @@ public interface AnswerCardService extends IMppService<AnswerCardEntity> {
     int getCountByExam(Long examId);
 
     AnswerCardEntity save(User user, Long examId, Integer number, String subjectCode, String parameter, String remark,
-            Integer paperCount, Boolean singlePage, String md5,Integer dpi, MultipartFile file);
+            Integer paperCount, Boolean singlePage, String md5, Integer dpi, MultipartFile file);
 
     void delete(User user, Long examId, Integer number);
 

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/service/AssignedCheckHistoryService.java

@@ -6,9 +6,9 @@ public interface AssignedCheckHistoryService {
 
     void deleteByStudentId(Long studentId);
 
-    void save(Long userId, Long studentId,Long examId);
+    void save(Long userId, Long studentId, Long examId);
 
     AssignedCheckHistoryEntity findByStudentIdAndUserId(Long studentId, Long userId);
 
-    int getCountByUserId(Long userId,Long examId);
+    int getCountByUserId(Long userId, Long examId);
 }

+ 9 - 11
src/main/java/cn/com/qmth/scancentral/service/AuthService.java

@@ -9,18 +9,16 @@ import cn.com.qmth.scancentral.bean.User;
  */
 public interface AuthService {
 
-	/**
-	 * 登录
-	 *
-	 * @author 
-	 * @param ip 
-	 * @param loginInfo
-	 * @return
-	 */
-	User login(String ip, ScannerLoginInfo loginInfo);
+    /**
+     * 登录
+     *
+     * @author
+     * @param ip
+     * @param loginInfo
+     * @return
+     */
+    User login(String ip, ScannerLoginInfo loginInfo);
 
     User adminLogin(String loginName, String password, String device);
 
-
-
 }

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/service/BatchPaperService.java

@@ -13,7 +13,7 @@ import java.util.Set;
  */
 public interface BatchPaperService extends IMppService<BatchPaperEntity> {
 
-    void update(BatchEntity batch, PaperEntity paper, Long studentId, Integer paperNumber,Boolean needCheck);
+    void update(BatchEntity batch, PaperEntity paper, Long studentId, Integer paperNumber, Boolean needCheck);
 
     List<BatchPaperEntity> findByBatchId(Long batchId);
 
@@ -22,7 +22,7 @@ public interface BatchPaperService extends IMppService<BatchPaperEntity> {
     BatchPaperEntity findByBatchIdAndStudentIdAndPaperNumber(Long batchId, Long studentId, Integer paperNumber);
 
     BatchPaperEntity findByPaperId(Long paperId);
-    
+
     List<Long> findStudentIdByBatchId(Long batchId);
 
     List<BatchPaperEntity> findByBatchIdAndStudentIds(Long id, Set<Long> checkIds);

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/service/ExamService.java

@@ -41,6 +41,6 @@ public interface ExamService extends IService<ExamEntity> {
 
     void updateExamNumberFillCount(Long examId, Integer examNumberFillCount);
 
-    ExamEntity updateEnableSyncVerify(User user,Long examId, Boolean enableSyncVerify);
+    ExamEntity updateEnableSyncVerify(User user, Long examId, Boolean enableSyncVerify);
 
 }

+ 1 - 2
src/main/java/cn/com/qmth/scancentral/service/FilePropertyService.java

@@ -6,7 +6,6 @@ import cn.com.qmth.scancentral.entity.FilePropertyEntity;
 
 public interface FilePropertyService extends IService<FilePropertyEntity> {
 
-	void save(Long examId, String path, String md5,Long fileSize);
-
+    void save(Long examId, String path, String md5, Long fileSize);
 
 }

+ 3 - 3
src/main/java/cn/com/qmth/scancentral/service/OmrGroupService.java

@@ -23,10 +23,10 @@ public interface OmrGroupService extends IService<OmrGroupEntity> {
 
     List<OmrGroupEntity> findByExamIdAndFixed(Long examId, Boolean fixed);
 
-	void updateTotalCount(Long id);
+    void updateTotalCount(Long id);
+
+    void addFixOmrCondition(Long userId, Long examId);
 
-    void addFixOmrCondition(Long userId,Long examId);
-    
     void updateTotalCountByExamId(Long examId);
 
 }

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/service/OmrTaskService.java

@@ -25,7 +25,7 @@ public interface OmrTaskService extends IService<OmrTaskEntity> {
     void resetByGroup(OmrGroupEntity group);
 
     void saveTask(OmrGroupEntity group, Long studentId);
-    
+
     List<OmrTaskEntity> buildTask(OmrGroupEntity group, Long studentId);
 
     TaskVo getTask(Long examId, String account);
@@ -56,7 +56,7 @@ public interface OmrTaskService extends IService<OmrTaskEntity> {
 
     void updateStudentId(Long studentId, Long paperId);
 
-    TaskVo history(Long examId, Long taskId, String account,Boolean next);
+    TaskVo history(Long examId, Long taskId, String account, Boolean next);
 
     TaskVo getArbitrateHistory(Long examId, Long taskId, String account, Boolean next);
 

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/service/PackageCardService.java

@@ -6,6 +6,6 @@ import cn.com.qmth.scancentral.entity.PackageCardEntity;
 
 public interface PackageCardService extends IService<PackageCardEntity> {
 
-	int getCountByExam(Long examId);
+    int getCountByExam(Long examId);
 
 }

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/service/PackageResultService.java

@@ -6,6 +6,6 @@ import cn.com.qmth.scancentral.entity.PackageResultEntity;
 
 public interface PackageResultService extends IMppService<PackageResultEntity> {
 
-	int getCountByExam(Long examId);
+    int getCountByExam(Long examId);
 
 }

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/service/PaperPageService.java

@@ -23,7 +23,7 @@ public interface PaperPageService extends IMppService<PaperPageEntity> {
     PaperPageEntity findPaperIdAndIndex(Long paperId, Integer index);
 
     List<PaperPageEntity> listByPaperList(List<Long> paperIds);
-    
+
     boolean updateSheetPath(@NotNull PaperPageEntity page);
 
     List<PaperPageCetVo> listByStudentIds(List<Long> studentIds);

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/service/QuestionService.java

@@ -11,7 +11,7 @@ public interface QuestionService extends IService<QuestionEntity> {
     List<QuestionEntity> findByExamIdAndSubjectCode(Long examId, String subjectCode);
 
     void deleteByExamIdAndSubjectCode(Long examId, String subjectCode);
-    
+
     void deleteByExamId(Long examId);
 
     int importQuestion(List<QuestionEntity> questionList);

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/service/ScannerCardService.java

@@ -15,6 +15,6 @@ public interface ScannerCardService extends IMppService<ScannerCardEntity> {
 
     int getCountByExamAndDevice(Long examId, String account);
 
-	int deleteByExamAndCardNumber(Long examId, Integer cardNumber);
+    int deleteByExamAndCardNumber(Long examId, Integer cardNumber);
 
 }

+ 3 - 3
src/main/java/cn/com/qmth/scancentral/service/ScannerService.java

@@ -9,10 +9,10 @@ import cn.com.qmth.scancentral.vo.scannerinfo.ScannerInfoVo;
  * 鉴权
  *
  */
-public interface ScannerService extends IService<ScannerEntity>{
+public interface ScannerService extends IService<ScannerEntity> {
 
-	public void onLogin(String device);
+    public void onLogin(String device);
 
-	public ScannerInfoVo scannerInfo(Long examId);
+    public ScannerInfoVo scannerInfo(Long examId);
 
 }

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/service/SessionService.java

@@ -30,7 +30,7 @@ public interface SessionService {
     int getOnlineScannerCount();
 
     int getOnlineAuditorCount();
-    
+
     boolean checkAuditorOnline(String loginName);
 
 }

+ 2 - 2
src/main/java/cn/com/qmth/scancentral/service/SubjectService.java

@@ -21,10 +21,10 @@ public interface SubjectService extends IMppService<SubjectEntity> {
 
     int importSubject(List<ImportSubjectDomain> subjects);
 
-	int cleanByExamId(Long examId);
+    int cleanByExamId(Long examId);
 
     SubjectConfigVo config(User user, SubjectConfigDomain domain);
-    
+
     List<SubjectConfig> listConfigByExamId(Long examId);
 
 }

+ 3 - 2
src/main/java/cn/com/qmth/scancentral/service/ToolExportService.java

@@ -3,9 +3,10 @@ package cn.com.qmth.scancentral.service;
 import cn.com.qmth.scancentral.enums.ImageTransferMode;
 
 public interface ToolExportService {
-	void studentCheck(Long studentId);
 
-	void studentFileCopy(Long studentId,ImageTransferMode imageTransferMode);
+    void studentCheck(Long studentId);
+
+    void studentFileCopy(Long studentId, ImageTransferMode imageTransferMode);
 
     String getCetSliceUri(Long examId, String examNumber, String sliceName);
 

+ 1 - 1
src/main/java/cn/com/qmth/scancentral/service/UploadService.java

@@ -2,6 +2,6 @@ package cn.com.qmth.scancentral.service;
 
 public interface UploadService {
 
-	public void upload();
+    public void upload();
 
 }

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно