xiaof %!s(int64=2) %!d(string=hai) anos
pai
achega
6b610d3002
Modificáronse 100 ficheiros con 0 adicións e 7553 borrados
  1. 0 71
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamStudentCourseClassDto.java
  2. 0 82
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamStudentCourseDto.java
  3. 0 25
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamStudentDto.java
  4. 0 57
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamStudentPdfInfoDto.java
  5. 0 60
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/Original.java
  6. 0 30
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ThirdObjectDto.java
  7. 0 124
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/approvalForm/BasicInfo.java
  8. 0 228
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/approvalForm/ExamPackageDetail.java
  9. 0 65
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/approvalForm/ExamRoomInfo.java
  10. 0 80
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/examObject/ExamObjectDto.java
  11. 0 111
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/excel/ExamStudentImportDto.java
  12. 0 81
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/excel/GradePaperDimensionAbilityDto.java
  13. 0 94
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/excel/GradePaperDimensionKnowledgeDto.java
  14. 0 172
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/excel/GradePaperStructDto.java
  15. 0 28
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/excel/TeachStudentImportDto.java
  16. 0 190
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/open/ExamStudentScore.java
  17. 0 90
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/open/PaperConfig.java
  18. 0 98
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/open/PaperDimension.java
  19. 0 157
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/open/PaperEvaluation.java
  20. 0 111
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/open/PaperStructure.java
  21. 0 131
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/BasicPaperInfo.java
  22. 0 43
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/CardJpgResult.java
  23. 0 32
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/ConvertJpgStorage.java
  24. 0 49
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/EvaluationParameters.java
  25. 0 81
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/GroupInfo.java
  26. 0 35
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/Marker.java
  27. 0 34
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/PaperStructureInfo.java
  28. 0 65
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/PictureConfig.java
  29. 0 123
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/Question.java
  30. 0 238
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/ExaminationDetailResult.java
  31. 0 249
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/ExaminationResult.java
  32. 0 47
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/SummarizedDataResult.java
  33. 0 361
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/TSyncExamStudentScoreResult.java
  34. 0 46
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/examTaskStudent/ExamTaskExamStudentImportResult.java
  35. 0 61
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/examTaskStudent/ExamTaskStudentObjectResult.java
  36. 0 116
      paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/examTaskStudent/StudentInfo.java
  37. 0 27
      paper-library-business/src/main/java/com/qmth/paper/library/business/cache/CreatePdfCacheUtil.java
  38. 0 17
      paper-library-business/src/main/java/com/qmth/paper/library/business/cache/RedisKeyHelper.java
  39. 0 194
      paper-library-business/src/main/java/com/qmth/paper/library/business/entity/ClientStatus.java
  40. 0 282
      paper-library-business/src/main/java/com/qmth/paper/library/business/entity/ExamStudent.java
  41. 0 57
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CardRequiredFieldsEnum.java
  42. 0 43
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CardStatusEnum.java
  43. 0 43
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CardTypeEnum.java
  44. 0 40
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ChooseTypeEnum.java
  45. 0 22
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ClazzContentEnum.java
  46. 0 42
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowApproveUserCountTypeEnum.java
  47. 0 42
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowApproveUserSelectRangeEnum.java
  48. 0 42
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowApproveUserTypeEnum.java
  49. 0 44
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowMultipleUserApproveTypeEnum.java
  50. 0 42
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowRejectResubmitTypeEnum.java
  51. 0 44
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowRejectTypeEnum.java
  52. 0 59
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowTypeEnum.java
  53. 0 42
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/DataSourceEnum.java
  54. 0 42
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamCardStatusEnum.java
  55. 0 20
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamDataSourceEnum.java
  56. 0 39
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamDetailStatusEnum.java
  57. 0 44
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamNumberStyleEnum.java
  58. 0 28
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamObjectType.java
  59. 0 44
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamPaperStructureStatusEnum.java
  60. 0 45
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamPrintPlanSyncStatusEnum.java
  61. 0 45
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamStatusEnum.java
  62. 0 42
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/FlowJoinTypeEnum.java
  63. 0 42
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ImageTrajectoryEnum.java
  64. 0 45
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/MakeMethodEnum.java
  65. 0 22
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/PaperFileDownloadContentEnum.java
  66. 0 22
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/PaperFileDownloadExposureStatusEnum.java
  67. 0 43
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/PaperTypeEnum.java
  68. 0 43
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/PrintMethodEnum.java
  69. 0 41
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/PrintPlanStatusEnum.java
  70. 0 77
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/RequiredFieldsEnum.java
  71. 0 43
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ReviewStatusEnum.java
  72. 0 44
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/StatisticsStatusEnum.java
  73. 0 44
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/StorageLevelEnum.java
  74. 0 43
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/StorageTypeEnum.java
  75. 0 44
      paper-library-business/src/main/java/com/qmth/paper/library/business/enums/TemplateTypeEnum.java
  76. 0 52
      paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/ExamStudentMapper.java
  77. 0 17
      paper-library-business/src/main/java/com/qmth/paper/library/business/service/ExamStudentService.java
  78. 0 20
      paper-library-business/src/main/java/com/qmth/paper/library/business/service/PrintCommonService.java
  79. 0 25
      paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/ExamStudentServiceImpl.java
  80. 0 186
      paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PrintCommonServiceImpl.java
  81. 0 20
      paper-library-business/src/main/java/com/qmth/paper/library/business/templete/callback/CallbackCreatePdf.java
  82. 0 37
      paper-library-business/src/main/java/com/qmth/paper/library/business/templete/create/AsyncCreateTaskTemplete.java
  83. 0 23
      paper-library-business/src/main/java/com/qmth/paper/library/business/templete/export/SyncExportTaskTemplete.java
  84. 0 183
      paper-library-business/src/main/java/com/qmth/paper/library/business/util/GoogleBarCodeUtil.java
  85. 0 126
      paper-library-business/src/main/java/com/qmth/paper/library/business/util/HtmlToJpgUtil.java
  86. 0 80
      paper-library-business/src/main/java/com/qmth/paper/library/business/util/HtmlToPdfUtil.java
  87. 0 52
      paper-library-business/src/main/java/com/qmth/paper/library/business/util/SmsUtils.java
  88. 0 254
      paper-library-business/src/main/resources/mapper/ExamStudentMapper.xml
  89. 0 54
      paper-library-common/src/main/java/com/qmth/paper/library/common/config/DictionaryConfig.java
  90. 0 62
      paper-library-common/src/main/java/com/qmth/paper/library/common/contant/SystemConstant.java
  91. 0 98
      paper-library-common/src/main/java/com/qmth/paper/library/common/domain/PrintOpenDomain.java
  92. 0 103
      paper-library-common/src/main/java/com/qmth/paper/library/common/domain/ReportOpenDomain.java
  93. 0 117
      paper-library-common/src/main/java/com/qmth/paper/library/common/domain/SmsDomain.java
  94. 0 167
      paper-library-common/src/main/java/com/qmth/paper/library/common/domain/SyncDataDomain.java
  95. 0 39
      paper-library-common/src/main/java/com/qmth/paper/library/common/domain/YunMarkDomain.java
  96. 0 42
      paper-library-common/src/main/java/com/qmth/paper/library/common/enums/AssignEnum.java
  97. 0 41
      paper-library-common/src/main/java/com/qmth/paper/library/common/enums/CardCreateMethodEnum.java
  98. 0 43
      paper-library-common/src/main/java/com/qmth/paper/library/common/enums/ClassifyEnum.java
  99. 0 42
      paper-library-common/src/main/java/com/qmth/paper/library/common/enums/DepartmentTypeEnum.java
  100. 0 21
      paper-library-common/src/main/java/com/qmth/paper/library/common/enums/DimensionEnum.java

+ 0 - 71
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamStudentCourseClassDto.java

@@ -1,71 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.business.entity.ExamStudent;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 考生科目 dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/5/14
- */
-public class ExamStudentCourseClassDto extends ExamStudent {
-
-    @ApiModelProperty(value = "科目编码")
-    private String courseCode;
-
-    @ApiModelProperty(value = "科目名称")
-    private String courseName;
-
-    @ApiModelProperty("试卷编号")
-    private String paperNumber;
-
-    @ApiModelProperty("任课老师")
-    private String teacherName;
-
-    @ApiModelProperty("任课老师工号")
-    private String teacherNumber;
-
-    @Override
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    @Override
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public String getTeacherNumber() {
-        return teacherNumber;
-    }
-
-    public void setTeacherNumber(String teacherNumber) {
-        this.teacherNumber = teacherNumber;
-    }
-}

+ 0 - 82
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamStudentCourseDto.java

@@ -1,82 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.business.entity.ExamStudent;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 考生科目 dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/5/14
- */
-public class ExamStudentCourseDto extends ExamStudent {
-
-    @ApiModelProperty(value = "科目编码")
-    private String courseCode;
-
-    @ApiModelProperty(value = "科目名称")
-    private String courseName;
-
-    @ApiModelProperty(value = "A3数量")
-    private Integer paperPageA3;
-
-    @ApiModelProperty("试卷编号")
-    private String paperNumber;
-
-    @ApiModelProperty("任课老师")
-    private String teacherName;
-
-    @ApiModelProperty("任课老师工号")
-    private String teacherNumber;
-
-    @Override
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    @Override
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public Integer getPaperPageA3() {
-        return paperPageA3;
-    }
-
-    public void setPaperPageA3(Integer paperPageA3) {
-        this.paperPageA3 = paperPageA3;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public String getTeacherNumber() {
-        return teacherNumber;
-    }
-
-    public void setTeacherNumber(String teacherNumber) {
-        this.teacherNumber = teacherNumber;
-    }
-}

+ 0 - 25
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamStudentDto.java

@@ -1,25 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.business.entity.ExamStudent;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 考生dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/4/12
- */
-public class ExamStudentDto extends ExamStudent {
-
-    @ApiModelProperty(value = "序号")
-    private Integer index; //序号
-
-    public Integer getIndex() {
-        return index;
-    }
-
-    public void setIndex(Integer index) {
-        this.index = index;
-    }
-}

+ 0 - 57
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ExamStudentPdfInfoDto.java

@@ -1,57 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.qmth.paper.library.business.entity.ExamStudent;
-
-/**
- * 生成pdf需要的考生信息
- */
-public class ExamStudentPdfInfoDto extends ExamStudent {
-
-    private String courseCode;
-    private String courseName;
-    private String paperNumber;
-    private String examPlace;
-    private String examRoom;
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    @Override
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    @Override
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getExamPlace() {
-        return examPlace;
-    }
-
-    public void setExamPlace(String examPlace) {
-        this.examPlace = examPlace;
-    }
-
-    public String getExamRoom() {
-        return examRoom;
-    }
-
-    public void setExamRoom(String examRoom) {
-        this.examRoom = examRoom;
-    }
-}

+ 0 - 60
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/Original.java

@@ -1,60 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.enums.PageSizeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 试卷转换前记录
- * @Author: CaoZixuan
- * @Date: 2022-09-01
- */
-public class Original {
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty("原始卷附件id")
-    private Long id;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty("更新时间")
-    private Long updateTime;
-
-    @ApiModelProperty("页数")
-    private Integer pages;
-
-    @ApiModelProperty("试卷纸张类型")
-    private PageSizeEnum pageSize;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getPages() {
-        return pages;
-    }
-
-    public void setPages(Integer pages) {
-        this.pages = pages;
-    }
-
-    public PageSizeEnum getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(PageSizeEnum pageSize) {
-        this.pageSize = pageSize;
-    }
-}

+ 0 - 30
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/ThirdObjectDto.java

@@ -1,30 +0,0 @@
-package com.qmth.paper.library.business.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
-/**
- * @Date: 2021/3/29.
- */
-public class ThirdObjectDto {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long thirdRelateId;
-    private String thirdRelateName;
-
-    public Long getThirdRelateId() {
-        return thirdRelateId;
-    }
-
-    public void setThirdRelateId(Long thirdRelateId) {
-        this.thirdRelateId = thirdRelateId;
-    }
-
-    public String getThirdRelateName() {
-        return thirdRelateName;
-    }
-
-    public void setThirdRelateName(String thirdRelateName) {
-        this.thirdRelateName = thirdRelateName;
-    }
-}

+ 0 - 124
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/approvalForm/BasicInfo.java

@@ -1,124 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.approvalForm;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 命题任务审批表 - 基础信息
- * @Author: CaoZixuan
- * @Date: 2021-09-06
- */
-public class BasicInfo {
-    @ApiModelProperty(value = "学院id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long collegeId;
-
-    @ApiModelProperty(value = "学院名称")
-    private String collegeName;
-
-    @ApiModelProperty(value = "教研室id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long teachingRoomId;
-
-    @ApiModelProperty(value = "教研室名称")
-    private String teachingRoomName;
-
-    @ApiModelProperty(value = "试卷编号")
-    private String paperNumber;
-
-    @ApiModelProperty(value = "试卷名称")
-    private String paperName;
-
-    @ApiModelProperty(value = "考试开始时间")
-    private Long examStartTime;
-
-    @ApiModelProperty(value = "考试结束时间")
-    private Long examEndTime;
-
-    @ApiModelProperty(value = "拟卷老师")
-    private String teacherName;
-
-    @ApiModelProperty(value = "课程名称")
-    private String courseName;
-
-    public Long getCollegeId() {
-        return collegeId;
-    }
-
-    public void setCollegeId(Long collegeId) {
-        this.collegeId = collegeId;
-    }
-
-    public String getCollegeName() {
-        return collegeName;
-    }
-
-    public void setCollegeName(String collegeName) {
-        this.collegeName = collegeName;
-    }
-
-    public Long getTeachingRoomId() {
-        return teachingRoomId;
-    }
-
-    public void setTeachingRoomId(Long teachingRoomId) {
-        this.teachingRoomId = teachingRoomId;
-    }
-
-    public String getTeachingRoomName() {
-        return teachingRoomName;
-    }
-
-    public void setTeachingRoomName(String teachingRoomName) {
-        this.teachingRoomName = teachingRoomName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getPaperName() {
-        return paperName;
-    }
-
-    public void setPaperName(String paperName) {
-        this.paperName = paperName;
-    }
-
-    public Long getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(Long examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public Long getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(Long examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-}

+ 0 - 228
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/approvalForm/ExamPackageDetail.java

@@ -1,228 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.approvalForm;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.enums.BackupMethodEnum;
-import com.qmth.paper.library.business.enums.ExamDetailStatusEnum;
-import com.qmth.paper.library.business.enums.PrintPlanStatusEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 试卷包详情
- * @Author: CaoZixuan
- * @Date: 2021-09-07
- */
-public class ExamPackageDetail {
-
-    @ApiModelProperty(value = "考场表id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examDetailId;
-
-    @ApiModelProperty(value = "考试开始时间")
-    private Long examStartTime;
-
-    @ApiModelProperty(value = "考试结束时间")
-    private Long examEndTime;
-
-    @ApiModelProperty(value = "考点")
-    private String examPlace;
-
-    @ApiModelProperty(value = "考场")
-    private String examRoom;
-
-    @ApiModelProperty(value = "卷袋编号")
-    private String packageCode;
-
-    @ApiModelProperty(value = "考场表状态")
-    private ExamDetailStatusEnum examDetailStatus;
-
-    @ApiModelProperty(value = "考场课程表id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examDetailCourseId;
-
-    @ApiModelProperty(value = "课程编号")
-    private String courseCode;
-
-    @ApiModelProperty(value = "课程名称")
-    private String courseName;
-
-    @ApiModelProperty(value = "试卷编号")
-    private String paperNumber;
-
-    @ApiModelProperty(value = "考场课程表人数统计")
-    private Integer examDetailCourseTotalSubjects;
-
-    @ApiModelProperty(value = "考察课程表班级合计")
-    private String clazzIds;
-
-    @ApiModelProperty(value = "印刷计划id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examPrintPlanId;
-
-    @ApiModelProperty(value = "印刷计划名称")
-    private String examPrintPlanName;
-
-    @ApiModelProperty(value = "印刷计划印品")
-    private String printContent;
-
-    @ApiModelProperty(value = "备份方式")
-    private BackupMethodEnum backupMethod;
-
-    @ApiModelProperty(value = "备份数量")
-    private Integer backupCount;
-
-    @ApiModelProperty(value = "印刷计划状态")
-    private PrintPlanStatusEnum examPrintPlanStatus;
-
-    public Long getExamDetailId() {
-        return examDetailId;
-    }
-
-    public void setExamDetailId(Long examDetailId) {
-        this.examDetailId = examDetailId;
-    }
-
-    public Long getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(Long examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public Long getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(Long examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-
-    public String getExamPlace() {
-        return examPlace;
-    }
-
-    public void setExamPlace(String examPlace) {
-        this.examPlace = examPlace;
-    }
-
-    public String getExamRoom() {
-        return examRoom;
-    }
-
-    public void setExamRoom(String examRoom) {
-        this.examRoom = examRoom;
-    }
-
-    public String getPackageCode() {
-        return packageCode;
-    }
-
-    public void setPackageCode(String packageCode) {
-        this.packageCode = packageCode;
-    }
-
-    public ExamDetailStatusEnum getExamDetailStatus() {
-        return examDetailStatus;
-    }
-
-    public void setExamDetailStatus(ExamDetailStatusEnum examDetailStatus) {
-        this.examDetailStatus = examDetailStatus;
-    }
-
-    public Long getExamDetailCourseId() {
-        return examDetailCourseId;
-    }
-
-    public void setExamDetailCourseId(Long examDetailCourseId) {
-        this.examDetailCourseId = examDetailCourseId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public Integer getExamDetailCourseTotalSubjects() {
-        return examDetailCourseTotalSubjects;
-    }
-
-    public void setExamDetailCourseTotalSubjects(Integer examDetailCourseTotalSubjects) {
-        this.examDetailCourseTotalSubjects = examDetailCourseTotalSubjects;
-    }
-
-    public String getClazzIds() {
-        return clazzIds;
-    }
-
-    public void setClazzIds(String clazzIds) {
-        this.clazzIds = clazzIds;
-    }
-
-    public Long getExamPrintPlanId() {
-        return examPrintPlanId;
-    }
-
-    public void setExamPrintPlanId(Long examPrintPlanId) {
-        this.examPrintPlanId = examPrintPlanId;
-    }
-
-    public String getExamPrintPlanName() {
-        return examPrintPlanName;
-    }
-
-    public void setExamPrintPlanName(String examPrintPlanName) {
-        this.examPrintPlanName = examPrintPlanName;
-    }
-
-    public String getPrintContent() {
-        return printContent;
-    }
-
-    public void setPrintContent(String printContent) {
-        this.printContent = printContent;
-    }
-
-    public BackupMethodEnum getBackupMethod() {
-        return backupMethod;
-    }
-
-    public void setBackupMethod(BackupMethodEnum backupMethod) {
-        this.backupMethod = backupMethod;
-    }
-
-    public Integer getBackupCount() {
-        return backupCount;
-    }
-
-    public void setBackupCount(Integer backupCount) {
-        this.backupCount = backupCount;
-    }
-
-    public PrintPlanStatusEnum getExamPrintPlanStatus() {
-        return examPrintPlanStatus;
-    }
-
-    public void setExamPrintPlanStatus(PrintPlanStatusEnum examPrintPlanStatus) {
-        this.examPrintPlanStatus = examPrintPlanStatus;
-    }
-}

+ 0 - 65
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/approvalForm/ExamRoomInfo.java

@@ -1,65 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.approvalForm;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 命题任务审批表 - 考场信息
- * @Author: CaoZixuan
- * @Date: 2021-09-06
- */
-public class ExamRoomInfo {
-    @ApiModelProperty(value = "卷袋编号")
-    private String packageCode;
-
-//    @ApiModelProperty(value = "校区名称")
-//    private String campusNames;
-
-    @ApiModelProperty(value = "使用班级(考场)")
-    private String clazzNames;
-
-    @ApiModelProperty(value = "人数")
-    private Integer studentCount;
-
-    @ApiModelProperty(value = "总印份数(人数 + 备用)")
-    private String printCount;
-
-    public String getPackageCode() {
-        return packageCode;
-    }
-
-    public void setPackageCode(String packageCode) {
-        this.packageCode = packageCode;
-    }
-
-//    public String getCampusNames() {
-//        return campusNames;
-//    }
-//
-//    public void setCampusNames(String campusNames) {
-//        this.campusNames = campusNames;
-//    }
-
-    public String getClazzNames() {
-        return clazzNames;
-    }
-
-    public void setClazzNames(String clazzNames) {
-        this.clazzNames = clazzNames;
-    }
-
-    public Integer getStudentCount() {
-        return studentCount;
-    }
-
-    public void setStudentCount(Integer studentCount) {
-        this.studentCount = studentCount;
-    }
-
-    public String getPrintCount() {
-        return printCount;
-    }
-
-    public void setPrintCount(String printCount) {
-        this.printCount = printCount;
-    }
-}

+ 0 - 80
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/examObject/ExamObjectDto.java

@@ -1,80 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.examObject;
-
-import com.qmth.paper.library.business.bean.dto.approvalForm.ExamRoomInfo;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * @Description:
- * @Author: CaoZixuan
- * @Date:
- */
-public class ExamObjectDto {
-
-    @ApiModelProperty(value = "考试开始时间")
-    private Long examStartTime;
-
-    @ApiModelProperty(value = "考试结束时间")
-    private Long examEndTime;
-
-    @ApiModelProperty(value = "总印量")
-    private Integer printTotalCount;
-
-    @ApiModelProperty(value = "试卷编号")
-    private String paperNumber;
-
-    @ApiModelProperty(value = "试卷名称")
-    private String paperName;
-
-    @ApiModelProperty(value = "考场信息集合")
-    private List<ExamRoomInfo> examRoomInfoList;
-
-    public Long getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(Long examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public Long getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(Long examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-
-    public Integer getPrintTotalCount() {
-        return printTotalCount;
-    }
-
-    public void setPrintTotalCount(Integer printTotalCount) {
-        this.printTotalCount = printTotalCount;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getPaperName() {
-        return paperName;
-    }
-
-    public void setPaperName(String paperName) {
-        this.paperName = paperName;
-    }
-
-    public List<ExamRoomInfo> getExamRoomInfoList() {
-        return examRoomInfoList;
-    }
-
-    public void setExamRoomInfoList(List<ExamRoomInfo> examRoomInfoList) {
-        this.examRoomInfoList = examRoomInfoList;
-    }
-}

+ 0 - 111
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/excel/ExamStudentImportDto.java

@@ -1,111 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.excel;
-
-import com.qmth.paper.library.common.annotation.ExcelImportTempleteVaild;
-import com.qmth.paper.library.common.annotation.ExcelNote;
-
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * @Description: 考生导入dto
- * @Author: CaoZixuan
- * @Date: 2022-09-02
- */
-@ExcelImportTempleteVaild(value = true)
-public class ExamStudentImportDto implements Serializable {
-    @ExcelNote(value = "姓名")
-    @NotNull
-    private String studentName;
-
-    @ExcelNote(value = "学号")
-    @NotNull
-    private String studentCode;
-
-    @ExcelNote(value = "手机号")
-    private String phoneNumber;
-
-    @ExcelNote(value = "学院")
-    @NotNull
-    private String collegeName;
-
-    @ExcelNote(value = "专业")
-    @NotNull
-    private String majorName;
-
-    @ExcelNote(value = "班级")
-    @NotNull
-    private String clazzName;
-
-    @ExcelNote(value = "考点")
-    @NotNull
-    private String examPlace;
-
-    @ExcelNote(value = "考场")
-    @NotNull
-    private String examRoom;
-
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getPhoneNumber() {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(String phoneNumber) {
-        this.phoneNumber = phoneNumber;
-    }
-
-    public String getCollegeName() {
-        return collegeName;
-    }
-
-    public void setCollegeName(String collegeName) {
-        this.collegeName = collegeName;
-    }
-
-    public String getMajorName() {
-        return majorName;
-    }
-
-    public void setMajorName(String majorName) {
-        this.majorName = majorName;
-    }
-
-    public String getClazzName() {
-        return clazzName;
-    }
-
-    public void setClazzName(String clazzName) {
-        this.clazzName = clazzName;
-    }
-
-    public String getExamPlace() {
-        return examPlace;
-    }
-
-    public void setExamPlace(String examPlace) {
-        this.examPlace = examPlace;
-    }
-
-    public String getExamRoom() {
-        return examRoom;
-    }
-
-    public void setExamRoom(String examRoom) {
-        this.examRoom = examRoom;
-    }
-}

+ 0 - 81
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/excel/GradePaperDimensionAbilityDto.java

@@ -1,81 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.excel;
-
-import com.qmth.paper.library.common.annotation.ExcelImportTempleteVaild;
-import com.qmth.paper.library.common.annotation.ExcelNote;
-import com.qmth.paper.library.common.annotation.ExcelProperty;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description: 分析试卷能力维度数据导入类
- * @Author: CaoZixuan
- * @Date: 2022-05-27
- */
-@ExcelImportTempleteVaild(value = true)
-public class GradePaperDimensionAbilityDto {
-
-    @ExcelNote(value = "课程代码")
-    @ExcelProperty(name = "课程代码", width = 30, index = 1)
-    @NotNull
-    private String courseCode;
-
-    @ExcelNote(value = "课程名称")
-    @ExcelProperty(name = "课程名称", width = 30, index = 2)
-    @NotNull
-    private String courseName;
-
-    @ExcelNote(value = "一级能力维度")
-    @ExcelProperty(name = "一级能力维度", width = 30, index = 3)
-    @NotNull
-    private String namePrimary;
-
-    @ExcelNote(value = "一级维度编号")
-    @ExcelProperty(name = "一级维度编号", width = 30, index = 4)
-    @NotNull
-    private String codePrimary;
-
-    @ExcelNote(value = "一级维度术语解释")
-    @ExcelProperty(name = "一级维度术语解释", width = 30, index = 5)
-    @NotNull
-    private String interpret;
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getNamePrimary() {
-        return namePrimary;
-    }
-
-    public void setNamePrimary(String namePrimary) {
-        this.namePrimary = namePrimary;
-    }
-
-    public String getCodePrimary() {
-        return codePrimary;
-    }
-
-    public void setCodePrimary(String codePrimary) {
-        this.codePrimary = codePrimary;
-    }
-
-    public String getInterpret() {
-        return interpret;
-    }
-
-    public void setInterpret(String interpret) {
-        this.interpret = interpret;
-    }
-}

+ 0 - 94
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/excel/GradePaperDimensionKnowledgeDto.java

@@ -1,94 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.excel;
-
-import com.qmth.paper.library.common.annotation.ExcelImportTempleteVaild;
-import com.qmth.paper.library.common.annotation.ExcelNote;
-import com.qmth.paper.library.common.annotation.ExcelProperty;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description: 分析试卷知识维度数据导入类
- * @Author: CaoZixuan
- * @Date: 2022-05-27
- */
-@ExcelImportTempleteVaild(value = true)
-public class GradePaperDimensionKnowledgeDto {
-
-    @ExcelNote(value = "课程代码")
-    @ExcelProperty(name = "课程代码", width = 30, index = 1)
-    @NotNull
-    private String courseCode;
-
-    @ExcelNote(value = "课程名称")
-    @ExcelProperty(name = "课程名称", width = 30, index = 2)
-    @NotNull
-    private String courseName;
-
-    @ExcelNote(value = "一级知识维度")
-    @ExcelProperty(name = "一级知识维度", width = 30, index = 3)
-    @NotNull
-    private String namePrimary;
-
-    @ExcelNote(value = "一级维度编号")
-    @ExcelProperty(name = "一级维度编号", width = 30, index = 4)
-    @NotNull
-    private String codePrimary;
-
-    @ExcelNote(value = "二级知识维度")
-    @ExcelProperty(name = "二级知识维度", width = 30, index = 5)
-    @NotNull
-    private String nameSecond;
-
-    @ExcelNote(value = "二级维度编号")
-    @ExcelProperty(name = "二级维度编号", width = 30, index = 6)
-    @NotNull
-    private String codeSecond;
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getNamePrimary() {
-        return namePrimary;
-    }
-
-    public void setNamePrimary(String namePrimary) {
-        this.namePrimary = namePrimary;
-    }
-
-    public String getCodePrimary() {
-        return codePrimary;
-    }
-
-    public void setCodePrimary(String codePrimary) {
-        this.codePrimary = codePrimary;
-    }
-
-    public String getNameSecond() {
-        return nameSecond;
-    }
-
-    public void setNameSecond(String nameSecond) {
-        this.nameSecond = nameSecond;
-    }
-
-    public String getCodeSecond() {
-        return codeSecond;
-    }
-
-    public void setCodeSecond(String codeSecond) {
-        this.codeSecond = codeSecond;
-    }
-}

+ 0 - 172
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/excel/GradePaperStructDto.java

@@ -1,172 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.excel;
-
-import com.qmth.paper.library.common.annotation.ExcelImportTempleteVaild;
-import com.qmth.paper.library.common.annotation.ExcelNote;
-import com.qmth.paper.library.common.annotation.ExcelProperty;
-import com.qmth.paper.library.common.annotation.excelStyle.ExcelDataStyle;
-import com.qmth.paper.library.common.annotation.excelStyle.ExcelHeaderStyle;
-import org.apache.poi.ss.usermodel.IndexedColors;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description: 分析试卷结构excel操作类
- * @Author: CaoZixuan
- * @Date: 2022-05-30
- */
-@ExcelHeaderStyle
-@ExcelImportTempleteVaild(value = true)
-public class GradePaperStructDto {
-    @ExcelNote(value = "课程代码")
-    @ExcelProperty(name = "课程代码", width = 30, index = 1)
-    @ExcelDataStyle(lock = true)
-    @NotNull
-    private String courseCode;
-
-    @ExcelNote(value = "课程名称")
-    @ExcelProperty(name = "课程名称", width = 30, index = 2)
-    @ExcelDataStyle(lock = true)
-    @NotNull
-    private String courseName;
-
-    @ExcelNote(value = "试卷编号")
-    @ExcelProperty(name = "试卷编号", width = 30, index = 3)
-    @ExcelDataStyle(lock = true)
-    @NotNull
-    private String paperNumber;
-
-    @ExcelNote(value = "试卷类型")
-    @ExcelProperty(name = "试卷类型", width = 30, index = 4)
-    @ExcelDataStyle(lock = true)
-    @NotNull
-    private String paperType;
-
-    @ExcelNote(value = "题目类型")
-    @ExcelProperty(name = "题目类型", width = 30, index = 5)
-    @ExcelDataStyle(lock = true)
-    @NotNull
-    private String numberType;
-
-    @ExcelNote(value = "大题名称")
-    @ExcelProperty(name = "大题名称", width = 30, index = 6)
-    @ExcelDataStyle(lock = true)
-    @NotNull
-    private String bigTopicName;
-
-    @ExcelNote(value = "大题号")
-    @ExcelProperty(name = "大题号", width = 30, index = 7)
-    @ExcelDataStyle(lock = true)
-    @NotNull
-    private String bigQuestionNumber;
-
-    @ExcelNote(value = "小题号")
-    @ExcelProperty(name = "小题号", width = 30, index = 8)
-    @ExcelDataStyle(lock = true)
-    @NotNull
-    private String smallQuestionNumber;
-
-    @ExcelNote(value = "题目满分")
-    @ExcelProperty(name = "题目满分", width = 30, index = 9)
-    @ExcelDataStyle(lock = true)
-    @NotNull
-    private String fullScore;
-
-    @ExcelNote(value = "知识维度")
-    @ExcelProperty(name = "知识维度", width = 30, index = 10)
-    @ExcelDataStyle
-    @NotNull
-    private String knowledgeDimension;
-
-    @ExcelNote(value = "能力维度")
-    @ExcelProperty(name = "能力维度", width = 30, index = 11)
-    @ExcelDataStyle
-    private String abilityDimension;
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getNumberType() {
-        return numberType;
-    }
-
-    public void setNumberType(String numberType) {
-        this.numberType = numberType;
-    }
-
-    public String getBigTopicName() {
-        return bigTopicName;
-    }
-
-    public void setBigTopicName(String bigTopicName) {
-        this.bigTopicName = bigTopicName;
-    }
-
-    public String getBigQuestionNumber() {
-        return bigQuestionNumber;
-    }
-
-    public void setBigQuestionNumber(String bigQuestionNumber) {
-        this.bigQuestionNumber = bigQuestionNumber;
-    }
-
-    public String getSmallQuestionNumber() {
-        return smallQuestionNumber;
-    }
-
-    public void setSmallQuestionNumber(String smallQuestionNumber) {
-        this.smallQuestionNumber = smallQuestionNumber;
-    }
-
-    public String getFullScore() {
-        return fullScore;
-    }
-
-    public void setFullScore(String fullScore) {
-        this.fullScore = fullScore;
-    }
-
-    public String getKnowledgeDimension() {
-        return knowledgeDimension;
-    }
-
-    public void setKnowledgeDimension(String knowledgeDimension) {
-        this.knowledgeDimension = knowledgeDimension;
-    }
-
-    public String getAbilityDimension() {
-        return abilityDimension;
-    }
-
-    public void setAbilityDimension(String abilityDimension) {
-        this.abilityDimension = abilityDimension;
-    }
-}

+ 0 - 28
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/excel/TeachStudentImportDto.java

@@ -1,28 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.excel;
-
-import com.qmth.paper.library.common.annotation.ExcelImportTempleteVaild;
-import com.qmth.paper.library.common.annotation.ExcelNote;
-
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * @Description: 教学学生导入Dto
- * @Author: CaoZixuan
- * @Date: 2022-02-10
- */
-@ExcelImportTempleteVaild(value = true)
-public class TeachStudentImportDto implements Serializable {
-
-    @ExcelNote(value = "学号")
-    @NotNull
-    private String studentCode;
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-}

+ 0 - 190
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/open/ExamStudentScore.java

@@ -1,190 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.open;
-
-import java.util.List;
-
-public class ExamStudentScore {
-
-    private String name;
-    private String studentCode;
-    private String paperNumber;
-    private String paperName;
-    private String paperType;
-    private String college;
-    private String major;
-    private String className;
-    private String teacherName;
-    private String teacherCode;
-    private Integer status;
-    private Double totalScore;
-    private Double objectiveScore;
-    private Double subjectiveScore;
-    private List<TopicInfo> objectiveScoreDetail;
-    private List<TopicInfo> subjectiveScoreDetail;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getPaperName() {
-        return paperName;
-    }
-
-    public void setPaperName(String paperName) {
-        this.paperName = paperName;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getCollege() {
-        return college;
-    }
-
-    public void setCollege(String college) {
-        this.college = college;
-    }
-
-    public String getMajor() {
-        return major;
-    }
-
-    public void setMajor(String major) {
-        this.major = major;
-    }
-
-    public String getClassName() {
-        return className;
-    }
-
-    public void setClassName(String className) {
-        this.className = className;
-    }
-
-    public String getTeacherName() {
-        return teacherName;
-    }
-
-    public void setTeacherName(String teacherName) {
-        this.teacherName = teacherName;
-    }
-
-    public String getTeacherCode() {
-        return teacherCode;
-    }
-
-    public void setTeacherCode(String teacherCode) {
-        this.teacherCode = teacherCode;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public Double getObjectiveScore() {
-        return objectiveScore;
-    }
-
-    public void setObjectiveScore(Double objectiveScore) {
-        this.objectiveScore = objectiveScore;
-    }
-
-    public Double getSubjectiveScore() {
-        return subjectiveScore;
-    }
-
-    public void setSubjectiveScore(Double subjectiveScore) {
-        this.subjectiveScore = subjectiveScore;
-    }
-
-    public List<TopicInfo> getObjectiveScoreDetail() {
-        return objectiveScoreDetail;
-    }
-
-    public void setObjectiveScoreDetail(List<TopicInfo> objectiveScoreDetail) {
-        this.objectiveScoreDetail = objectiveScoreDetail;
-    }
-
-    public List<TopicInfo> getSubjectiveScoreDetail() {
-        return subjectiveScoreDetail;
-    }
-
-    public void setSubjectiveScoreDetail(List<TopicInfo> subjectiveScoreDetail) {
-        this.subjectiveScoreDetail = subjectiveScoreDetail;
-    }
-
-    public static class TopicInfo{
-        private String score;
-        private String answer;
-        private Integer mainNumber;
-        private String subNumber;
-
-        public String getScore() {
-            return score;
-        }
-
-        public void setScore(String score) {
-            this.score = score;
-        }
-
-        public String getAnswer() {
-            return answer;
-        }
-
-        public void setAnswer(String answer) {
-            this.answer = answer;
-        }
-
-        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;
-        }
-    }
-}

+ 0 - 90
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/open/PaperConfig.java

@@ -1,90 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.open;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
-import java.math.BigDecimal;
-
-public class PaperConfig {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    private String paperType;
-
-    private Long startTime;
-
-    private Long endTime;
-
-    private BigDecimal coefficient;
-
-    private BigDecimal totalScore;
-
-    private BigDecimal passScore;
-
-    private String scoreType;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    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;
-    }
-
-    public BigDecimal getCoefficient() {
-        return coefficient;
-    }
-
-    public void setCoefficient(BigDecimal coefficient) {
-        this.coefficient = coefficient;
-    }
-
-    public BigDecimal getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(BigDecimal totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public BigDecimal getPassScore() {
-        return passScore;
-    }
-
-    public void setPassScore(BigDecimal passScore) {
-        this.passScore = passScore;
-    }
-
-    public String getScoreType() {
-        return scoreType;
-    }
-
-    public void setScoreType(String scoreType) {
-        this.scoreType = scoreType;
-    }
-}

+ 0 - 98
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/open/PaperDimension.java

@@ -1,98 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.open;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-
-public class PaperDimension {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    private String paperNumber;
-
-    private String paperName;
-
-    private String dimensionType;
-
-    private String codePrimary;
-
-    private String namePrimary;
-
-    private String codeSecond;
-
-    private String nameSecond;
-
-    private String interpretation;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getPaperName() {
-        return paperName;
-    }
-
-    public void setPaperName(String paperName) {
-        this.paperName = paperName;
-    }
-
-    public String getDimensionType() {
-        return dimensionType;
-    }
-
-    public void setDimensionType(String dimensionType) {
-        this.dimensionType = dimensionType;
-    }
-
-    public String getCodePrimary() {
-        return codePrimary;
-    }
-
-    public void setCodePrimary(String codePrimary) {
-        this.codePrimary = codePrimary;
-    }
-
-    public String getNamePrimary() {
-        return namePrimary;
-    }
-
-    public void setNamePrimary(String namePrimary) {
-        this.namePrimary = namePrimary;
-    }
-
-    public String getCodeSecond() {
-        return codeSecond;
-    }
-
-    public void setCodeSecond(String codeSecond) {
-        this.codeSecond = codeSecond;
-    }
-
-    public String getNameSecond() {
-        return nameSecond;
-    }
-
-    public void setNameSecond(String nameSecond) {
-        this.nameSecond = nameSecond;
-    }
-
-    public String getInterpretation() {
-        return interpretation;
-    }
-
-    public void setInterpretation(String interpretation) {
-        this.interpretation = interpretation;
-    }
-}

+ 0 - 157
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/open/PaperEvaluation.java

@@ -1,157 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.open;
-
-import java.util.List;
-
-public class PaperEvaluation {
-
-    private String moduleType;
-    private String interpret;
-    private String remark;
-    private List<SecondaryDimensionLevelDefine> secondaryDimensionLevelDefineList;
-    private String formula;
-    private List<ModuleEvaluation> moduleEvaluationList;
-
-    public String getModuleType() {
-        return moduleType;
-    }
-
-    public void setModuleType(String moduleType) {
-        this.moduleType = moduleType;
-    }
-
-    public String getInterpret() {
-        return interpret;
-    }
-
-    public void setInterpret(String interpret) {
-        this.interpret = interpret;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public List<SecondaryDimensionLevelDefine> getSecondaryDimensionLevelDefineList() {
-        return secondaryDimensionLevelDefineList;
-    }
-
-    public void setSecondaryDimensionLevelDefineList(List<SecondaryDimensionLevelDefine> secondaryDimensionLevelDefineList) {
-        this.secondaryDimensionLevelDefineList = secondaryDimensionLevelDefineList;
-    }
-
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public List<ModuleEvaluation> getModuleEvaluationList() {
-        return moduleEvaluationList;
-    }
-
-    public void setModuleEvaluationList(List<ModuleEvaluation> moduleEvaluationList) {
-        this.moduleEvaluationList = moduleEvaluationList;
-    }
-
-    public static class SecondaryDimensionLevelDefine{
-        private String define;
-        private String level;
-        private String max;
-        private String min;
-        private String scope;
-
-        public String getDefine() {
-            return define;
-        }
-
-        public void setDefine(String define) {
-            this.define = define;
-        }
-
-        public String getLevel() {
-            return level;
-        }
-
-        public void setLevel(String level) {
-            this.level = level;
-        }
-
-        public String getMax() {
-            return max;
-        }
-
-        public void setMax(String max) {
-            this.max = max;
-        }
-
-        public String getMin() {
-            return min;
-        }
-
-        public void setMin(String min) {
-            this.min = min;
-        }
-
-        public String getScope() {
-            return scope;
-        }
-
-        public void setScope(String scope) {
-            this.scope = scope;
-        }
-    }
-
-    public static class ModuleEvaluation{
-        private String advice;
-        private String levelCode;
-        private String levelName;
-        private String result;
-        private String scope;
-
-        public String getAdvice() {
-            return advice;
-        }
-
-        public void setAdvice(String advice) {
-            this.advice = advice;
-        }
-
-        public String getLevelCode() {
-            return levelCode;
-        }
-
-        public void setLevelCode(String levelCode) {
-            this.levelCode = levelCode;
-        }
-
-        public String getLevelName() {
-            return levelName;
-        }
-
-        public void setLevelName(String levelName) {
-            this.levelName = levelName;
-        }
-
-        public String getResult() {
-            return result;
-        }
-
-        public void setResult(String result) {
-            this.result = result;
-        }
-
-        public String getScope() {
-            return scope;
-        }
-
-        public void setScope(String scope) {
-            this.scope = scope;
-        }
-    }
-}

+ 0 - 111
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/dto/open/PaperStructure.java

@@ -1,111 +0,0 @@
-package com.qmth.paper.library.business.bean.dto.open;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-
-public class PaperStructure {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    private String questionName;
-
-    private String numberType;
-
-    private String bigQuestionNumber;
-
-    private String smallQuestionNumber;
-
-    private String bigTopicName;
-
-    private BigDecimal fullScore;
-
-    private String scoreRules;
-
-    private String knowledgeDimension;
-
-    private String abilityDimension;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getQuestionName() {
-        return questionName;
-    }
-
-    public void setQuestionName(String questionName) {
-        this.questionName = questionName;
-    }
-
-    public String getNumberType() {
-        return numberType;
-    }
-
-    public void setNumberType(String numberType) {
-        this.numberType = numberType;
-    }
-
-    public String getBigQuestionNumber() {
-        return bigQuestionNumber;
-    }
-
-    public void setBigQuestionNumber(String bigQuestionNumber) {
-        this.bigQuestionNumber = bigQuestionNumber;
-    }
-
-    public String getSmallQuestionNumber() {
-        return smallQuestionNumber;
-    }
-
-    public void setSmallQuestionNumber(String smallQuestionNumber) {
-        this.smallQuestionNumber = smallQuestionNumber;
-    }
-
-    public String getBigTopicName() {
-        return bigTopicName;
-    }
-
-    public void setBigTopicName(String bigTopicName) {
-        this.bigTopicName = bigTopicName;
-    }
-
-    public BigDecimal getFullScore() {
-        return fullScore;
-    }
-
-    public void setFullScore(BigDecimal fullScore) {
-        this.fullScore = fullScore;
-    }
-
-    public String getScoreRules() {
-        return scoreRules;
-    }
-
-    public void setScoreRules(String scoreRules) {
-        this.scoreRules = scoreRules;
-    }
-
-    public String getKnowledgeDimension() {
-        return knowledgeDimension;
-    }
-
-    public void setKnowledgeDimension(String knowledgeDimension) {
-        this.knowledgeDimension = knowledgeDimension;
-    }
-
-    public String getAbilityDimension() {
-        return abilityDimension;
-    }
-
-    public void setAbilityDimension(String abilityDimension) {
-        this.abilityDimension = abilityDimension;
-    }
-}

+ 0 - 131
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/BasicPaperInfo.java

@@ -1,131 +0,0 @@
-package com.qmth.paper.library.business.bean.marking;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.enums.ExamPaperStructureStatusEnum;
-import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * @Description 基础试卷信息
- * @Author CaoZixuan
- * @Date 2022-04-13
- */
-public class BasicPaperInfo {
-    @ApiModelProperty(value = "试卷结构表id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examPaperStructureId;
-
-    @ApiModelProperty(value = "考试id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long examId;
-
-    @ApiModelProperty(value = "云阅卷考试id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long thirdRelateId;
-
-    @ApiModelProperty(value = "云阅卷考试名称")
-    private String thirdRelateName;
-
-    @ApiModelProperty(value = "课程名称")
-    private String courseName;
-
-    @ApiModelProperty(value = "课程编号")
-    private String courseCode;
-
-    @ApiModelProperty(value = "试卷编号")
-    private String paperNumber;
-
-    @ApiModelProperty(value = "试卷类型(A,B)")
-    @NotNull(message = "请提供试卷类型")
-    @Length(min = 1,message = "请提供试卷类型")
-    private String paperType;
-
-    @ApiModelProperty(value = "状态")
-    private ExamPaperStructureStatusEnum status;
-
-    @ApiModelProperty(value = "课程创建的任务序号")
-    private String sequence;
-
-    public Long getExamPaperStructureId() {
-        return examPaperStructureId;
-    }
-
-    public void setExamPaperStructureId(Long examPaperStructureId) {
-        this.examPaperStructureId = examPaperStructureId;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public Long getThirdRelateId() {
-        return thirdRelateId;
-    }
-
-    public void setThirdRelateId(Long thirdRelateId) {
-        this.thirdRelateId = thirdRelateId;
-    }
-
-    public String getThirdRelateName() {
-        return thirdRelateName;
-    }
-
-    public void setThirdRelateName(String thirdRelateName) {
-        this.thirdRelateName = thirdRelateName;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public ExamPaperStructureStatusEnum getStatus() {
-        return status;
-    }
-
-    public void setStatus(ExamPaperStructureStatusEnum status) {
-        this.status = status;
-    }
-
-    public String getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(String sequence) {
-        this.sequence = sequence;
-    }
-}

+ 0 - 43
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/CardJpgResult.java

@@ -1,43 +0,0 @@
-package com.qmth.paper.library.business.bean.marking;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 题卡jpg文件返回结果
- * @Author: CaoZixuan
- * @Date: 2022-04-15
- */
-public class CardJpgResult {
-    @ApiModelProperty("jpg文件名")
-    private String name;
-
-    @ApiModelProperty("jpg文件是题卡第几页")
-    private Integer index;
-
-    @ApiModelProperty("jpg文件预览路径")
-    private String path;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getIndex() {
-        return index;
-    }
-
-    public void setIndex(Integer index) {
-        this.index = index;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-}

+ 0 - 32
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/ConvertJpgStorage.java

@@ -1,32 +0,0 @@
-package com.qmth.paper.library.business.bean.marking;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 转化的pdf文件存储
- * @Author: CaoZixuan
- * @Date: 2022-04-15
- */
-public class ConvertJpgStorage {
-    @ApiModelProperty("jpg附件id")
-    private Long attachmentId;
-
-    @ApiModelProperty("jpg是题卡的第几页")
-    private Integer index;
-
-    public Long getAttachmentId() {
-        return attachmentId;
-    }
-
-    public void setAttachmentId(Long attachmentId) {
-        this.attachmentId = attachmentId;
-    }
-
-    public Integer getIndex() {
-        return index;
-    }
-
-    public void setIndex(Integer index) {
-        this.index = index;
-    }
-}

+ 0 - 49
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/EvaluationParameters.java

@@ -1,49 +0,0 @@
-package com.qmth.paper.library.business.bean.marking;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-/**
- * @Description: 评卷参数JSON
- * @Author: CaoZixuan
- * @Date: 2022-04-13
- */
-public class EvaluationParameters {
-    @ApiModelProperty(value = "基础试卷信息")
-    @NotNull(message = "缺少基础试卷信息")
-    private BasicPaperInfo basicPaperInfo;
-
-    @ApiModelProperty(value = "试卷结构信息")
-    @NotNull(message = "缺少试卷结构信息")
-    private PaperStructureInfo paperStructureInfo;
-
-    @ApiModelProperty(value = "分组信息")
-    @NotNull(message = "缺少分组信息")
-    private List<GroupInfo> groupInfo;
-
-    public BasicPaperInfo getBasicPaperInfo() {
-        return basicPaperInfo;
-    }
-
-    public void setBasicPaperInfo(BasicPaperInfo basicPaperInfo) {
-        this.basicPaperInfo = basicPaperInfo;
-    }
-
-    public PaperStructureInfo getPaperStructureInfo() {
-        return paperStructureInfo;
-    }
-
-    public void setPaperStructureInfo(PaperStructureInfo paperStructureInfo) {
-        this.paperStructureInfo = paperStructureInfo;
-    }
-
-    public List<GroupInfo> getGroupInfo() {
-        return groupInfo;
-    }
-
-    public void setGroupInfo(List<GroupInfo> groupInfo) {
-        this.groupInfo = groupInfo;
-    }
-}

+ 0 - 81
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/GroupInfo.java

@@ -1,81 +0,0 @@
-package com.qmth.paper.library.business.bean.marking;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * @Description: 试卷分组信息
- * @Author: CaoZixuan
- * @Date: 2022-04-13
- */
-public class GroupInfo {
-    @ApiModelProperty(value = "分组序号")
-    private Integer groupNumber;
-
-    @ApiModelProperty(value = "是否开启双评 true:开启双评 false:关闭双评")
-    private Double doubleRate;
-
-    @ApiModelProperty(value = "仲裁阈值")
-    private Double arbitrateThreshold;
-
-    @ApiModelProperty(value = "分组对应的题目集合")
-    private List<Question> questions;
-
-    @ApiModelProperty(value = "评卷员集合")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private List<Marker> markerList;
-
-    @ApiModelProperty(value = "图片配置")
-    private List<PictureConfig> pictureConfigList;
-
-    public Integer getGroupNumber() {
-        return groupNumber;
-    }
-
-    public void setGroupNumber(Integer groupNumber) {
-        this.groupNumber = groupNumber;
-    }
-
-    public Double getDoubleRate() {
-        return doubleRate;
-    }
-
-    public void setDoubleRate(Double doubleRate) {
-        this.doubleRate = doubleRate;
-    }
-
-    public Double getArbitrateThreshold() {
-        return arbitrateThreshold;
-    }
-
-    public void setArbitrateThreshold(Double arbitrateThreshold) {
-        this.arbitrateThreshold = arbitrateThreshold;
-    }
-
-    public List<Question> getQuestions() {
-        return questions;
-    }
-
-    public void setQuestions(List<Question> questions) {
-        this.questions = questions;
-    }
-
-    public List<Marker> getMarkerList() {
-        return markerList;
-    }
-
-    public void setMarkerList(List<Marker> markerList) {
-        this.markerList = markerList;
-    }
-
-    public List<PictureConfig> getPictureConfigList() {
-        return pictureConfigList;
-    }
-
-    public void setPictureConfigList(List<PictureConfig> pictureConfigList) {
-        this.pictureConfigList = pictureConfigList;
-    }
-}

+ 0 - 35
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/Marker.java

@@ -1,35 +0,0 @@
-package com.qmth.paper.library.business.bean.marking;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 评卷员信息
- * @Author: CaoZixuan
- * @Date: 2022-04-13
- */
-public class Marker {
-    @ApiModelProperty(value = "评卷员id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long id;
-
-    @ApiModelProperty("账号")
-    private String loginName;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-}

+ 0 - 34
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/PaperStructureInfo.java

@@ -1,34 +0,0 @@
-package com.qmth.paper.library.business.bean.marking;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * @Description: 试卷结构
- * @Author: CaoZixuan
- * @Date: 2022-04-13
- */
-public class PaperStructureInfo {
-    @ApiModelProperty(value = "客观题结构")
-    private List<Question> objectiveQuestionList;
-
-    @ApiModelProperty(value = "主观题结构")
-    private List<Question> subjectiveQuestionList;
-
-    public List<Question> getObjectiveQuestionList() {
-        return objectiveQuestionList;
-    }
-
-    public void setObjectiveQuestionList(List<Question> objectiveQuestionList) {
-        this.objectiveQuestionList = objectiveQuestionList;
-    }
-
-    public List<Question> getSubjectiveQuestionList() {
-        return subjectiveQuestionList;
-    }
-
-    public void setSubjectiveQuestionList(List<Question> subjectiveQuestionList) {
-        this.subjectiveQuestionList = subjectiveQuestionList;
-    }
-}

+ 0 - 65
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/PictureConfig.java

@@ -1,65 +0,0 @@
-package com.qmth.paper.library.business.bean.marking;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 分组图片设置
- * @Author: CaoZixuan
- * @Date: 2022-04-14
- */
-public class PictureConfig {
-    @ApiModelProperty(value = "图片序号")
-    private Integer i;
-
-    @ApiModelProperty(value = "左上角X坐标")
-    private Integer x;
-
-    @ApiModelProperty(value = "左上角y坐标")
-    private Integer y;
-
-    @ApiModelProperty(value = "裁切区宽度")
-    private Integer w;
-
-    @ApiModelProperty(value = "裁切区高度")
-    private Integer h;
-
-    public Integer getI() {
-        return i;
-    }
-
-    public void setI(Integer i) {
-        this.i = i;
-    }
-
-    public Integer getX() {
-        return x;
-    }
-
-    public void setX(Integer x) {
-        this.x = x;
-    }
-
-    public Integer getY() {
-        return y;
-    }
-
-    public void setY(Integer y) {
-        this.y = y;
-    }
-
-    public Integer getW() {
-        return w;
-    }
-
-    public void setW(Integer w) {
-        this.w = w;
-    }
-
-    public Integer getH() {
-        return h;
-    }
-
-    public void setH(Integer h) {
-        this.h = h;
-    }
-}

+ 0 - 123
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/marking/Question.java

@@ -1,123 +0,0 @@
-package com.qmth.paper.library.business.bean.marking;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 题目结构
- * @Author: CaoZixuan
- * @Date: 2022-04-13
- */
-public class Question {
-    @ApiModelProperty(value = "大题号")
-    private Integer mainNumber;
-
-    @ApiModelProperty(value = "大题名称")
-    private String mainTitle;
-
-    @ApiModelProperty(value = "小题号")
-    private String subNumber;
-
-    @ApiModelProperty(value = "小题总分")
-    private BigDecimal totalScore;
-
-    @ApiModelProperty(value = "客观题答案")
-    private String answer;
-
-    public Integer getMainNumber() {
-        return mainNumber;
-    }
-
-    public void setMainNumber(Integer mainNumber) {
-        this.mainNumber = mainNumber;
-    }
-
-    public String getMainTitle() {
-        return mainTitle;
-    }
-
-    public void setMainTitle(String mainTitle) {
-        this.mainTitle = mainTitle;
-    }
-
-    public String getSubNumber() {
-        return subNumber;
-    }
-
-    public void setSubNumber(String subNumber) {
-        this.subNumber = subNumber;
-    }
-
-    public BigDecimal getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(BigDecimal totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public String getAnswer() {
-        return answer;
-    }
-
-    public void setAnswer(String answer) {
-        this.answer = answer;
-    }
-
-    /**
-     * 判断两个题目是否完全相同
-     * <p>
-     *     1.大题号
-     *     2.小题号
-     *     3.题目分数
-     *     4.大题名称
-     * </p>
-     * @param a 题目a
-     * @param b 题目b
-     * @return true:相同 false:不相同
-     */
-    public static boolean matchTwoObjects(Question a, Question b) {
-        if (!a.getMainNumber().equals(b.getMainNumber())) {
-            return false;
-        }
-        if (!a.getSubNumber().equals(b.getSubNumber())) {
-            return false;
-        }
-        if (a.getTotalScore().compareTo(b.getTotalScore()) != 0) {
-            return false;
-        }
-        return a.getMainTitle().equals(b.getMainTitle());
-    }
-
-    /**
-     * 匹配两个题目集合是否在关键字段上相同
-     * @param ql1 题目集合1
-     * @param ql2 题目集合2
-     * @return true:相同 false:不相同
-     */
-    public static boolean matchTwoQuestionList(List<Question> ql1, List<Question> ql2){
-        // 两个结构内元素数量不一致直接返回错误
-        if (ql1.size() != ql2.size()) {
-            return false;
-        }
-
-        // 排序
-        List<Question> ql1Sort = ql1.stream().sorted(Comparator.comparing(Question::getMainNumber).thenComparing(Question::getSubNumber)).collect(Collectors.toList());
-        List<Question> ql2Sort = ql2.stream().sorted(Comparator.comparing(Question::getMainNumber).thenComparing(Question::getSubNumber)).collect(Collectors.toList());
-
-        for (int i = 0; i < ql1Sort.size(); i++) {
-            Question q1 = ql1Sort.get(i);
-            Question q2 = ql2Sort.get(i);
-            if (!Question.matchTwoObjects(q1, q2)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-
-}

+ 0 - 238
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/ExaminationDetailResult.java

@@ -1,238 +0,0 @@
-package com.qmth.paper.library.business.bean.result;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 考务明细查询
- * @Author: CaoZixuan
- * @Date: 2021-04-08
- */
-public class ExaminationDetailResult {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "考务数据-学生明细主键")
-    private Long id;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学期id")
-    private Long semesterId;
-
-    @ApiModelProperty(value = "学期名称")
-    private String semesterName;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "考试id")
-    private Long examId;
-
-    @ApiModelProperty(value = "考试名称")
-    private String examName;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "印刷计划主键")
-    private Long printPlanId;
-
-    @ApiModelProperty(value = "印刷计划名称")
-    private String printPlanName;
-
-    @ApiModelProperty(value = "课程(代码)")
-    private String courseNameCode;
-
-    @ApiModelProperty(value = "试卷代码")
-    private String paperNumber;
-
-    @ApiModelProperty(value = "适用专业")
-    private String specialty;
-
-    @ApiModelProperty(value = "考点")
-    private String examPlace;
-
-    @ApiModelProperty(value = "考场")
-    private String examRoom;
-
-    @ApiModelProperty(value = "准考证号")
-    private String ticketNumber;
-
-    @ApiModelProperty(value = "学号")
-    private String studentCode;
-
-    @ApiModelProperty(value = "学生姓名")
-    private String studentName;
-
-    @ApiModelProperty(value = "座位号")
-    private String siteNumber;
-
-    @ApiModelProperty(value = "考试开始时间")
-    private Long examStartTime;
-
-    @ApiModelProperty(value = "考试结束时间")
-    private Long examEndTime;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "创建人主键")
-    private Long createId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Long createTime;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getSemesterId() {
-        return semesterId;
-    }
-
-    public void setSemesterId(Long semesterId) {
-        this.semesterId = semesterId;
-    }
-
-    public String getSemesterName() {
-        return semesterName;
-    }
-
-    public void setSemesterName(String semesterName) {
-        this.semesterName = semesterName;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public Long getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(Long printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    public String getPrintPlanName() {
-        return printPlanName;
-    }
-
-    public void setPrintPlanName(String printPlanName) {
-        this.printPlanName = printPlanName;
-    }
-
-    public String getCourseNameCode() {
-        return courseNameCode;
-    }
-
-    public void setCourseNameCode(String courseNameCode) {
-        this.courseNameCode = courseNameCode;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getSpecialty() {
-        return specialty;
-    }
-
-    public void setSpecialty(String specialty) {
-        this.specialty = specialty;
-    }
-
-    public String getExamPlace() {
-        return examPlace;
-    }
-
-    public void setExamPlace(String examPlace) {
-        this.examPlace = examPlace;
-    }
-
-    public String getExamRoom() {
-        return examRoom;
-    }
-
-    public void setExamRoom(String examRoom) {
-        this.examRoom = examRoom;
-    }
-
-    public String getTicketNumber() {
-        return ticketNumber;
-    }
-
-    public void setTicketNumber(String ticketNumber) {
-        this.ticketNumber = ticketNumber;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    public String getSiteNumber() {
-        return siteNumber;
-    }
-
-    public void setSiteNumber(String siteNumber) {
-        this.siteNumber = siteNumber;
-    }
-
-    public Long getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(Long examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public Long getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(Long examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-}

+ 0 - 249
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/ExaminationResult.java

@@ -1,249 +0,0 @@
-package com.qmth.paper.library.business.bean.result;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 考务数据查询-简略
- * @Author: CaoZixuan
- * @Date: 2021-04-07
- */
-public class ExaminationResult {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "examDetailId")
-    private Long id;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学校id")
-    private Long schoolId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学期id")
-    private Long semesterId;
-
-    @ApiModelProperty(value = "学期名称")
-    private String semesterName;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "考试id")
-    private Long examId;
-
-    @ApiModelProperty(value = "考试名称")
-    private String examName;
-
-    @ApiModelProperty(value = "印刷计划id")
-    private Long printPlanId;
-
-    @ApiModelProperty(value = "印刷计划名称")
-    private String printPlanName;
-
-    @ApiModelProperty(value = "考试开始时间")
-    private Long examStartTime;
-
-    @ApiModelProperty(value = "考试结束时间")
-    private Long examEndTime;
-
-    @ApiModelProperty(value = "考点")
-    private String examPlace;
-
-    @ApiModelProperty(value = "考场")
-    private String examRoom;
-
-    @ApiModelProperty(value = "卷袋号")
-    private String packageCode;
-
-    @ApiModelProperty(value = "课程(代码)")
-    private String courseNameCode;
-
-    @ApiModelProperty(value = "试卷编号")
-    private String paperNumber;
-
-    @ApiModelProperty(value = "科次")
-    private int totalSubjects;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "创建人id")
-    private Long createId;
-
-    @ApiModelProperty(value = "创建时间")
-    private Long createTime;
-
-    @ApiModelProperty(value = "考务课程表主键组‘,’隔开")
-    private String examDetailCourseIds;
-
-    @ApiModelProperty(value = "考试日期")
-    private String examDate;
-
-    @ApiModelProperty(value = "考试时间")
-    private String examTime;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getSemesterId() {
-        return semesterId;
-    }
-
-    public void setSemesterId(Long semesterId) {
-        this.semesterId = semesterId;
-    }
-
-    public String getSemesterName() {
-        return semesterName;
-    }
-
-    public void setSemesterName(String semesterName) {
-        this.semesterName = semesterName;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public Long getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(Long printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    public String getPrintPlanName() {
-        return printPlanName;
-    }
-
-    public void setPrintPlanName(String printPlanName) {
-        this.printPlanName = printPlanName;
-    }
-
-    public Long getExamStartTime() {
-        return examStartTime;
-    }
-
-    public void setExamStartTime(Long examStartTime) {
-        this.examStartTime = examStartTime;
-    }
-
-    public Long getExamEndTime() {
-        return examEndTime;
-    }
-
-    public void setExamEndTime(Long examEndTime) {
-        this.examEndTime = examEndTime;
-    }
-
-    public String getExamPlace() {
-        return examPlace;
-    }
-
-    public void setExamPlace(String examPlace) {
-        this.examPlace = examPlace;
-    }
-
-    public String getExamRoom() {
-        return examRoom;
-    }
-
-    public void setExamRoom(String examRoom) {
-        this.examRoom = examRoom;
-    }
-
-    public String getPackageCode() {
-        return packageCode;
-    }
-
-    public void setPackageCode(String packageCode) {
-        this.packageCode = packageCode;
-    }
-
-    public String getCourseNameCode() {
-        return courseNameCode;
-    }
-
-    public void setCourseNameCode(String courseNameCode) {
-        this.courseNameCode = courseNameCode;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public int getTotalSubjects() {
-        return totalSubjects;
-    }
-
-    public void setTotalSubjects(int totalSubjects) {
-        this.totalSubjects = totalSubjects;
-    }
-
-    public Long getCreateId() {
-        return createId;
-    }
-
-    public void setCreateId(Long createId) {
-        this.createId = createId;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getExamDetailCourseIds() {
-        return examDetailCourseIds;
-    }
-
-    public void setExamDetailCourseIds(String examDetailCourseIds) {
-        this.examDetailCourseIds = examDetailCourseIds;
-    }
-
-    public String getExamDate() {
-        return examDate;
-    }
-
-    public void setExamDate(String examDate) {
-        this.examDate = examDate;
-    }
-
-    public String getExamTime() {
-        return examTime;
-    }
-
-    public void setExamTime(String examTime) {
-        this.examTime = examTime;
-    }
-}

+ 0 - 47
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/SummarizedDataResult.java

@@ -1,47 +0,0 @@
-package com.qmth.paper.library.business.bean.result;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 汇总数据查询返回结果
- * @Author: CaoZixuan
- * @Date: 2021-04-08
- */
-public class SummarizedDataResult {
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学校id")
-    private Long schoolId;
-
-    @ApiModelProperty(value = "总科次")
-    private int totalSubjects;
-
-    @ApiModelProperty(value = "总卷袋数")
-    private int packageCount;
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public int getTotalSubjects() {
-        return totalSubjects;
-    }
-
-    public void setTotalSubjects(int totalSubjects) {
-        this.totalSubjects = totalSubjects;
-    }
-
-    public int getPackageCount() {
-        return packageCount;
-    }
-
-    public void setPackageCount(int packageCount) {
-        this.packageCount = packageCount;
-    }
-}

+ 0 - 361
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/TSyncExamStudentScoreResult.java

@@ -1,361 +0,0 @@
-package com.qmth.paper.library.business.bean.result;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.File;
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * @Description: 成绩同步result
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/11/1
- */
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class TSyncExamStudentScoreResult implements Serializable {
-
-    @ApiModelProperty(value = "主键")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long id;
-
-    @ApiModelProperty(value = "学期id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long semesterId;
-
-    @ExcelProperty(name = "学期", width = 30, index = 1)
-    @ApiModelProperty(value = "学期")
-    String semesterName;
-
-    @ExcelProperty(name = "考试", width = 30, index = 2)
-    @ApiModelProperty(value = "考试")
-    String examName;
-
-    @ApiModelProperty(value = "云阅卷考试id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long examId;
-
-    @ApiModelProperty(value = "云阅卷考试编码")
-    String examCode;
-
-    @ExcelProperty(name = "姓名", width = 30, index = 3)
-    @ApiModelProperty(value = "考生姓名")
-    String name;
-
-    @ExcelProperty(name = "学号", width = 30, index = 4)
-    @ApiModelProperty(value = "学号")
-    String studentCode;
-
-    @ApiModelProperty(value = "准考证号")
-    String examNumber;
-
-    @ApiModelProperty(value = "学院id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long orgId;
-
-    @ExcelProperty(name = "院系", width = 30, index = 5)
-    @ApiModelProperty(value = "学院名称")
-    String orgName;
-
-    @ApiModelProperty(value = "专业id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long majorId;
-
-    @ApiModelProperty(value = "专业名称")
-    @ExcelProperty(name = "专业", width = 30, index = 6)
-    String majorName;
-
-    @ApiModelProperty(value = "班级id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    Long clazzId;
-
-    @ExcelProperty(name = "班级", width = 30, index = 7)
-    @ApiModelProperty(value = "班级")
-    String clazzName;
-
-    @ApiModelProperty(value = "课程编码")
-    String courseCode;
-
-    @ExcelProperty(name = "课程名称", width = 30, index = 8)
-    @ApiModelProperty(value = "课程名称")
-    String courseName;
-
-    @ApiModelProperty(value = "考生状态,1-正常,2-缺考(包含未上传),3-违纪")
-    Integer status;
-
-    @ApiModelProperty(value = "考生状态")
-    String statusStr;
-
-    @ApiModelProperty(value = "轨迹图url")
-    String trajectoryUrls;
-
-    @ApiModelProperty(value = "轨迹坐标")
-    String trajectoryCoordinate;
-
-    @ApiModelProperty(value = "同步时间")
-    Long syncTime;
-
-    @ApiModelProperty(value = "原卷url")
-    private String sheetUrls;
-
-    @ApiModelProperty(value = "原卷url")
-    private String localSheetUrls;
-
-    @ExcelProperty(name = "成绩总分", width = 30, index = 9)
-    @ApiModelProperty(value = "总分")
-    private Double totalScore;
-
-    @ApiModelProperty(value = "客观题分数")
-    private Double objectiveScore;
-
-    @ApiModelProperty(value = "主观题分数")
-    private Double subjectiveScore;
-
-    @ApiModelProperty(value = "阅卷数据")
-    private String syncData;
-
-    public String getSyncData() {
-        return syncData;
-    }
-
-    public void setSyncData(String syncData) {
-        this.syncData = syncData;
-    }
-
-    public String getExamNumber() {
-        return examNumber;
-    }
-
-    public void setExamNumber(String examNumber) {
-        this.examNumber = examNumber;
-    }
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getExamCode() {
-        return examCode;
-    }
-
-    public void setExamCode(String examCode) {
-        this.examCode = examCode;
-    }
-
-    public String getSemesterName() {
-        return semesterName;
-    }
-
-    public void setSemesterName(String semesterName) {
-        this.semesterName = semesterName;
-    }
-
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getStatusStr() {
-        if (Objects.nonNull(getStatus())) {
-            String statusStr = null;
-            switch (getStatus()) {
-                case 1:
-                    statusStr = "正常";
-                    break;
-                case 2:
-                    statusStr = "缺考";
-                    break;
-                default:
-                    statusStr = "违纪";
-                    break;
-            }
-            return statusStr;
-        } else {
-            return statusStr;
-        }
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getSemesterId() {
-        return semesterId;
-    }
-
-    public void setSemesterId(Long semesterId) {
-        this.semesterId = semesterId;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public String getOrgName() {
-        return orgName;
-    }
-
-    public void setOrgName(String orgName) {
-        this.orgName = orgName;
-    }
-
-    public Long getMajorId() {
-        return majorId;
-    }
-
-    public void setMajorId(Long majorId) {
-        this.majorId = majorId;
-    }
-
-    public String getMajorName() {
-        return majorName;
-    }
-
-    public void setMajorName(String majorName) {
-        this.majorName = majorName;
-    }
-
-    public Long getClazzId() {
-        return clazzId;
-    }
-
-    public void setClazzId(Long clazzId) {
-        this.clazzId = clazzId;
-    }
-
-    public String getClazzName() {
-        return clazzName;
-    }
-
-    public void setClazzName(String clazzName) {
-        this.clazzName = clazzName;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public void setStatusStr(String statusStr) {
-        this.statusStr = statusStr;
-    }
-
-    public String getTrajectoryUrls() {
-        return trajectoryUrls;
-    }
-
-    public void setTrajectoryUrls(String trajectoryUrls) {
-        this.trajectoryUrls = trajectoryUrls;
-    }
-
-    public String getTrajectoryCoordinate() {
-        return trajectoryCoordinate;
-    }
-
-    public void setTrajectoryCoordinate(String trajectoryCoordinate) {
-        this.trajectoryCoordinate = trajectoryCoordinate;
-    }
-
-    public Long getSyncTime() {
-        return syncTime;
-    }
-
-    public void setSyncTime(Long syncTime) {
-        this.syncTime = syncTime;
-    }
-
-    public String getSheetUrls() {
-        return sheetUrls;
-    }
-
-    public void setSheetUrls(String sheetUrls) {
-        this.sheetUrls = sheetUrls;
-    }
-
-    public String getLocalSheetUrls() {
-        return localSheetUrls;
-    }
-
-    public void setLocalSheetUrls(String localSheetUrls) {
-        this.localSheetUrls = localSheetUrls;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public Double getObjectiveScore() {
-        return objectiveScore;
-    }
-
-    public void setObjectiveScore(Double objectiveScore) {
-        this.objectiveScore = objectiveScore;
-    }
-
-    public Double getSubjectiveScore() {
-        return subjectiveScore;
-    }
-
-    public void setSubjectiveScore(Double subjectiveScore) {
-        this.subjectiveScore = subjectiveScore;
-    }
-}

+ 0 - 46
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/examTaskStudent/ExamTaskExamStudentImportResult.java

@@ -1,46 +0,0 @@
-package com.qmth.paper.library.business.bean.result.examTaskStudent;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description: 命题任务考生导入
- * @Author: CaoZixuan
- * @Date: 2022-09-02
- */
-public class ExamTaskExamStudentImportResult implements Serializable {
-    @ApiModelProperty(value = "考点")
-    private String examPlace;
-
-    @ApiModelProperty(value = "考场")
-    private String examRoom;
-
-    @ApiModelProperty(value = "一个考场的命题任务学生数据集合")
-    private List<ExamTaskStudentObjectResult> examTaskStudentObjectResultList;
-
-    public String getExamPlace() {
-        return examPlace;
-    }
-
-    public void setExamPlace(String examPlace) {
-        this.examPlace = examPlace;
-    }
-
-    public String getExamRoom() {
-        return examRoom;
-    }
-
-    public void setExamRoom(String examRoom) {
-        this.examRoom = examRoom;
-    }
-
-    public List<ExamTaskStudentObjectResult> getExamTaskStudentObjectResultList() {
-        return examTaskStudentObjectResultList;
-    }
-
-    public void setExamTaskStudentObjectResultList(List<ExamTaskStudentObjectResult> examTaskStudentObjectResultList) {
-        this.examTaskStudentObjectResultList = examTaskStudentObjectResultList;
-    }
-}

+ 0 - 61
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/examTaskStudent/ExamTaskStudentObjectResult.java

@@ -1,61 +0,0 @@
-package com.qmth.paper.library.business.bean.result.examTaskStudent;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.enums.StudentClazzEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description: 命题任务学生数据(命题任务提交一步到位的 - 考务数据)
- * @Author: CaoZixuan
- * @Date: 2022-08-18
- */
-public class ExamTaskStudentObjectResult implements Serializable {
-    @ApiModelProperty(value = "班级id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long clazzId;
-
-    @ApiModelProperty(value = "班级名称")
-    private String clazzName;
-
-    @ApiModelProperty(value = "学生信息集合")
-    private List<StudentInfo> studentInfoList;
-
-    @ApiModelProperty(value = "考试对象类型")
-    private StudentClazzEnum studentClazzType;
-
-    public Long getClazzId() {
-        return clazzId;
-    }
-
-    public void setClazzId(Long clazzId) {
-        this.clazzId = clazzId;
-    }
-
-    public String getClazzName() {
-        return clazzName;
-    }
-
-    public void setClazzName(String clazzName) {
-        this.clazzName = clazzName;
-    }
-
-    public List<StudentInfo> getStudentInfoList() {
-        return studentInfoList;
-    }
-
-    public void setStudentInfoList(List<StudentInfo> studentInfoList) {
-        this.studentInfoList = studentInfoList;
-    }
-
-    public StudentClazzEnum getStudentClazzType() {
-        return studentClazzType;
-    }
-
-    public void setStudentClazzType(StudentClazzEnum studentClazzType) {
-        this.studentClazzType = studentClazzType;
-    }
-}

+ 0 - 116
paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/examTaskStudent/StudentInfo.java

@@ -1,116 +0,0 @@
-package com.qmth.paper.library.business.bean.result.examTaskStudent;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 学生扩展信息(基础学生 + 教学班信息)
- * @Author: CaoZixuan
- * @Date: 2022-08-18
- */
-public class StudentInfo implements Serializable {
-    @ApiModelProperty(value = "学生id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long studentId;
-
-    @ApiModelProperty(value = "学生名称")
-    private String studentName;
-
-    @ApiModelProperty(value = "学生编号")
-    private String studentCode;
-
-    @ApiModelProperty(value = "学生学院名称")
-    private String collegeName;
-
-    @ApiModelProperty(value = "学生专业名称")
-    private String majorName;
-
-    @ApiModelProperty(value = "教学班id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long teachClazzId;
-
-    @ApiModelProperty(value = "教学班名称")
-    private String teachClazzName;
-
-    @ApiModelProperty(value = "行政班id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long basicClazzId;
-
-    @ApiModelProperty(value = "行政班名称")
-    private String basicClazzName;
-
-    public Long getStudentId() {
-        return studentId;
-    }
-
-    public void setStudentId(Long studentId) {
-        this.studentId = studentId;
-    }
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getCollegeName() {
-        return collegeName;
-    }
-
-    public void setCollegeName(String collegeName) {
-        this.collegeName = collegeName;
-    }
-
-    public String getMajorName() {
-        return majorName;
-    }
-
-    public void setMajorName(String majorName) {
-        this.majorName = majorName;
-    }
-
-    public Long getTeachClazzId() {
-        return teachClazzId;
-    }
-
-    public void setTeachClazzId(Long teachClazzId) {
-        this.teachClazzId = teachClazzId;
-    }
-
-    public String getTeachClazzName() {
-        return teachClazzName;
-    }
-
-    public void setTeachClazzName(String teachClazzName) {
-        this.teachClazzName = teachClazzName;
-    }
-
-    public Long getBasicClazzId() {
-        return basicClazzId;
-    }
-
-    public void setBasicClazzId(Long basicClazzId) {
-        this.basicClazzId = basicClazzId;
-    }
-
-    public String getBasicClazzName() {
-        return basicClazzName;
-    }
-
-    public void setBasicClazzName(String basicClazzName) {
-        this.basicClazzName = basicClazzName;
-    }
-}

+ 0 - 27
paper-library-business/src/main/java/com/qmth/paper/library/business/cache/CreatePdfCacheUtil.java

@@ -1,27 +0,0 @@
-package com.qmth.paper.library.business.cache;
-
-import com.qmth.paper.library.common.contant.SpringContextHolder;
-import com.qmth.paper.library.common.util.RedisUtil;
-
-/**
- * @Description: 生成pdf cache
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/4/26
- */
-public class CreatePdfCacheUtil {
-    private static RedisUtil redisUtil = SpringContextHolder.getBean(RedisUtil.class);
-
-    public static void setPaperType(String key, String paperType) {
-        redisUtil.set(RedisKeyHelper.paperTypeKey(key), paperType);
-    }
-
-    public static String getPaperType(String key) {
-        return (String) redisUtil.get(RedisKeyHelper.paperTypeKey(key));
-    }
-
-    public static void deletePaperType(String key) {
-        redisUtil.delete(RedisKeyHelper.paperTypeKey(key));
-    }
-}

+ 0 - 17
paper-library-business/src/main/java/com/qmth/paper/library/business/cache/RedisKeyHelper.java

@@ -1,17 +0,0 @@
-package com.qmth.paper.library.business.cache;
-
-/**
- * @Description: redis cache helper
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/4/26
- */
-public class RedisKeyHelper {
-
-    private static String paperTypePrefix = "paper_type:";
-
-    public static String paperTypeKey(String key) {
-        return paperTypePrefix + key;
-    }
-}

+ 0 - 194
paper-library-business/src/main/java/com/qmth/paper/library/business/entity/ClientStatus.java

@@ -1,194 +0,0 @@
-package com.qmth.paper.library.business.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.base.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 机器打样状态表
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@TableName("client_status")
-public class ClientStatus extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("school_id")
-    private Long schoolId;
-
-    @ApiModelProperty(value = "机构id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
-    private Long orgId;
-
-    /**
-     * 机器唯一码
-     */
-    @TableField("machine_code")
-    private String machineCode;
-    /**
-     * 考场ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("exam_detail_id")
-    private Long examDetailId;
-
-    /**
-     * 命题任务ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("print_plan_id")
-    private Long printPlanId;
-
-    /**
-     * 课程代码
-     */
-    @TableField("course_code")
-    private String courseCode;
-
-    /**
-     * 课程名称
-     */
-    @TableField("course_name")
-    private String courseName;
-
-    /**
-     * 试卷编号
-     */
-    @TableField("paper_number")
-    private String paperNumber;
-
-    /**
-     * 是否打样
-     */
-    @TableField("is_try")
-    private Boolean isTry;
-    /**
-     * 打样时间
-     */
-    @TableField("try_time")
-    private Long tryTime;
-    /**
-     * 是否合格
-     */
-    @TableField("is_pass")
-    private Boolean isPass;
-
-    /**
-     * 是否缓存
-     */
-    @TableField("is_download")
-    private Boolean isDownload;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public String getMachineCode() {
-        return machineCode;
-    }
-
-    public void setMachineCode(String machineCode) {
-        this.machineCode = machineCode;
-    }
-
-    public Long getExamDetailId() {
-        return examDetailId;
-    }
-
-    public void setExamDetailId(Long examDetailId) {
-        this.examDetailId = examDetailId;
-    }
-
-    public Long getPrintPlanId() {
-        return printPlanId;
-    }
-
-    public void setPrintPlanId(Long printPlanId) {
-        this.printPlanId = printPlanId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public Boolean getTry() {
-        return isTry;
-    }
-
-    public void setTry(Boolean aTry) {
-        isTry = aTry;
-    }
-
-    public Long getTryTime() {
-        return tryTime;
-    }
-
-    public void setTryTime(Long tryTime) {
-        this.tryTime = tryTime;
-    }
-
-    public Boolean getPass() {
-        return isPass;
-    }
-
-    public void setPass(Boolean pass) {
-        isPass = pass;
-    }
-
-    public Boolean getDownload() {
-        return isDownload;
-    }
-
-    public void setDownload(Boolean download) {
-        isDownload = download;
-    }
-}

+ 0 - 282
paper-library-business/src/main/java/com/qmth/paper/library/business/entity/ExamStudent.java

@@ -1,282 +0,0 @@
-package com.qmth.paper.library.business.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.business.enums.StudentClazzEnum;
-import com.qmth.paper.library.common.base.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 考生
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@TableName("exam_student")
-public class ExamStudent extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("school_id")
-    private Long schoolId;
-
-    @ApiModelProperty(value = "机构id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
-    private Long orgId;
-
-    @TableField("exam_detail_course_id")
-    private Long examDetailCourseId;
-
-    @TableField("student_name")
-    private String studentName;
-
-    @TableField("student_code")
-    private String studentCode;
-
-    @TableField("paper_number")
-    private String paperNumber;
-
-    @TableField("ticket_number")
-    private String ticketNumber;
-
-    @TableField("site_number")
-    private String siteNumber;
-
-    @TableField("print_paper")
-    private Integer printPaper;
-
-    @TableField("print_card")
-    private Integer printCard;
-
-    @TableField("extend_fields")
-    private String extendFields;
-
-    @TableField("paper_type")
-    private String paperType;
-
-    @TableField("college_name")
-    private String collegeName;
-
-    @TableField("major_name")
-    private String majorName;
-
-    @TableField("clazz_id")
-    private String clazzId;
-
-    @TableField("clazz_name")
-    private String clazzName;
-
-    @ApiModelProperty(value = "教学班id")
-    @TableField("clazz_id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long teachClazzId;
-
-    @ApiModelProperty(value = "教学班名称")
-    @TableField("teach_clazz_name")
-    private String teachClazzName;
-
-    @ApiModelProperty(value = "主体班级类型")
-    @TableField(value = "student_clazz_type")
-    private StudentClazzEnum studentClazzType;
-
-    @TableField("campus_name")
-    private String campusName;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "附件id")
-    @TableField(value = "attachment_id")
-    private Long attachmentId;
-
-    @TableField(value = "sync_status")
-    private Boolean syncStatus;
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getAttachmentId() {
-        return attachmentId;
-    }
-
-    public void setAttachmentId(Long attachmentId) {
-        this.attachmentId = attachmentId;
-    }
-
-    public Long getExamDetailCourseId() {
-        return examDetailCourseId;
-    }
-
-    public void setExamDetailCourseId(Long examDetailCourseId) {
-        this.examDetailCourseId = examDetailCourseId;
-    }
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getTicketNumber() {
-        return ticketNumber;
-    }
-
-    public void setTicketNumber(String ticketNumber) {
-        this.ticketNumber = ticketNumber;
-    }
-
-    public String getSiteNumber() {
-        return siteNumber;
-    }
-
-    public void setSiteNumber(String siteNumber) {
-        this.siteNumber = siteNumber;
-    }
-
-    public Integer getPrintPaper() {
-        return printPaper;
-    }
-
-    public void setPrintPaper(Integer printPaper) {
-        this.printPaper = printPaper;
-    }
-
-    public Integer getPrintCard() {
-        return printCard;
-    }
-
-    public void setPrintCard(Integer printCard) {
-        this.printCard = printCard;
-    }
-
-    public String getExtendFields() {
-        return extendFields;
-    }
-
-    public void setExtendFields(String extendFields) {
-        this.extendFields = extendFields;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getClazzId() {
-        return clazzId;
-    }
-
-    public void setClazzId(String clazzId) {
-        this.clazzId = clazzId;
-    }
-
-    public String getClazzName() {
-        return clazzName;
-    }
-
-    public void setClazzName(String clazzName) {
-        this.clazzName = clazzName;
-    }
-
-    public Boolean getSyncStatus() {
-        return syncStatus;
-    }
-
-    public void setSyncStatus(Boolean syncStatus) {
-        this.syncStatus = syncStatus;
-    }
-
-    public String getCampusName() {
-        return campusName;
-    }
-
-    public void setCampusName(String campusName) {
-        this.campusName = campusName;
-    }
-
-    public Long getTeachClazzId() {
-        return teachClazzId;
-    }
-
-    public void setTeachClazzId(Long teachClazzId) {
-        this.teachClazzId = teachClazzId;
-    }
-
-    public String getTeachClazzName() {
-        return teachClazzName;
-    }
-
-    public void setTeachClazzName(String teachClazzName) {
-        this.teachClazzName = teachClazzName;
-    }
-
-    public StudentClazzEnum getStudentClazzType() {
-        return studentClazzType;
-    }
-
-    public void setStudentClazzType(StudentClazzEnum studentClazzType) {
-        this.studentClazzType = studentClazzType;
-    }
-
-    public String getCollegeName() {
-        return collegeName;
-    }
-
-    public void setCollegeName(String collegeName) {
-        this.collegeName = collegeName;
-    }
-
-    public String getMajorName() {
-        return majorName;
-    }
-
-    public void setMajorName(String majorName) {
-        this.majorName = majorName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-}

+ 0 - 57
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CardRequiredFieldsEnum.java

@@ -1,57 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-import com.qmth.paper.library.common.enums.ExceptionResultEnum;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 考务必选字段
- * @Date: 2021/3/29.
- */
-public enum CardRequiredFieldsEnum {
-
-    TICKET_NUMBER("ticketNumber", "考号"),
-    SITE_NUMBER("siteNumber", "座位号"),
-    STUDENT_NAME("studentName","姓名"),
-    COURSE_NAME("courseName","课程名称");
-
-    private String code;
-    private String desc;
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    CardRequiredFieldsEnum(String code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<>();
-        for (CardRequiredFieldsEnum value : CardRequiredFieldsEnum.values()) {
-            // 校验是否在考务必选字段中
-            if(!RequiredFieldsEnum.contain(value.name())){
-                throw ExceptionResultEnum.ERROR.exception("");
-            }
-
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(value.getCode());
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-}

+ 0 - 43
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CardStatusEnum.java

@@ -1,43 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 通用模板类型
- * @Date: 2021/3/23.
- */
-public enum CardStatusEnum {
-
-    STAGE("暂存"),
-    SUBMIT("提交");
-
-    CardStatusEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (CardStatusEnum value : CardStatusEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 43
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CardTypeEnum.java

@@ -1,43 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 通用模板类型
- * @Date: 2021/3/23.
- */
-public enum CardTypeEnum {
-
-    GENERIC("通卡"),
-    CUSTOM("自定义");
-
-    CardTypeEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (CardTypeEnum value : CardTypeEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 40
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ChooseTypeEnum.java

@@ -1,40 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 选择类型enum
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/3/31
- */
-public enum ChooseTypeEnum {
-
-    ALL("全部");
-
-    private String title;
-
-    private ChooseTypeEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param value
-     * @return
-     */
-    public static String convertToName(String value) {
-        for (ChooseTypeEnum e : ChooseTypeEnum.values()) {
-            if (Objects.equals(value.trim(), e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 22
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ClazzContentEnum.java

@@ -1,22 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-/**
- * @Description: 班级内容状态枚举类
- * @Author: CaoZixuan
- * @Date: 2022-04-26
- */
-public enum ClazzContentEnum {
-    FINISH("班级命题任务已完成印刷"),
-    UN_FINISH("班级命题任务未完成印刷"),
-    EXCEPTION("异常:包含该班级的命题任务提交了多次")
-    ;
-    private final String desc;
-
-    ClazzContentEnum(String desc) {
-        this.desc = desc;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-}

+ 0 - 42
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowApproveUserCountTypeEnum.java

@@ -1,42 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 自定义流程发起人指定选择人数
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public enum CustomFlowApproveUserCountTypeEnum {
-
-    ONE("一个"),
-
-    MORE("多个");
-
-    private String title;
-
-    private CustomFlowApproveUserCountTypeEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (CustomFlowApproveUserCountTypeEnum e : CustomFlowApproveUserCountTypeEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 42
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowApproveUserSelectRangeEnum.java

@@ -1,42 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 自定义流程发起人指定选择用户类型
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public enum CustomFlowApproveUserSelectRangeEnum {
-
-    ALL("全单位"),
-
-    ROLE("角色");
-
-    private String title;
-
-    private CustomFlowApproveUserSelectRangeEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (CustomFlowApproveUserSelectRangeEnum e : CustomFlowApproveUserSelectRangeEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 42
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowApproveUserTypeEnum.java

@@ -1,42 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 自定义流程审核用户类型
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public enum CustomFlowApproveUserTypeEnum {
-
-    USER("成员"),
-
-    ROLE("角色");
-
-    private String title;
-
-    private CustomFlowApproveUserTypeEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (CustomFlowApproveUserTypeEnum e : CustomFlowApproveUserTypeEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 44
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowMultipleUserApproveTypeEnum.java

@@ -1,44 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 自定义流程审核类型
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public enum CustomFlowMultipleUserApproveTypeEnum {
-
-    ORDER("依次审批"),
-
-    ALL("会签(所有人必须审批)"),
-
-    SOME("或签(一名审批人同意或拒绝即可)");
-
-    private String title;
-
-    private CustomFlowMultipleUserApproveTypeEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (CustomFlowMultipleUserApproveTypeEnum e : CustomFlowMultipleUserApproveTypeEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 42
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowRejectResubmitTypeEnum.java

@@ -1,42 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 自定义流程驳回重新提交类型
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public enum CustomFlowRejectResubmitTypeEnum {
-
-    NORMAL("按正常流程提交"),
-
-    PREV_STEP("提交到驳回节点");
-
-    private String title;
-
-    private CustomFlowRejectResubmitTypeEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (CustomFlowRejectResubmitTypeEnum e : CustomFlowRejectResubmitTypeEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 44
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowRejectTypeEnum.java

@@ -1,44 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 自定义流程驳回类型
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public enum CustomFlowRejectTypeEnum {
-
-    PREV("上一节点"),
-
-    START("发起人节点"),
-
-    PREV_ALL("该节点前全部节点");
-
-    private String title;
-
-    private CustomFlowRejectTypeEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (CustomFlowRejectTypeEnum e : CustomFlowRejectTypeEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 59
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/CustomFlowTypeEnum.java

@@ -1,59 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 自定义流程审核用户类型
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/21
- */
-public enum CustomFlowTypeEnum {
-
-    START("开始节点", "start"),
-
-    PROCESS("过程节点", "process"),
-
-    END("结束节点", "end"),
-
-    EXCLUSIVE_GATE_WAY("排他网关", "exclusivegateway"),
-
-    PARALLEL_GATE_WAY("并行网关", "parallelgateway"),
-
-    SEQUENCE("箭头", "flow"),
-
-    USER_TASK("任务节点", "usertask");
-
-    private String title;
-
-    private String id;
-
-    private CustomFlowTypeEnum(String title, String id) {
-        this.title = title;
-        this.id = id;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (CustomFlowTypeEnum e : CustomFlowTypeEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 42
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/DataSourceEnum.java

@@ -1,42 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 数据来源 enum
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/9/9
- */
-public enum DataSourceEnum {
-
-    IMPORT("导入"),
-
-    JOIN("关联查询的数据");
-
-    private String title;
-
-    private DataSourceEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (DataSourceEnum e : DataSourceEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 42
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamCardStatusEnum.java

@@ -1,42 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 题卡status enum
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/4/9
- */
-public enum ExamCardStatusEnum {
-
-    STAGE("暂存"),
-
-    SUBMIT("提交");
-
-    private String title;
-
-    private ExamCardStatusEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param value
-     * @return
-     */
-    public static String convertToName(String value) {
-        for (ExamCardStatusEnum e : ExamCardStatusEnum.values()) {
-            if (Objects.equals(value.trim(), e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 20
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamDataSourceEnum.java

@@ -1,20 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-/**
- * @Date: 2021/3/29.
- */
-public enum ExamDataSourceEnum {
-
-    EXAM_TASK("卷库查询生成"),
-    FILE_IMPORT("考务文件导入");
-
-    ExamDataSourceEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-}

+ 0 - 39
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamDetailStatusEnum.java

@@ -1,39 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 考场状态枚举类
- */
-public enum ExamDetailStatusEnum {
-    NEW("新建"),
-    READY("就绪"),
-    WAITING("待打印"),
-    PRINTING("印刷中"),
-    FINISH("已完成");
-    private final String desc;
-
-    ExamDetailStatusEnum(String desc) {
-        this.desc = desc;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<>();
-        for (ExamDetailStatusEnum value : ExamDetailStatusEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-}

+ 0 - 44
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamNumberStyleEnum.java

@@ -1,44 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 考号版式
- * @Date: 2021/3/23.
- */
-public enum ExamNumberStyleEnum {
-
-    PRINT("印刷条码"),
-    PASTE("粘贴条码"),
-    FILL("卡号填涂");
-
-    ExamNumberStyleEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (ExamNumberStyleEnum value : ExamNumberStyleEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 28
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamObjectType.java

@@ -1,28 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-/**
- * @Description: 考试对象类型
- * @Author: CaoZixuan
- * @Date: 2022-08-18
- */
-public enum ExamObjectType {
-    TEACH_CLAZZ_STUDENT("教学班的学生", StudentClazzEnum.TEACH_CLAZZ),
-    BASIC_CLAZZ_STUDENT("行政班的学生", StudentClazzEnum.BASIC_CLAZZ),
-    IMPORT_STUDENT("导入的学生", StudentClazzEnum.BASIC_CLAZZ),
-    ;
-    private final String desc;
-    private final StudentClazzEnum studentClazzType;
-
-    ExamObjectType(String desc, StudentClazzEnum studentClazzType) {
-        this.desc = desc;
-        this.studentClazzType = studentClazzType;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public StudentClazzEnum getStudentClazzType() {
-        return studentClazzType;
-    }
-}

+ 0 - 44
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamPaperStructureStatusEnum.java

@@ -1,44 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 考试试卷结构同步状态
- */
-public enum ExamPaperStructureStatusEnum {
-
-    INIT("未开始"),
-    SUBJECTIVE_FINISH("主观题结构同步成功"),
-    GROUP_FINISH("分组同步成功"),
-    FINISH("绑定评卷员同步成功,结束");
-
-    ExamPaperStructureStatusEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (ExamPaperStructureStatusEnum value : ExamPaperStructureStatusEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 45
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamPrintPlanSyncStatusEnum.java

@@ -1,45 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 考试试卷结构同步状态
- */
-public enum ExamPrintPlanSyncStatusEnum {
-
-    INIT("未开始"),
-    START_SYNC("开始同步"),
-    EXAM_FINISH("考试同步成功"),
-    STUDENT_FINISH("考生同步成功"),
-    FINISH("题卡同步成功,已结束");
-
-    ExamPrintPlanSyncStatusEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (ExamPrintPlanSyncStatusEnum value : ExamPrintPlanSyncStatusEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 45
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ExamStatusEnum.java

@@ -1,45 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 命题类型
- *
- * @Date: 2021/3/23.
- */
-public enum ExamStatusEnum {
-
-    DRAFT("新建"),
-    STAGE("待命题"),
-    SUBMIT("已提交");
-
-    ExamStatusEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (ExamStatusEnum value : ExamStatusEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 42
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/FlowJoinTypeEnum.java

@@ -1,42 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 流程type
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/12/21
- */
-public enum FlowJoinTypeEnum {
-
-    NEW("新建"),
-
-    RESTART("重新提交");
-
-    private String title;
-
-    private FlowJoinTypeEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (FlowJoinTypeEnum e : FlowJoinTypeEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 42
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ImageTrajectoryEnum.java

@@ -1,42 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 生成原卷动态轨迹图 enum
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/11/3
- */
-public enum ImageTrajectoryEnum {
-
-    PREVIEW("预览"),
-
-    DOWNLOAD("下载");
-
-    private String title;
-
-    private ImageTrajectoryEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (ImageTrajectoryEnum e : ImageTrajectoryEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 45
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/MakeMethodEnum.java

@@ -1,45 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 题卡制作方式
- *
- * @Date: 2021/3/23.
- */
-public enum MakeMethodEnum {
-
-    SELECT("选择已有题卡"),
-    SELF("自助创建"),
-    CUST("客服制卡");
-
-    MakeMethodEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (MakeMethodEnum value : MakeMethodEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 22
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/PaperFileDownloadContentEnum.java

@@ -1,22 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-/**
- * @Description: 试卷文件下载内容枚举类
- * @Author: CaoZixuan
- * @Date: 2022-04-08
- */
-public enum PaperFileDownloadContentEnum {
-    ONLY_PAPER("仅下载试卷"),
-    ONLY_CARD("仅下载题卡"),
-    PAPER_AND_CARD("下载试卷和题卡")
-    ;
-    private final String desc;
-
-    PaperFileDownloadContentEnum(String desc) {
-        this.desc = desc;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-}

+ 0 - 22
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/PaperFileDownloadExposureStatusEnum.java

@@ -1,22 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-/**
- * @Description: 试卷文件下载曝光状态枚举
- * @Author: CaoZixuan
- * @Date: 2022-04-08
- */
-public enum PaperFileDownloadExposureStatusEnum {
-    EXPOSED_PAPER("已曝光的试卷"),
-    UNEXPOSED_PAPER("未曝光的试卷"),
-    ALL_PAPER("全部试卷"),
-    ;
-    private final String desc;
-
-    PaperFileDownloadExposureStatusEnum(String desc) {
-        this.desc = desc;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-}

+ 0 - 43
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/PaperTypeEnum.java

@@ -1,43 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * AB卷版式
- * @Date: 2021/3/23.
- */
-public enum PaperTypeEnum {
-
-    PRINT("印刷条码"),
-    FILL("卡号填涂");
-
-    PaperTypeEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (PaperTypeEnum value : PaperTypeEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 43
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/PrintMethodEnum.java

@@ -1,43 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 印刷方式
- * @Date: 2021/3/23.
- */
-public enum PrintMethodEnum {
-
-    AUTO("自动"),
-    MANUAL("手动");
-
-    PrintMethodEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (PrintMethodEnum value : PrintMethodEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 41
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/PrintPlanStatusEnum.java

@@ -1,41 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 印刷计划状态枚举类
- * @Author: CaoZixuan
- * @Date: 2021-04-02
- */
-public enum PrintPlanStatusEnum {
-    NEW("新建"),
-    READY("就绪"),
-    PRINTING("印刷中"),
-    PRINT_FINISH("印刷完成"),
-    END("已结束")
-    ;
-    private final String desc;
-
-    PrintPlanStatusEnum(String desc) {
-        this.desc = desc;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<>();
-        for (PrintPlanStatusEnum value : PrintPlanStatusEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-}

+ 0 - 77
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/RequiredFieldsEnum.java

@@ -1,77 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 考务必选字段(此枚举类中的字段必须在ExaminationImportDto类中有对应的属性code作为属性名,同时该属性必须加@ExcelDBFieldDesc注解,且name必须和desc对应)
- * @Date: 2021/3/29.
- */
-public enum RequiredFieldsEnum {
-
-    STUDENT_CODE("studentCode", "学号"),
-    TICKET_NUMBER("ticketNumber", "考号"),
-    SITE_NUMBER("siteNumber", "座位号"),
-    STUDENT_NAME("studentName","姓名"),
-    COURSE_CODE("courseCode","课程代码"),
-    COURSE_NAME("courseName","课程名称"),
-    PAPER_NUMBER("paperNumber","试卷编号"),
-    EXAM_PLACE("examPlace","考点"),
-    EXAM_ROOM("examRoom","考场"),
-    EXAM_DATE("examDate","考试日期"),
-    EXAM_TIME("examTime","考试时间"),
-    COLLEGE_NAME("collegeName","学院"),
-    MAJOR_NAME("majorName","专业"),
-    CLAZZ_NAME("clazzName","班级"),;
-
-
-    private final String code;
-    private final String desc;
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    RequiredFieldsEnum(String code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<>();
-        for (RequiredFieldsEnum value : RequiredFieldsEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(value.getCode());
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-    /**
-     * 是否包含
-     * @param name
-     * @return
-     */
-    public static boolean contain(String name){
-        RequiredFieldsEnum[] values = RequiredFieldsEnum.values();
-        for (RequiredFieldsEnum value : values) {
-            if(value.name().equals(name)){
-                return true;
-            }
-        }
-        return false;
-    }
-}

+ 0 - 43
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/ReviewStatusEnum.java

@@ -1,43 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 审核状态
- * @Date: 2021/3/23.
- */
-public enum ReviewStatusEnum {
-
-    PASS("通过"),
-    NOT_PASS("不通过");
-
-    ReviewStatusEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (ReviewStatusEnum value : ReviewStatusEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 44
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/StatisticsStatusEnum.java

@@ -1,44 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 统计状态 enum
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/9/9
- */
-public enum StatisticsStatusEnum {
-
-    FINISH("已完成"),
-
-    UN_JOIN("未关联"),
-
-    UN_FINISH("未完成");
-
-    private String title;
-
-    private StatisticsStatusEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (StatisticsStatusEnum e : StatisticsStatusEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 44
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/StorageLevelEnum.java

@@ -1,44 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 文件存储级别类型
- * @Date: 2021/3/23.
- */
-public enum StorageLevelEnum {
-
-    H("高"),
-    M("中"),
-    L("低");
-
-    StorageLevelEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (StorageLevelEnum value : StorageLevelEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 43
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/StorageTypeEnum.java

@@ -1,43 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 附件存储位置类型
- * @Date: 2021/3/23.
- */
-public enum StorageTypeEnum {
-
-    LOCAL("本地"),
-    OSS("OSS");
-
-    StorageTypeEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (StorageTypeEnum value : StorageTypeEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 44
paper-library-business/src/main/java/com/qmth/paper/library/business/enums/TemplateTypeEnum.java

@@ -1,44 +0,0 @@
-package com.qmth.paper.library.business.enums;
-
-import com.qmth.paper.library.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 通用模板类型
- *
- * @Date: 2021/3/23.
- */
-public enum TemplateTypeEnum {
-
-    PRINT_CONFIG("印品配置"),
-    CARD_RULE("题卡规则");
-
-    TemplateTypeEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (TemplateTypeEnum value : TemplateTypeEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 52
paper-library-business/src/main/java/com/qmth/paper/library/business/mapper/ExamStudentMapper.java

@@ -1,52 +0,0 @@
-package com.qmth.paper.library.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.paper.library.business.bean.dto.ExamStudentCourseClassDto;
-import com.qmth.paper.library.business.bean.dto.ExamStudentCourseDto;
-import com.qmth.paper.library.business.bean.dto.ExamStudentPdfInfoDto;
-import com.qmth.paper.library.business.entity.ExamStudent;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 考生 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface ExamStudentMapper extends BaseMapper<ExamStudent> {
-
-    @SuppressWarnings("MybatisXMapperMethodInspection")
-    Map<String, Object> getStudentDetail(Long id);
-
-    /**
-     * 根据科目查询考生
-     *
-     * @param schoolId
-     * @param examDetailCourseIds
-     * @return
-     */
-    List<ExamStudentCourseDto> queryBySchoolIdAndExamDetailCourseIds(@Param("schoolId") Long schoolId, @Param("examDetailCourseIds") List<Long> examDetailCourseIds);
-
-    void insertBatch(@Param("examStudents") List<ExamStudent> examStudents);
-
-    /**
-     * 根据班级id查询考生,班级可以是教学班或行政班(两表查)
-     *
-     * @param schoolId 学校id
-     * @param classId  班级id
-     * @return 考生查询结果
-     */
-    List<ExamStudent> listExamStudentBySchoolIdAndClazzId(@Param("schoolId") Long schoolId, @Param("classId") String classId);
-
-    ExamStudentPdfInfoDto getByStudentId(Long id);
-
-    @SuppressWarnings("MybatisXMapperMethodInspection")
-    List<Map> listStudentScoreSync(@Param("schoolId") Long schoolId, @Param("studentCode") String studentCode, @Param("examNumber") String examNumber, @Param("subjectCode") String subjectCode, @Param("printPlanId") Long printPlanId);
-
-    List<ExamStudentCourseClassDto> listExamStudentByPaperNumberAndPaperType(@Param("batchId") Long batchId, @Param("paperNumber") String paperNumber, @Param("paperType") String paperType);
-}

+ 0 - 17
paper-library-business/src/main/java/com/qmth/paper/library/business/service/ExamStudentService.java

@@ -1,17 +0,0 @@
-package com.qmth.paper.library.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.paper.library.business.entity.ExamStudent;
-
-/**
- * <p>
- * 考生 服务类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface ExamStudentService extends IService<ExamStudent> {
-
-
-}

+ 0 - 20
paper-library-business/src/main/java/com/qmth/paper/library/business/service/PrintCommonService.java

@@ -1,11 +1,8 @@
 package com.qmth.paper.library.business.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.paper.library.common.entity.BasicAttachment;
-import com.qmth.paper.library.common.entity.BasicCourse;
 import com.qmth.paper.library.common.entity.SysOrg;
-import com.qmth.paper.library.common.enums.ClassifyEnum;
 import com.qmth.paper.library.common.enums.TaskTypeEnum;
 import com.qmth.paper.library.common.enums.UploadFileEnum;
 import org.springframework.scheduling.annotation.Async;
@@ -14,7 +11,6 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -26,16 +22,6 @@ import java.util.Map;
  */
 public interface PrintCommonService {
 
-    /**
-     * 保存html附件和该html转成pdf的附件
-     *
-     * @param fileName    文件名称
-     * @param htmlContent html内容
-     * @param userId      创建人
-     * @return 附件对象
-     */
-    public BasicAttachment saveAttachmentHtmlAndPdf(String fileName, String htmlContent, Long userId) throws IOException;
-
     /**
      * 保存附件公用
      *
@@ -73,11 +59,6 @@ public interface PrintCommonService {
      */
     boolean sysOrgRemove(Long id);
 
-    /**
-     * 更新任务状态
-     */
-    @Async
-    public void updateStatus() throws IOException;
 
     /**
      * 重新生成pdf失败任务
@@ -114,5 +95,4 @@ public interface PrintCommonService {
     public String saveTaskAttachment(ByteArrayOutputStream fos, boolean oss) throws IOException;
 
 
-    JSONObject uploadPdfFile(File pdfFile, ClassifyEnum classifyEnum);
 }

+ 0 - 25
paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/ExamStudentServiceImpl.java

@@ -1,25 +0,0 @@
-package com.qmth.paper.library.business.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.paper.library.business.entity.ExamStudent;
-import com.qmth.paper.library.business.mapper.ExamStudentMapper;
-import com.qmth.paper.library.business.service.ExamStudentService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 考生 服务实现类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@Service
-public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamStudent> implements ExamStudentService {
-
-    @Resource
-    ExamStudentMapper examStudentMapper;
-
-}

+ 0 - 186
paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PrintCommonServiceImpl.java

@@ -9,7 +9,6 @@ import com.itextpdf.text.pdf.PdfReader;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.boot.tools.models.ByteArray;
 import com.qmth.paper.library.business.service.PrintCommonService;
-import com.qmth.paper.library.business.util.HtmlToPdfUtil;
 import com.qmth.paper.library.common.bean.dto.MqDto;
 import com.qmth.paper.library.common.bean.params.ArraysParams;
 import com.qmth.paper.library.common.config.DictionaryConfig;
@@ -80,110 +79,6 @@ public class PrintCommonServiceImpl implements PrintCommonService {
     CommonCacheService commonCacheService;
 
 
-    /**
-     * 保存html附件和该html转成pdf的附件
-     *
-     * @param fileName    文件名称
-     * @param htmlContent html内容
-     * @param userId      创建人
-     * @return 两个附件对象
-     */
-    @Transactional
-    @Override
-    public BasicAttachment saveAttachmentHtmlAndPdf(String fileName, String htmlContent, Long userId) {
-        BasicAttachment basicAttachment = null;
-        try {
-            byte[] bytes = htmlContent.getBytes();
-            int size = bytes.length;
-            boolean oss = dictionaryConfig.sysDomain().isOss();
-            LocalDateTime nowTime = LocalDateTime.now();
-            StringJoiner stringJoiner = new StringJoiner("");
-            if (!oss) {
-                stringJoiner.add(dictionaryConfig.fssLocalFileDomain().getConfig()).add(File.separator);
-            }
-            stringJoiner.add(UploadFileEnum.HTML.getTitle()).add(File.separator)
-                    .add(String.valueOf(nowTime.getYear())).add(File.separator)
-                    .add(String.format("%02d", nowTime.getMonthValue())).add(File.separator)
-                    .add(String.format("%02d", nowTime.getDayOfMonth()));
-
-            JSONObject jsonObject = new JSONObject();
-            stringJoiner.add(File.separator).add(SystemConstant.getUuid()).add(SystemConstant.HTML_PREFIX);
-            String fileMd5 = null;
-
-            if (oss) {//上传至oss
-                String dirName = stringJoiner.toString().replaceAll("\\\\", "/");
-                fileStoreUtil.ossUpload(dirName, htmlContent, fileStoreUtil.getUploadEnumByPath(dirName).getFssType());
-                jsonObject.put(SystemConstant.TYPE, SystemConstant.OSS);
-                jsonObject.put(SystemConstant.PATH, dirName);
-                String url = dictionaryConfig.fssLocalFileDomain().getConfig() + File.separator + dirName;
-                File localHtmlFile = fileStoreUtil.ossDownload(dirName, url, fileStoreUtil.getUploadEnumByPath(dirName).getFssType());
-                StringJoiner pdfStringJoiner = new StringJoiner("");
-                pdfStringJoiner.add(UploadFileEnum.PDF.getTitle()).add(File.separator);
-                pdfStringJoiner.add(String.valueOf(nowTime.getYear())).add(File.separator)
-                        .add(String.format("%02d", nowTime.getMonthValue())).add(File.separator)
-                        .add(String.format("%02d", nowTime.getDayOfMonth()));
-                pdfStringJoiner.add(File.separator).add(SystemConstant.getUuid()).add(SystemConstant.PDF_PREFIX);
-
-                String pdfDirName = pdfStringJoiner.toString();
-                String destUrl = dictionaryConfig.fssLocalPdfDomain().getConfig() + File.separator + pdfDirName;
-//                destUrl = destUrl.replaceAll("\\\\","/");
-
-                HtmlToPdfUtil.convert(localHtmlFile.getPath(), destUrl, PageSizeEnum.A4);
-//                File pdfFile = asposePdfUtil.documentToPdf(localHtmlFile.getPath(), destUrl, PaperSize.A3);
-                File pdfFile = new File(destUrl);
-                if (!pdfFile.exists()) {
-                    pdfFile.getParentFile().mkdirs();
-                    pdfFile.createNewFile();
-                }
-                fileMd5 = DigestUtils.md5Hex(new FileInputStream(pdfFile));
-//                ossUtil.ossUpload(pdfDirName, pdfFile, BinaryUtil.toBase64String(HexUtils.decodeHex(fileMd5)));
-                pdfDirName = pdfDirName.replaceAll("\\\\", "/");
-                fileStoreUtil.ossUpload(pdfDirName, pdfFile, BinaryUtil.toBase64String(HexUtils.decodeHex(fileMd5)), fileStoreUtil.getUploadEnumByPath(pdfDirName).getFssType());
-//                localHtmlFile.delete();
-                jsonObject.put(SystemConstant.PDF_PATH, pdfDirName);
-                // htmlMd5
-                jsonObject.put("htmlMd5", DigestUtils.md5Hex(new FileInputStream(localHtmlFile)));
-                jsonObject.put("pdfMd5", fileMd5);
-            } else {//上传至服务器
-                File finalFile = new File(stringJoiner.toString());
-                if (!finalFile.exists()) {
-                    finalFile.getParentFile().mkdirs();
-                    finalFile.createNewFile();
-                }
-                FileCopyUtils.copy(bytes, new File(stringJoiner.toString()));
-                fileMd5 = DigestUtils.md5Hex(new FileInputStream(stringJoiner.toString()));
-                jsonObject.put(SystemConstant.TYPE, SystemConstant.LOCAL);
-                jsonObject.put(SystemConstant.PATH, stringJoiner.toString());
-                String destUrl = finalFile.getPath().replaceAll(UploadFileEnum.HTML.name().toLowerCase(), UploadFileEnum.PDF.name().toLowerCase());
-                HtmlToPdfUtil.convert(finalFile.getPath(), destUrl, PageSizeEnum.A3);
-                File pdfFile = new File(destUrl);
-                if (!pdfFile.exists()) {
-                    pdfFile.getParentFile().mkdirs();
-                    pdfFile.createNewFile();
-                }
-                fileMd5 = DigestUtils.md5Hex(new FileInputStream(pdfFile));
-
-                jsonObject.put(SystemConstant.PDF_PATH, destUrl);
-                jsonObject.put("htmlMd5", DigestUtils.md5Hex(new FileInputStream(finalFile)));
-                jsonObject.put("pdfMd5", fileMd5);
-            }
-            jsonObject.put(SystemConstant.UPLOAD_TYPE, new UploadFileEnum[]{
-                    UploadFileEnum.HTML, UploadFileEnum.PDF
-            });
-            basicAttachment = new BasicAttachment(jsonObject.toJSONString(), fileName, SystemConstant.HTML_PREFIX, new BigDecimal(size), fileMd5, userId);
-            basicAttachmentService.save(basicAttachment);
-        } catch (Exception e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-            basicAttachmentService.deleteAttachment(basicAttachment);
-            if (e instanceof ApiException) {
-                ResultUtil.error((ApiException) e, e.getMessage());
-            } else {
-                ResultUtil.error(e.getMessage());
-            }
-        }
-        return basicAttachment;
-    }
-
     /**
      * 保存附件公用
      *
@@ -356,43 +251,6 @@ public class PrintCommonServiceImpl implements PrintCommonService {
 //        }
     }
 
-    /**
-     * 更新任务状态
-     */
-    @Override
-    @Transactional
-    public void updateStatus() throws IOException {
-        //不是自动生成pdf的全部改为失败
-//        UpdateWrapper<TBTask> tbTaskUpdateWrapper = new UpdateWrapper<>();
-//        tbTaskUpdateWrapper.lambda().set(TBTask::getStatus, TaskStatusEnum.FINISH)
-//                .set(TBTask::getSummary, "系统提交:网络异常或程序异常中断!")
-//                .set(TBTask::getResult, TaskResultEnum.ERROR)
-//                .isNotNull(TBTask::getStatus).ne(TBTask::getStatus, TaskStatusEnum.FINISH)
-//                .ne(TBTask::getType, TaskTypeEnum.CREATE_PDF);
-//        this.update(tbTaskUpdateWrapper);
-
-        QueryWrapper<TBTask> tbTaskQueryWrapper = new QueryWrapper<>();
-        tbTaskQueryWrapper.lambda().eq(TBTask::getType, TaskTypeEnum.CREATE_PDF)
-                .ne(TBTask::getStatus, TaskStatusEnum.FINISH)
-                .ne(TBTask::getResult, TaskResultEnum.SUCCESS).or().isNull(TBTask::getResult)
-                .orderByDesc(TBTask::getStatus);
-        List<TBTask> tbTasks = tbTaskService.list(tbTaskQueryWrapper);
-        if (Objects.nonNull(tbTasks) && tbTasks.size() > 0) {
-            for (TBTask tbTask : tbTasks) {
-                Map<String, Object> map = new HashMap<>();
-                if (Objects.nonNull(tbTask.getRemark())) {
-                    JSONArray jsonArray = JSONArray.parseArray(tbTask.getRemark());
-                    ArraysParams arraysParams = new ArraysParams(jsonArray.toArray(new Long[jsonArray.size()]));
-                    map.computeIfAbsent("examDetailCourseIds", v -> Arrays.asList(arraysParams.getIds()));
-                }
-                map.computeIfAbsent(SystemConstant.TASK, v -> tbTask);
-                map.computeIfAbsent(SystemConstant.USER, v -> sysUserService.getById(tbTask.getCreateId()));
-//                asyncCreatePdfTempleteService.createPdf(map, null);
-                MqDto mqDto = new MqDto(MqTagEnum.PDF.getCode(), map, String.valueOf(tbTask.getId()));
-                redisUtil.sendMessage(mqDto.getTopic(), mqDto);
-            }
-        }
-    }
 
     /**
      * 重新生成pdf失败任务
@@ -527,48 +385,4 @@ public class PrintCommonServiceImpl implements PrintCommonService {
         return Objects.nonNull(jsonObject) ? jsonObject.toJSONString() : null;
     }
 
-    /**
-     * 上传pdf文件
-     *
-     * @param pdfFile
-     * @return
-     */
-    @Override
-    public JSONObject uploadPdfFile(File pdfFile, ClassifyEnum classifyEnum) {
-        try {
-            boolean oss = dictionaryConfig.sysDomain().isOss();
-            String pdfDirName = pdfFile.getPath();
-
-            String sysConfigPath = dictionaryConfig.fssLocalPdfDomain().getConfig() + File.separator;
-            String pdfDirNameStr = pdfDirName.replace("\\", "/").replaceAll(sysConfigPath.replace("\\", "/"), "");
-
-            byte[] data = ByteArray.fromFile(pdfFile).value();
-            String md5 = ByteArray.md5(data).toHexString();
-            InputStream ins = new ByteArrayInputStream(data);
-            if (oss) {//上传至oss
-                fileStoreUtil.ossUpload(pdfDirNameStr, ins, md5, UploadFileEnum.PDF.getFssType());
-                ins.close();
-            }
-            JSONObject object = new JSONObject();
-            object.put("printType", classifyEnum);
-            object.put("pdfMd5", md5);
-            if (!oss) {
-                object.put(SystemConstant.PATH, pdfDirName);
-                object.put(SystemConstant.TYPE, SystemConstant.LOCAL);
-            } else {
-                object.put(SystemConstant.PATH, pdfDirNameStr);
-                object.put(SystemConstant.TYPE, SystemConstant.OSS);
-            }
-            object.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.PDF);
-            return object;
-        } catch (Exception e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-            if (e instanceof ApiException) {
-                ResultUtil.error((ApiException) e, e.getMessage());
-            } else {
-                ResultUtil.error(e.getMessage());
-            }
-        }
-        return null;
-    }
 }

+ 0 - 20
paper-library-business/src/main/java/com/qmth/paper/library/business/templete/callback/CallbackCreatePdf.java

@@ -1,20 +0,0 @@
-package com.qmth.paper.library.business.templete.callback;
-
-import java.util.Map;
-
-/**
- * @Description: 创建pdf 回调
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/4/19
- */
-public interface CallbackCreatePdf {
-
-    /**
-     * 创建pdf回调
-     *
-     * @param map
-     */
-    public void callback(Map<String, Object> map);
-}

+ 0 - 37
paper-library-business/src/main/java/com/qmth/paper/library/business/templete/create/AsyncCreateTaskTemplete.java

@@ -1,37 +0,0 @@
-package com.qmth.paper.library.business.templete.create;
-
-import com.qmth.paper.library.business.templete.callback.CallbackCreatePdf;
-import com.qmth.paper.library.business.templete.importData.AsyncImportTaskTemplete;
-import com.qmth.paper.library.common.util.Result;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.annotation.Async;
-
-import java.io.IOException;
-import java.util.Map;
-
-/**
- * @Description: 异步创建pdf模版
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/3/29
- */
-public abstract class AsyncCreateTaskTemplete extends AsyncImportTaskTemplete {
-    private final static Logger log = LoggerFactory.getLogger(AsyncCreateTaskTemplete.class);
-
-    public static final String BEGIN_TITLE = "->开始准备创建";
-
-    /**
-     * 创建pdf
-     *
-     * @param map
-     * @param callbackCreatePdf
-     * @return
-     * @throws IOException
-     */
-    @Async("taskThreadPool")
-    public Result createPdf(Map<String, Object> map, CallbackCreatePdf callbackCreatePdf) throws IOException {
-        return null;
-    }
-}

+ 0 - 23
paper-library-business/src/main/java/com/qmth/paper/library/business/templete/export/SyncExportTaskTemplete.java

@@ -1,23 +0,0 @@
-package com.qmth.paper.library.business.templete.export;
-
-import com.qmth.paper.library.common.util.Result;
-
-import java.util.Map;
-
-/**
- * @Description: 同步导出模版
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/3/29
- */
-public interface SyncExportTaskTemplete {
-
-    /**
-     * 同步导出任务
-     *
-     * @param map
-     * @return
-     */
-    Result exportTask(Map<String, Object> map);
-}

+ 0 - 183
paper-library-business/src/main/java/com/qmth/paper/library/business/util/GoogleBarCodeUtil.java

@@ -1,183 +0,0 @@
-package com.qmth.paper.library.business.util;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.WriterException;
-import com.google.zxing.client.j2se.MatrixToImageWriter;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.oned.Code128Writer;
-import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.common.util.Base64Util;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * @Description: 条形码生成
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/4/27
- */
-public class GoogleBarCodeUtil {
-    private final static Logger log = LoggerFactory.getLogger(GoogleBarCodeUtil.class);
-
-    /**
-     * 条形码宽度
-     */
-    private static final int WIDTH = 300;
-
-    /**
-     * 条形码高度
-     */
-    private static final int HEIGHT = 50;
-
-    /**
-     * 加文字 条形码
-     */
-    private static final int WORDHEIGHT = 85;
-    /**
-     * 设置 条形码参数
-     */
-    private static Map<EncodeHintType, Object> hints = new HashMap<EncodeHintType, Object>() {
-        private static final long serialVersionUID = 1L;
-
-        {
-            // 设置编码方式
-            put(EncodeHintType.CHARACTER_SET, "utf-8");
-//            put(EncodeHintType.MARGIN, 0);
-        }
-    };
-
-    /**
-     * 生成 图片缓冲
-     *
-     * @param vaNumber VA 码
-     * @return 返回BufferedImage
-     * @author fxbin
-     */
-    public static BufferedImage getBarCode(String vaNumber) {
-        try {
-            Code128Writer writer = new Code128Writer();
-            BitMatrix bitMatrix = writer.encode(vaNumber, BarcodeFormat.CODE_128, WIDTH, HEIGHT, hints);
-            return MatrixToImageWriter.toBufferedImage(bitMatrix);
-        } catch (WriterException e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-        }
-        return null;
-    }
-
-    /**
-     * 把带logo的二维码下面加上文字
-     *
-     * @param image 条形码图片
-     * @param words 文字
-     * @param word
-     * @return 返回BufferedImage
-     * @author fxbin
-     */
-    public static BufferedImage insertWords(BufferedImage image, String words, boolean word) {
-        // 新的图片,把带logo的二维码下面加上文字
-        BufferedImage outImage = new BufferedImage(WIDTH, WORDHEIGHT, BufferedImage.TYPE_INT_RGB);
-        Graphics2D g2d = outImage.createGraphics();
-        // 抗锯齿
-        setGraphics2D(g2d);
-        // 设置白色
-        setColorWhite(g2d);
-        // 画条形码到新的面板
-//        g2d.drawImage(image, 0, 0, image.getWidth(), image.getHeight(), null);//画字用
-        g2d.drawImage(image, 0, 0, image.getWidth(), image.getHeight(), null);
-        if (Objects.nonNull(words) && word) {
-            // 画文字到新的面板
-            Color color = new Color(0, 0, 0);
-            g2d.setColor(color);
-            // 字体、字型、字号
-            g2d.setFont(new Font("微软雅黑", Font.PLAIN, 18));
-            //文字长度
-            int strWidth = g2d.getFontMetrics().stringWidth(words);
-            //总长度减去文字长度的一半  (居中显示)
-            int wordStartX = (WIDTH - strWidth) / 2;
-            //height + (outImage.getHeight() - height) / 2 + 12
-            int wordStartY = HEIGHT + 30;
-            // 画文字
-            g2d.drawString(words, wordStartX, wordStartY);
-            g2d.dispose();
-//            outImage.flush();
-//            return outImage;
-        }
-        outImage.flush();
-        return outImage;
-    }
-
-    /**
-     * 设置 Graphics2D 属性  (抗锯齿)
-     *
-     * @param g2d Graphics2D提供对几何形状、坐标转换、颜色管理和文本布局更为复杂的控制
-     */
-    private static void setGraphics2D(Graphics2D g2d) {
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_DEFAULT);
-        Stroke s = new BasicStroke(1, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER);
-        g2d.setStroke(s);
-    }
-
-    /**
-     * 设置背景为白色
-     *
-     * @param g2d Graphics2D提供对几何形状、坐标转换、颜色管理和文本布局更为复杂的控制
-     */
-    private static void setColorWhite(Graphics2D g2d) {
-        g2d.setColor(Color.WHITE);
-        //填充整个屏幕
-        g2d.fillRect(0, 0, 600, 600);
-        //设置笔刷
-        g2d.setColor(Color.BLACK);
-    }
-
-//    public static void main(String[] args) throws IOException {
-//        BufferedImage image = getBarCode("202004270001");
-//        ImageIO.write(image, "jpg", new File("/Users/king/Downloads/3.png"));
-//
-//        StringJoiner result = new StringJoiner("");
-//        try {
-//            BufferedReader br = new BufferedReader(new FileReader("/Users/king/Downloads/线下测试学校_1_阶梯教室_签到表和卷袋贴.html"));//构造一个BufferedReader类来读取文件
-//            String s = null;
-//            while ((s = br.readLine()) != null) {//使用readLine方法,一次读一行
-//                result.add(System.lineSeparator() + s);
-//            }
-//            br.close();
-//        } catch (Exception e) {
-//        }
-//        String s = result.toString();
-//        s = s.replaceAll("\\$\\{examNumber\\}", createBarCode("202007080001", true));
-//        //随机生成学生试卷条码并将图片转成base64
-//        s = s.replaceAll("\\$\\{paperType\\}", createBarCode(SystemConstant.convertPaperType("A"), false));
-//        System.out.println(s);
-//    }
-
-    /**
-     * 创建条码
-     *
-     * @param contennt
-     * @param word
-     * @return
-     * @throws IOException
-     */
-    public static String createBarCode(String contennt, boolean word) throws IOException {
-        BufferedImage image = GoogleBarCodeUtil.getBarCode(contennt);
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        ImageIO.write(image, "png", os);
-        String imageBase64 = Base64Util.encode(os.toByteArray());
-        os.flush();
-        os.close();
-        return imageBase64;
-    }
-}

+ 0 - 126
paper-library-business/src/main/java/com/qmth/paper/library/business/util/HtmlToJpgUtil.java

@@ -1,126 +0,0 @@
-package com.qmth.paper.library.business.util;
-
-import com.qmth.paper.library.business.bean.marking.ConvertJpgStorage;
-import com.qmth.paper.library.business.service.PrintCommonService;
-import com.qmth.paper.library.common.config.DictionaryConfig;
-import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.common.entity.BasicAttachment;
-import com.qmth.paper.library.common.enums.ExceptionResultEnum;
-import com.qmth.paper.library.common.enums.PageSizeEnum;
-import com.qmth.paper.library.common.enums.UploadFileEnum;
-import com.qmth.paper.library.common.util.ConvertUtil;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.http.entity.ContentType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.mock.web.MockMultipartFile;
-import org.springframework.stereotype.Component;
-import org.springframework.util.FileCopyUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * @Description: 题卡html转化为
- * @Author: CaoZixuan
- * @Date: 2022-04-14
- */
-@Component
-public class HtmlToJpgUtil {
-    @Lazy
-    @Resource
-    PrintCommonService printCommonService;
-
-    @Resource
-    DictionaryConfig dictionaryConfig;
-
-    private final static Logger log = LoggerFactory.getLogger(HtmlToJpgUtil.class);
-
-    /**
-     * 转换html -> jpg : 生成本地临时文件
-     *
-     * @param cardTitle    题卡名称
-     * @param htmlContent  html内容
-     * @param pageSizeEnum 转化pdf的纸张类型
-     */
-    public List<BasicAttachment> convertHtmlToJpg(String cardTitle, String htmlContent, PageSizeEnum pageSizeEnum) throws Exception {
-        // 本地存储目录
-        String rootPath = dictionaryConfig.fssLocalFileDomain().getConfig() + File.separator + System.currentTimeMillis();
-        // html临时路径
-        String htmlPath = rootPath + File.separator + "html" + File.separator + cardTitle + SystemConstant.HTML_PREFIX;
-        // pdf临时路径
-        String pdfPath = rootPath + File.separator + "pdf" + File.separator + cardTitle + SystemConstant.PDF_PREFIX;
-        // jpg临时路径
-        String jpgPath = rootPath + File.separator + "jpg" + File.separator + cardTitle;
-        List<BasicAttachment> basicAttachmentList = new ArrayList<>();
-        // html
-        try {
-            File htmlFile = new File(htmlPath);
-            if (!htmlFile.getParentFile().exists()) {
-                htmlFile.getParentFile().mkdirs();
-            }
-            // 生成html文件
-            FileCopyUtils.copy(htmlContent.getBytes(), htmlFile);
-            // 转pdf文件
-            File pdfFile = new File(pdfPath);
-            if (!pdfFile.getParentFile().exists()) {
-                pdfFile.getParentFile().mkdirs();
-            }
-            HtmlToPdfUtil.convert(htmlPath, pdfPath, pageSizeEnum);
-            // pdf文件转jpg
-            List<File> jpgFileList = ConvertUtil.pdfToImageFile(pdfPath, jpgPath);
-
-            for (File jpgFile : jpgFileList) {
-                InputStream inputStream = new FileInputStream(jpgFile);
-                MultipartFile multipartFile = new MockMultipartFile(jpgFile.getName(), jpgFile.getName(),
-                        ContentType.APPLICATION_OCTET_STREAM.toString(), inputStream);
-                BasicAttachment basicAttachment = printCommonService.saveAttachment(multipartFile, DigestUtils.md5Hex(multipartFile.getBytes()), UploadFileEnum.FILE);
-                basicAttachmentList.add(basicAttachment);
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage());
-        } finally {
-            ConvertUtil.delFolder(rootPath);
-        }
-        return basicAttachmentList;
-    }
-
-    /**
-     * 转换html -> jpg : 生成本地临时文件
-     *
-     * @param cardTitle    题卡名称
-     * @param htmlContent  题卡内容
-     * @param pageSizeEnum 转化pdf的纸张类型
-     */
-    public List<ConvertJpgStorage> convertHtmlToJpgByCard(String cardTitle, String htmlContent, PageSizeEnum pageSizeEnum) throws Exception {
-        List<ConvertJpgStorage> convertJpgStorageList = new ArrayList<>();
-        try {
-            String regex = "\\$\\{\\w+}";
-            htmlContent = htmlContent.replaceAll("<img src=\"data:image/png;base64,\\$\\{examNumber\\}\">", "");
-            htmlContent = htmlContent.replaceAll(regex, "");
-            convertJpgStorageList = this.convertHtmlToJpg(cardTitle, htmlContent, pageSizeEnum).stream().flatMap(e -> {
-                ConvertJpgStorage tmp = new ConvertJpgStorage();
-                String name = e.getName();
-                String index = name.substring(name.lastIndexOf("-") + 1);
-                tmp.setAttachmentId(e.getId());
-                tmp.setIndex(Integer.valueOf(index));
-                return Stream.of(tmp);
-            }).collect(Collectors.toList());
-
-            if (convertJpgStorageList.size() == 0) {
-                throw ExceptionResultEnum.ERROR.exception("生成jpg文件异常");
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage());
-        }
-        return convertJpgStorageList;
-    }
-}

+ 0 - 80
paper-library-business/src/main/java/com/qmth/paper/library/business/util/HtmlToPdfUtil.java

@@ -1,80 +0,0 @@
-package com.qmth.paper.library.business.util;
-
-import com.qmth.paper.library.common.config.DictionaryConfig;
-import com.qmth.paper.library.common.contant.SpringContextHolder;
-import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.common.enums.PageSizeEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @Description: htmltopdf
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/4/7
- */
-public class HtmlToPdfUtil {
-    private final static Logger log = LoggerFactory.getLogger(HtmlToPdfUtil.class);
-
-    /**
-     * html转pdf
-     *
-     * @param srcPath
-     * @param destPath
-     * @param pageSizeEnum
-     * @return
-     */
-    public static boolean convert(String srcPath, String destPath, PageSizeEnum pageSizeEnum) throws IOException {
-        File file = new File(destPath);
-        if (!file.getParentFile().exists()) {
-            file.getParentFile().mkdirs();
-            file.createNewFile();
-        }
-        StringBuilder cmd = new StringBuilder();
-//        if (System.getProperty("os.name").indexOf("Windows") == -1) {
-        // 非windows 系统
-//            toPdfTool = "/usr/local/bin/wkhtmltopdf";
-//        }
-        DictionaryConfig dictionaryConfig = SpringContextHolder.getBean(DictionaryConfig.class);
-        cmd.append(dictionaryConfig.sysDomain().getHtmlToPdfUrl());
-        cmd.append(" ");
-        cmd.append("  --encoding utf8  ");
-        cmd.append(" --page-size ").append(pageSizeEnum.name()).append(" ");
-        cmd.append(" --disable-smart-shrinking ");
-        if (pageSizeEnum == PageSizeEnum.A3) {
-            cmd.append(" --orientation Landscape ");
-        }
-//        cmd.append(" --page-width 1200px ");
-//        cmd.append(" --page-width 1200px ");
-        cmd.append("  --margin-top 0 ");
-        cmd.append("  --margin-bottom 0 ");
-        cmd.append("  --margin-left 0 ");
-        cmd.append("  --margin-right 0 ");
-
-        cmd.append(srcPath);
-        cmd.append(" ");
-        cmd.append(destPath);
-
-        log.info("proc:{}", cmd.toString());
-        boolean result = true;
-        try {
-            Process proc = Runtime.getRuntime().exec(cmd.toString());
-            proc.waitFor();
-        } catch (Exception e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-            result = false;
-        }
-        log.info("proc result:{}", result);
-        return result;
-    }
-
-//    public static void main(String[] args) {
-////        HtmlToPdfUtil.convert("http://www.baidu.com", "/Users/king/Downloads/baidu.pdf", PageSizeEnum.A4);
-//        String filename = "3120ee49668e4bf48fd8c161a2abb73b的副本";
-//        HtmlToPdfUtil.convert("/Users/king/Downloads/测试附件/" + filename + ".html", "/Users/king/Downloads/pdf/" + filename + "A4.pdf", PageSizeEnum.A3);
-//    }
-}

+ 0 - 52
paper-library-business/src/main/java/com/qmth/paper/library/business/util/SmsUtils.java

@@ -79,58 +79,6 @@ public class SmsUtils {
                 templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditPassCode();
                 templateContent = messageEnum.getTemplate();
                 break;
-            case NOTICE_OF_AUDIT_NOT_PASS:
-                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditNotPassCode();
-                templateContent = messageEnum.getTemplate();
-                break;
-            case NOTICE_OF_EXAM_TASK_CREATED:
-                templateCode = dictionaryConfig.smsDomain().getAliyunSMSExamTaskCreatedCode();
-                templateContent = messageEnum.getTemplate();
-                break;
-            case NOTICE_OF_EXAM_TASK_WILL_EXPIRE:
-                templateCode = dictionaryConfig.smsDomain().getAliyunSMSExamTaskWillExpireCode();
-                templateContent = messageEnum.getTemplate();
-                break;
-            case NOTICE_OF_EXAM_TASK_OVERDUE:
-                templateCode = dictionaryConfig.smsDomain().getAliyunSMSExamTaskOverdueCode();
-                templateContent = messageEnum.getTemplate();
-                break;
-            case NOTICE_OF_ALLOCATION_WILL_EXPIRE:
-                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAllocationWillExpireCode();
-                templateContent = messageEnum.getTemplate();
-                break;
-            case NOTICE_OF_ALLOCATION_OVERDUE:
-                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAllocationOverdueCode();
-                templateContent = messageEnum.getTemplate();
-                break;
-            case NOTICE_OF_AUDIT_CREATED:
-                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditCreatedCode();
-                templateContent = messageEnum.getTemplate();
-                break;
-            case NOTICE_OF_AUDIT_REVIEW:
-                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditReviewCode();
-                templateContent = messageEnum.getTemplate();
-                break;
-            case NOTICE_OF_AUDIT_WILL_EXPIRE:
-                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditWillExpireCode();
-                templateContent = messageEnum.getTemplate();
-                break;
-            case NOTICE_OF_AUDIT_OVERDUE:
-                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditOverdueCode();
-                templateContent = messageEnum.getTemplate();
-                break;
-            case NOTICE_OF_AUDIT_REJECT:
-                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditRejectCode();
-                templateContent = messageEnum.getTemplate();
-                break;
-            case NOTICE_OF_UPLOAD_STRUCTURE:
-                templateCode = dictionaryConfig.smsDomain().getAliyunSMSUploadStructureCode();
-                templateContent = messageEnum.getTemplate();
-                break;
-            case NOTICE_OF_AUDIT_COPY_USER:
-                templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditCopyUserCode();
-                templateContent = messageEnum.getTemplate();
-                break;
             default:
                 break;
         }

+ 0 - 254
paper-library-business/src/main/resources/mapper/ExamStudentMapper.xml

@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.paper.library.business.mapper.ExamStudentMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.paper.library.business.entity.ExamStudent">
-        <result column="id" property="id"/>
-        <result column="school_id" property="schoolId"/>
-        <result column="exam_detail_course_id" property="examDetailCourseId"/>
-        <result column="student_name" property="studentName"/>
-        <result column="student_code" property="studentCode"/>
-        <result column="ticket_number" property="ticketNumber"/>
-        <result column="site_number" property="siteNumber"/>
-        <result column="print_paper" property="printPaper"/>
-        <result column="print_card" property="printCard"/>
-        <result column="extend_fields" property="extendFields"/>
-        <result column="paper_type" property="paperType"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id
-        ,
-        school_id, exam_detail_course_id, student_name, student_code, ticket_number, site_number, print_paper, print_card, extend_fields, paper_type
-    </sql>
-    <insert id="insertBatch">
-        insert into exam_student (id, school_id, org_id, exam_detail_course_id, student_name, student_code,paper_number,
-        ticket_number, site_number, extend_fields, college_name, major_name, clazz_id, clazz_name, teach_clazz_id, teach_clazz_name, student_clazz_type, campus_name, create_id) values
-        <foreach collection="examStudents" separator="," item="item">
-            (#{item.id}, #{item.schoolId}, #{item.orgId}, #{item.examDetailCourseId}, #{item.studentName},
-            #{item.studentCode},#{item.paperNumber}, #{item.ticketNumber}, #{item.siteNumber}, #{item.extendFields}, #{item.collegeName}, #{item.majorName}, #{item.clazzId},
-            #{item.clazzName},#{item.teachClazzId},#{item.teachClazzName},#{item.studentClazzType},#{item.campusName}, #{item.createId})
-        </foreach>
-    </insert>
-    <select id="getStudentDetail" resultType="java.util.Map">
-        SELECT a.student_name    studentName,
-               a.student_code    studentCode,
-               a.ticket_number   ticketNumber,
-               a.site_number     siteNumber,
-               a.extend_fields   extendFields,
-               b.course_code     courseCode,
-               b.course_name     courseName,
-               b.paper_number    paperNumber,
-               c.exam_start_time examStartTime,
-               c.exam_end_time   examEndTime,
-               c.exam_place      examPlace,
-               c.exam_room       examRoom,
-               bs.id             semesterId,
-               bs.name           semesterName,
-               be.id             examId,
-               be.name           examName
-        FROM exam_student a
-                 LEFT JOIN
-             exam_detail_course b ON a.exam_detail_course_id = b.id
-                 LEFT JOIN
-             exam_detail c ON b.exam_detail_id = c.id
-                 LEFT JOIN
-             exam_print_plan epp on epp.id = c.print_plan_id
-                 LEFT JOIN
-             basic_exam be on be.id = epp.exam_id
-                 LEFT JOIN
-             basic_semester bs on be.semester_id = bs.id
-        WHERE a.id = #{id}
-    </select>
-
-    <select id="queryBySchoolIdAndExamDetailCourseIds"
-            resultType="com.qmth.paper.library.business.bean.dto.ExamStudentCourseDto">
-        select
-        es.id,
-        es.school_id as schoolId,
-        es.exam_detail_course_id as examDetailCourseId,
-        es.student_name as studentName,
-        es.student_code as studentCode,
-        es.ticket_number as ticketNumber,
-        es.site_number as siteNumber,
-        es.print_paper as printPaper,
-        es.print_card as printCard,
-        es.extend_fields as extendFields,
-        es.paper_type as paperType,
-        es.create_id as createId,
-        es.create_time as createTime,
-        es.update_id as updateId,
-        es.update_time as updateTime,
-        es.attachment_id as attachmentId,
-        edc.course_code as courseCode,
-        edc.course_name as courseName,
-        edc.paper_pages_a3 as paperPageA3,
-        edc.paper_number as paperNumber,
-        es.clazz_id clazzId,
-        es.clazz_name clazzName,
-        es.teach_clazz_name teachClazzName,
-        es.college_name collegeName,
-        es.major_name majorName,
-        es.student_clazz_type studentClazzType
-        from
-        exam_student es
-        left join exam_detail_course edc on
-        edc.id = es.exam_detail_course_id
-        <where>
-            <if test="schoolId != null and schoolId != ''">
-                and es.school_id = #{schoolId}
-            </if>
-            <if test="examDetailCourseIds != null and examDetailCourseIds != '' and examDetailCourseIds.size > 0">
-                AND edc.id IN
-                <foreach collection="examDetailCourseIds" item="examDetailCourseId" index="index" open="(" separator=","
-                         close=")">
-                    #{examDetailCourseId}
-                </foreach>
-            </if>
-        </where>
-        order by edc.course_code, 0+ cast(es.site_number as char)
-    </select>
-    <select id="listExamStudentBySchoolIdAndClazzId"
-            resultType="com.qmth.paper.library.business.entity.ExamStudent">
-        SELECT
-        *
-        FROM
-        (SELECT
-        bs.school_id AS schoolId,
-        bs.student_code AS studentCode,
-        bs.student_name AS studentName,
-        bs.clazz_id AS clazzId,
-        bc.clazz_name AS clazzName,
-        FROM
-        basic_student bs
-        INNER JOIN basic_clazz bc ON bs.clazz_id = bc.id
-        <where>
-            <if test="schoolId != null and schoolId != ''">
-                AND bs.school_id = #{schoolId}
-            </if>
-            <if test="classId != null and classId != ''">
-                AND bc.id = #{classId}
-            </if>
-        </where>
-        UNION
-        SELECT
-        ts.school_id AS schoolId,
-        bs.student_code AS studentCode,
-        bs.student_name AS studentName,
-        ts.teach_clazz_id AS clazzId,
-        tc.teach_clazz_name AS clazzName,
-        FROM
-        teach_student ts
-        join basic_student bs on ts.student_id = bs.id
-        INNER JOIN teach_clazz tc ON ts.teach_clazz_id = tc.id
-        <where>
-            <if test="schoolId != null and schoolId != ''">
-                AND ts.school_id = #{schoolId}
-            </if>
-            <if test="classId != null and classId != ''">
-                AND tc.id = #{classId}
-            </if>
-        </where>
-        ) t0;
-    </select>
-    <select id="getByStudentId"
-            resultType="com.qmth.paper.library.business.bean.dto.ExamStudentPdfInfoDto">
-        SELECT a.student_code  studentCode,
-               a.student_name  studentName,
-               a.ticket_number ticketNumber,
-               a.site_number   siteNumber,
-               a.extend_fields extendFields,
-               a.paper_type    paperType,
-               a.college_name  collegeName,
-               a.major_name    majorName,
-               a.clazz_id      clazzId,
-               a.clazz_name    clazzName,
-               a.campus_name   campusName,
-               a.attachment_id attachmentId,
-               b.course_code   courseCode,
-               b.course_name   courseName,
-               b.paper_number  paperNumber,
-               c.exam_place    examPlace,
-               c.exam_room     examRoom
-        FROM exam_student a
-                 JOIN
-             exam_detail_course b ON a.exam_detail_course_id = b.id
-                 JOIN
-             exam_detail c ON b.exam_detail_id = c.id
-        WHERE a.id = #{id}
-    </select>
-    <select id="listStudentScoreSync" resultType="java.util.Map">
-        SELECT CASE a.student_clazz_type
-                   WHEN 'TEACH_CLAZZ' THEN a.teach_clazz_id
-                   WHEN 'BASIC_CLAZZ' THEN a.clazz_id
-                   END clazzId,
-               CASE a.student_clazz_type
-                   WHEN 'TEACH_CLAZZ' THEN a.teach_clazz_name
-                   WHEN 'BASIC_CLAZZ' THEN a.clazz_name
-                   END clazzName,
-               a.major_name   majorName,
-               b.course_code  courseCode,
-               b.paper_number paperNumber,
-               a.paper_type   paperType,
-               d.sequence
-        FROM (SELECT *
-              FROM exam_student
-              WHERE school_id = #{schoolId}
-                AND student_code = #{studentCode}
-                AND ticket_number = #{examNumber}) a
-                 JOIN
-             exam_detail_course b ON a.exam_detail_course_id = b.id
-                 JOIN
-             exam_detail c ON b.exam_detail_id = c.id
-                 JOIN
-             exam_task d ON b.school_id = d.school_id
-                 AND b.course_code = d.course_code
-                 AND b.paper_number = d.paper_number
-        WHERE c.print_plan_id = #{printPlanId}
-          AND CONCAT(b.course_code, a.paper_type, d.sequence) = #{subjectCode}
-    </select>
-    <select id="listExamStudentByPaperNumberAndPaperType"
-            resultType="com.qmth.paper.library.business.bean.dto.ExamStudentCourseClassDto">
-        SELECT
-            a.course_code courseCode,
-            a.course_name courseName,
-            a.paper_number paperNumber,
-            a.paper_type paperType,
-            a.clazz_id clazzId,
-            a.clazz_name clazzName,
-            b.teacher_name teacherName,
-            b.teacher_number teacherNumber
-        FROM
-            (SELECT DISTINCT
-                 edc.course_code,
-                 edc.course_name,
-                 edc.paper_number,
-                 es.paper_type,
-                 CASE es.student_clazz_type
-                     WHEN 'TEACH_CLAZZ' THEN es.teach_clazz_id
-                     WHEN 'BASIC_CLAZZ' THEN es.clazz_id
-                     END clazz_id,
-                 CASE es.student_clazz_type
-                     WHEN 'TEACH_CLAZZ' THEN es.teach_clazz_name
-                     WHEN 'BASIC_CLAZZ' THEN es.clazz_name
-                     END clazz_name
-             FROM
-                 exam_student es
-                     JOIN exam_detail_course edc ON es.exam_detail_course_id = edc.id
-             WHERE
-                 edc.paper_number = #{paperNumber}
-               AND es.paper_type = #{paperType}) a
-                LEFT JOIN
-            (SELECT
-                 *
-             FROM
-                 grade_batch_student_clazz
-             WHERE
-                 batch_id = #{batchId}) b ON a.course_code = b.course_code
-                AND a.paper_number = b.paper_number
-                AND a.paper_type = b.paper_type
-                AND a.clazz_id = b.clazz_id
-    </select>
-</mapper>

+ 0 - 54
paper-library-common/src/main/java/com/qmth/paper/library/common/config/DictionaryConfig.java

@@ -1,6 +1,5 @@
 package com.qmth.paper.library.common.config;
 
-import com.qmth.paper.library.common.domain.*;
 import com.qmth.paper.library.common.domain.*;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -49,38 +48,6 @@ public class DictionaryConfig {
         return new SmsDomain();
     }
 
-//    /**
-//     * 阿里云oss配置
-//     *
-//     * @return
-//     */
-//    @Bean
-//    @ConfigurationProperties(prefix = "aliyun.oss")
-//    public AliYunOssDomain aliYunOssDomain() {
-//        return new AliYunOssDomain();
-//    }
-
-    /**
-     * 云阅卷同步推送
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "sync.config", ignoreUnknownFields = false)
-    public SyncDataDomain syncDataDomain() {
-        return new SyncDataDomain();
-    }
-
-    /**
-     * 云阅卷配置
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "yun.mark", ignoreUnknownFields = false)
-    public YunMarkDomain yunMarkDomain() {
-        return new YunMarkDomain();
-    }
 
     @Bean
     @ConfigurationProperties(prefix = "com.qmth.fss.public", ignoreUnknownFields = false)
@@ -106,25 +73,4 @@ public class DictionaryConfig {
         return new FssLocalFileDomain();
     }
 
-    /**
-     * 分布式印刷开放接口
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "print.open", ignoreUnknownFields = false)
-    public PrintOpenDomain printOpenDomain() {
-        return new PrintOpenDomain();
-    }
-
-    /**
-     * 教研分析开放接口
-     *
-     * @return
-     */
-    @Bean
-    @ConfigurationProperties(prefix = "report.open", ignoreUnknownFields = false)
-    public ReportOpenDomain reportOpenDomain() {
-        return new ReportOpenDomain();
-    }
 }

+ 0 - 62
paper-library-common/src/main/java/com/qmth/paper/library/common/contant/SystemConstant.java

@@ -5,7 +5,6 @@ import com.qmth.paper.library.common.annotation.DBVerify;
 import com.qmth.paper.library.common.bean.result.DBVerifyResult;
 import com.qmth.paper.library.common.config.DictionaryConfig;
 import com.qmth.paper.library.common.enums.ExceptionResultEnum;
-import com.qmth.paper.library.common.enums.TFCustomTypeEnum;
 import com.qmth.paper.library.common.service.CommonCacheService;
 import com.qmth.paper.library.common.util.Base64Util;
 import com.qmth.paper.library.common.util.ServletUtil;
@@ -515,67 +514,6 @@ public class SystemConstant {
         return result;
     }
 
-    /**
-     * 构建流程变量
-     *
-     * @param objectId
-     * @param o
-     * @param tfCustomTypeEnum
-     * @param approveId
-     * @param flowSubmit
-     * @return
-     */
-    public static Map<String, Object> buildFlowVar(Long objectId,
-                                                   Object o,
-                                                   TFCustomTypeEnum tfCustomTypeEnum,
-                                                   Long approveId,
-                                                   boolean flowSubmit) {
-        Map<String, Object> map = new HashMap<>();
-        map.computeIfAbsent(SystemConstant.OBJECT_ID, v -> objectId);
-        map.computeIfAbsent(SystemConstant.OBJECT_DATA, v -> o);
-        map.computeIfAbsent(SystemConstant.FLOW_TYPE, v -> tfCustomTypeEnum);
-        map.computeIfAbsent(SystemConstant.APPROVE_ID, v -> approveId);
-        map.computeIfAbsent(SystemConstant.FLOW_SUBMIT, v -> flowSubmit);
-        return map;
-    }
-
-    /**
-     * 跨步数组(将list集合按照数量拆分成多个集合)
-     *
-     * @param datasource 数据源(初始大数据集合)
-     * @param step       跨步(多少个元素一个集合)
-     * @param <T>        泛型
-     * @return 拆分好地集合的集合
-     */
-    public static <T> List<List<T>> getStepList(List<T> datasource, int step) {
-        List<List<T>> result = new ArrayList<>();
-        int size = datasource.size();
-        for (int i = 0; i < size; i = i + step) {
-            List<T> cell = datasource.stream().skip(i).limit(step).collect(Collectors.toList());
-            result.add(cell);
-        }
-        return result;
-    }
-
-    /**
-     * 跨步数组(将list集合按照cpu核心数量拆分成多个集合)
-     *
-     * @param datasource 数据源
-     * @param <T>        泛型
-     * @return 拆分好地集合的集合
-     */
-    public static <T> List<List<T>> getStepList(List<T> datasource) {
-        int cpuNum = Runtime.getRuntime().availableProcessors();
-        int step = datasource.size() / cpuNum + 1;
-        List<List<T>> result = new ArrayList<>();
-        int size = datasource.size();
-        for (int i = 0; i < size; i = i + step) {
-            List<T> cell = datasource.stream().skip(i).limit(step).collect(Collectors.toList());
-            result.add(cell);
-        }
-        return result;
-    }
-
     /**
      * URL 编码, Encode默认为UTF-8.
      */

+ 0 - 98
paper-library-common/src/main/java/com/qmth/paper/library/common/domain/PrintOpenDomain.java

@@ -1,98 +0,0 @@
-package com.qmth.paper.library.common.domain;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * @Description: 分布式印刷开放接口
- * @Author: wangliang
- * @Date: 2020/4/10
- */
-public class PrintOpenDomain implements Serializable {
-
-    String hostUrl;
-
-    String callbackUrlApi;
-
-    String callbackPwd;
-
-    @ApiModelProperty(value = "知学知考开放接口:试卷基础配置查询接口")
-    String paperConfig;
-
-    @ApiModelProperty(value = "知学知考开放接口:试卷考察点查询接口")
-    String paperDimension;
-
-    @ApiModelProperty(value = "知学知考开放接口:试卷蓝图查询接口")
-    String paperStructure;
-
-    @ApiModelProperty(value = "知学知考开放接口:试卷评价模型查询接口")
-    String paperEvaluation;
-
-    @ApiModelProperty(value = "知学知考开放接口:考生成绩查询接口")
-    String examStudentScore;
-
-    public String getHostUrl() {
-        return hostUrl;
-    }
-
-    public void setHostUrl(String hostUrl) {
-        this.hostUrl = hostUrl;
-    }
-
-    public String getCallbackUrlApi() {
-        return callbackUrlApi;
-    }
-
-    public void setCallbackUrlApi(String callbackUrlApi) {
-        this.callbackUrlApi = callbackUrlApi;
-    }
-
-    public String getCallbackPwd() {
-        return callbackPwd;
-    }
-
-    public void setCallbackPwd(String callbackPwd) {
-        this.callbackPwd = callbackPwd;
-    }
-
-    public String getPaperConfig() {
-        return paperConfig;
-    }
-
-    public void setPaperConfig(String paperConfig) {
-        this.paperConfig = paperConfig;
-    }
-
-    public String getPaperDimension() {
-        return paperDimension;
-    }
-
-    public void setPaperDimension(String paperDimension) {
-        this.paperDimension = paperDimension;
-    }
-
-    public String getPaperStructure() {
-        return paperStructure;
-    }
-
-    public void setPaperStructure(String paperStructure) {
-        this.paperStructure = paperStructure;
-    }
-
-    public String getPaperEvaluation() {
-        return paperEvaluation;
-    }
-
-    public void setPaperEvaluation(String paperEvaluation) {
-        this.paperEvaluation = paperEvaluation;
-    }
-
-    public String getExamStudentScore() {
-        return examStudentScore;
-    }
-
-    public void setExamStudentScore(String examStudentScore) {
-        this.examStudentScore = examStudentScore;
-    }
-}

+ 0 - 103
paper-library-common/src/main/java/com/qmth/paper/library/common/domain/ReportOpenDomain.java

@@ -1,103 +0,0 @@
-package com.qmth.paper.library.common.domain;
-
-import java.io.Serializable;
-
-/**
- * @Description: 分布式印刷开放接口
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/4/10
- */
-public class ReportOpenDomain implements Serializable {
-
-    String hostUrl;
-
-    String semesterApi;
-
-    String examApi;
-
-    String examDeleteApi;
-
-    String courseEditApi;
-
-    String courseDelApi;
-
-    String calculateApi;
-
-    String publishApi;
-
-    String ssoLoginApi;
-
-    public String getSsoLoginApi() {
-        return ssoLoginApi;
-    }
-
-    public void setSsoLoginApi(String ssoLoginApi) {
-        this.ssoLoginApi = ssoLoginApi;
-    }
-
-    public String getHostUrl() {
-        return hostUrl;
-    }
-
-    public void setHostUrl(String hostUrl) {
-        this.hostUrl = hostUrl;
-    }
-
-    public String getExamApi() {
-        return examApi;
-    }
-
-    public void setExamApi(String examApi) {
-        this.examApi = examApi;
-    }
-
-    public String getExamDeleteApi() {
-        return examDeleteApi;
-    }
-
-    public void setExamDeleteApi(String examDeleteApi) {
-        this.examDeleteApi = examDeleteApi;
-    }
-
-    public String getCourseEditApi() {
-        return courseEditApi;
-    }
-
-    public void setCourseEditApi(String courseEditApi) {
-        this.courseEditApi = courseEditApi;
-    }
-
-    public String getCourseDelApi() {
-        return courseDelApi;
-    }
-
-    public void setCourseDelApi(String courseDelApi) {
-        this.courseDelApi = courseDelApi;
-    }
-
-    public String getCalculateApi() {
-        return calculateApi;
-    }
-
-    public void setCalculateApi(String calculateApi) {
-        this.calculateApi = calculateApi;
-    }
-
-    public String getPublishApi() {
-        return publishApi;
-    }
-
-    public void setPublishApi(String publishApi) {
-        this.publishApi = publishApi;
-    }
-
-    public String getSemesterApi() {
-        return semesterApi;
-    }
-
-    public void setSemesterApi(String semesterApi) {
-        this.semesterApi = semesterApi;
-    }
-}

+ 0 - 117
paper-library-common/src/main/java/com/qmth/paper/library/common/domain/SmsDomain.java

@@ -13,19 +13,6 @@ public class SmsDomain {
     String aliyunSMSSignName;
     String aliyunSMSTplCode;
     String aliyunSMSAuditPassCode;
-    String aliyunSMSAuditNotPassCode;
-    String aliyunSMSExamTaskCreatedCode;
-    String aliyunSMSExamTaskWillExpireCode;
-    String aliyunSMSExamTaskOverdueCode;
-    String aliyunSMSAllocationWillExpireCode;
-    String aliyunSMSAllocationOverdueCode;
-    String aliyunSMSAuditCreatedCode;
-    String aliyunSMSAuditReviewCode;
-    String aliyunSMSAuditWillExpireCode;
-    String aliyunSMSAuditOverdueCode;
-    String aliyunSMSAuditRejectCode;
-    String aliyunSMSUploadStructureCode;
-    String aliyunSMSAuditCopyUserCode;
 
     public String getSmsNormalCode() {
         return smsNormalCode;
@@ -90,108 +77,4 @@ public class SmsDomain {
     public void setAliyunSMSAuditPassCode(String aliyunSMSAuditPassCode) {
         this.aliyunSMSAuditPassCode = aliyunSMSAuditPassCode;
     }
-
-    public String getAliyunSMSAuditNotPassCode() {
-        return aliyunSMSAuditNotPassCode;
-    }
-
-    public void setAliyunSMSAuditNotPassCode(String aliyunSMSAuditNotPassCode) {
-        this.aliyunSMSAuditNotPassCode = aliyunSMSAuditNotPassCode;
-    }
-
-    public String getAliyunSMSExamTaskCreatedCode() {
-        return aliyunSMSExamTaskCreatedCode;
-    }
-
-    public void setAliyunSMSExamTaskCreatedCode(String aliyunSMSExamTaskCreatedCode) {
-        this.aliyunSMSExamTaskCreatedCode = aliyunSMSExamTaskCreatedCode;
-    }
-
-    public String getAliyunSMSExamTaskWillExpireCode() {
-        return aliyunSMSExamTaskWillExpireCode;
-    }
-
-    public void setAliyunSMSExamTaskWillExpireCode(String aliyunSMSExamTaskWillExpireCode) {
-        this.aliyunSMSExamTaskWillExpireCode = aliyunSMSExamTaskWillExpireCode;
-    }
-
-    public String getAliyunSMSExamTaskOverdueCode() {
-        return aliyunSMSExamTaskOverdueCode;
-    }
-
-    public void setAliyunSMSExamTaskOverdueCode(String aliyunSMSExamTaskOverdueCode) {
-        this.aliyunSMSExamTaskOverdueCode = aliyunSMSExamTaskOverdueCode;
-    }
-
-    public String getAliyunSMSAllocationWillExpireCode() {
-        return aliyunSMSAllocationWillExpireCode;
-    }
-
-    public void setAliyunSMSAllocationWillExpireCode(String aliyunSMSAllocationWillExpireCode) {
-        this.aliyunSMSAllocationWillExpireCode = aliyunSMSAllocationWillExpireCode;
-    }
-
-    public String getAliyunSMSAllocationOverdueCode() {
-        return aliyunSMSAllocationOverdueCode;
-    }
-
-    public void setAliyunSMSAllocationOverdueCode(String aliyunSMSAllocationOverdueCode) {
-        this.aliyunSMSAllocationOverdueCode = aliyunSMSAllocationOverdueCode;
-    }
-
-    public String getAliyunSMSAuditCreatedCode() {
-        return aliyunSMSAuditCreatedCode;
-    }
-
-    public void setAliyunSMSAuditCreatedCode(String aliyunSMSAuditCreatedCode) {
-        this.aliyunSMSAuditCreatedCode = aliyunSMSAuditCreatedCode;
-    }
-
-    public String getAliyunSMSAuditReviewCode() {
-        return aliyunSMSAuditReviewCode;
-    }
-
-    public void setAliyunSMSAuditReviewCode(String aliyunSMSAuditReviewCode) {
-        this.aliyunSMSAuditReviewCode = aliyunSMSAuditReviewCode;
-    }
-
-    public String getAliyunSMSAuditWillExpireCode() {
-        return aliyunSMSAuditWillExpireCode;
-    }
-
-    public void setAliyunSMSAuditWillExpireCode(String aliyunSMSAuditWillExpireCode) {
-        this.aliyunSMSAuditWillExpireCode = aliyunSMSAuditWillExpireCode;
-    }
-
-    public String getAliyunSMSAuditOverdueCode() {
-        return aliyunSMSAuditOverdueCode;
-    }
-
-    public void setAliyunSMSAuditOverdueCode(String aliyunSMSAuditOverdueCode) {
-        this.aliyunSMSAuditOverdueCode = aliyunSMSAuditOverdueCode;
-    }
-
-    public String getAliyunSMSAuditRejectCode() {
-        return aliyunSMSAuditRejectCode;
-    }
-
-    public void setAliyunSMSAuditRejectCode(String aliyunSMSAuditRejectCode) {
-        this.aliyunSMSAuditRejectCode = aliyunSMSAuditRejectCode;
-    }
-
-    public String getAliyunSMSUploadStructureCode() {
-        return aliyunSMSUploadStructureCode;
-    }
-
-    public void setAliyunSMSUploadStructureCode(String aliyunSMSUploadStructureCode) {
-        this.aliyunSMSUploadStructureCode = aliyunSMSUploadStructureCode;
-    }
-
-    public String getAliyunSMSAuditCopyUserCode() {
-        return aliyunSMSAuditCopyUserCode;
-    }
-
-    public void setAliyunSMSAuditCopyUserCode(String aliyunSMSAuditCopyUserCode) {
-        this.aliyunSMSAuditCopyUserCode = aliyunSMSAuditCopyUserCode;
-    }
 }

+ 0 - 167
paper-library-common/src/main/java/com/qmth/paper/library/common/domain/SyncDataDomain.java

@@ -1,167 +0,0 @@
-package com.qmth.paper.library.common.domain;
-
-/**
- * @Description: 同步云阅卷参数
- */
-public class SyncDataDomain {
-
-    String hostUrl;
-
-    String examSaveUrl;
-
-    String studentSaveUrl;
-
-    String fileUploadUrl;
-
-    String queryPaperStructure;
-
-    String markLoginUrl;
-
-    String markLeaderLoginUrl;
-
-    String studentCountUrl;
-
-    String studentScoreUrl;
-
-    String structureUrl;
-
-    String userSaveUrl;
-
-    String groupSaveUrl;
-
-    String groupCountUrl;
-
-    String groupDeleteUrl;
-
-    String markerSaveUrl;
-
-    String markLeaderSaveUrl;
-
-    public String getHostUrl() {
-        return hostUrl;
-    }
-
-    public void setHostUrl(String hostUrl) {
-        this.hostUrl = hostUrl;
-    }
-
-    public String getExamSaveUrl() {
-        return examSaveUrl;
-    }
-
-    public void setExamSaveUrl(String examSaveUrl) {
-        this.examSaveUrl = examSaveUrl;
-    }
-
-    public String getStudentSaveUrl() {
-        return studentSaveUrl;
-    }
-
-    public void setStudentSaveUrl(String studentSaveUrl) {
-        this.studentSaveUrl = studentSaveUrl;
-    }
-
-    public String getFileUploadUrl() {
-        return fileUploadUrl;
-    }
-
-    public void setFileUploadUrl(String fileUploadUrl) {
-        this.fileUploadUrl = fileUploadUrl;
-    }
-
-    public String getQueryPaperStructure() {
-        return queryPaperStructure;
-    }
-
-    public void setQueryPaperStructure(String queryPaperStructure) {
-        this.queryPaperStructure = queryPaperStructure;
-    }
-
-    public String getMarkLoginUrl() {
-        return markLoginUrl;
-    }
-
-    public void setMarkLoginUrl(String markLoginUrl) {
-        this.markLoginUrl = markLoginUrl;
-    }
-
-    public String getStudentCountUrl() {
-        return studentCountUrl;
-    }
-
-    public void setStudentCountUrl(String studentCountUrl) {
-        this.studentCountUrl = studentCountUrl;
-    }
-
-    public String getStudentScoreUrl() {
-        return studentScoreUrl;
-    }
-
-    public void setStudentScoreUrl(String studentScoreUrl) {
-        this.studentScoreUrl = studentScoreUrl;
-    }
-
-    public String getStructureUrl() {
-        return structureUrl;
-    }
-
-    public void setStructureUrl(String structureUrl) {
-        this.structureUrl = structureUrl;
-    }
-
-    public String getUserSaveUrl() {
-        return userSaveUrl;
-    }
-
-    public void setUserSaveUrl(String userSaveUrl) {
-        this.userSaveUrl = userSaveUrl;
-    }
-
-    public String getMarkLeaderLoginUrl() {
-        return markLeaderLoginUrl;
-    }
-
-    public void setMarkLeaderLoginUrl(String markLeaderLoginUrl) {
-        this.markLeaderLoginUrl = markLeaderLoginUrl;
-    }
-
-    public String getGroupSaveUrl() {
-        return groupSaveUrl;
-    }
-
-    public void setGroupSaveUrl(String groupSaveUrl) {
-        this.groupSaveUrl = groupSaveUrl;
-    }
-
-    public String getGroupCountUrl() {
-        return groupCountUrl;
-    }
-
-    public void setGroupCountUrl(String groupCountUrl) {
-        this.groupCountUrl = groupCountUrl;
-    }
-
-    public String getGroupDeleteUrl() {
-        return groupDeleteUrl;
-    }
-
-    public void setGroupDeleteUrl(String groupDeleteUrl) {
-        this.groupDeleteUrl = groupDeleteUrl;
-    }
-
-    public String getMarkerSaveUrl() {
-        return markerSaveUrl;
-    }
-
-    public void setMarkerSaveUrl(String markerSaveUrl) {
-        this.markerSaveUrl = markerSaveUrl;
-    }
-
-    public String getMarkLeaderSaveUrl() {
-        return markLeaderSaveUrl;
-    }
-
-    public void setMarkLeaderSaveUrl(String markLeaderSaveUrl) {
-        this.markLeaderSaveUrl = markLeaderSaveUrl;
-    }
-}

+ 0 - 39
paper-library-common/src/main/java/com/qmth/paper/library/common/domain/YunMarkDomain.java

@@ -1,39 +0,0 @@
-package com.qmth.paper.library.common.domain;
-
-import java.io.Serializable;
-
-/**
- * @Description: 系统配置
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/4/10
- */
-public class YunMarkDomain implements Serializable {
-
-    private static final long serialVersionUID = 7510626406622200443L;
-
-    private String url;
-
-    private String studentScoreApi;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getStudentScoreApi() {
-        return studentScoreApi;
-    }
-
-    public void setStudentScoreApi(String studentScoreApi) {
-        this.studentScoreApi = studentScoreApi;
-    }
-}

+ 0 - 42
paper-library-common/src/main/java/com/qmth/paper/library/common/enums/AssignEnum.java

@@ -1,42 +0,0 @@
-package com.qmth.paper.library.common.enums;
-
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public enum AssignEnum {
-    NEED_ASSIGN_SCORE("是","需要且按照公式赋分"),
-    NO_NEED_ASSIGN_SCORE("否","不需要赋分,标准分即为赋分"),
-    SPECIAL_ASSIGN_SCORE("特殊赋分","特殊赋分,按照excel表进行赋分"),
-    ;
-    private final String type;
-    private final String desc;
-
-    AssignEnum(String type, String desc) {
-        this.type = type;
-        this.desc = desc;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * 根据枚举类属性type查找枚举类
-     * @param type 赋分类型
-     * @return 枚举类
-     */
-    public static AssignEnum convertToEnum(String type){
-        List<AssignEnum> assignEnumList = Arrays.stream(AssignEnum.values())
-                .filter(e -> type.equals(e.getType())).distinct().collect(Collectors.toList());
-        if (assignEnumList.size() != 1){
-            throw ExceptionResultEnum.ERROR.exception("赋分类型不属于现有类型" + "[" + type + "]");
-        }
-        return assignEnumList.get(0);
-    }
-}

+ 0 - 41
paper-library-common/src/main/java/com/qmth/paper/library/common/enums/CardCreateMethodEnum.java

@@ -1,41 +0,0 @@
-package com.qmth.paper.library.common.enums;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 通卡创建方式
- */
-public enum CardCreateMethodEnum {
-
-    UPLOAD("上传"),
-    STANDARD("标准模式"),
-    FREE("自由模式");
-
-    CardCreateMethodEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (CardCreateMethodEnum value : CardCreateMethodEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 43
paper-library-common/src/main/java/com/qmth/paper/library/common/enums/ClassifyEnum.java

@@ -1,43 +0,0 @@
-package com.qmth.paper.library.common.enums;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 模板-分类
- * @Date: 2021/3/23.
- */
-public enum ClassifyEnum {
-
-    CARD("通卡"),
-    SIGN("签到表"),
-    PACKAGE("卷袋贴"),
-    CHECK_IN("登记表");
-
-    ClassifyEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * @return
-     */
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (ClassifyEnum value : ClassifyEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(null);
-            result.setDesc(value.getDesc());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

+ 0 - 42
paper-library-common/src/main/java/com/qmth/paper/library/common/enums/DepartmentTypeEnum.java

@@ -1,42 +0,0 @@
-package com.qmth.paper.library.common.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 部门类型设置 enum
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/7/29
- */
-public enum DepartmentTypeEnum {
-
-    MANAGER("主管"),
-
-    MEMBER("成员");
-
-    private String title;
-
-    private DepartmentTypeEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (DepartmentTypeEnum e : DepartmentTypeEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

+ 0 - 21
paper-library-common/src/main/java/com/qmth/paper/library/common/enums/DimensionEnum.java

@@ -1,21 +0,0 @@
-package com.qmth.paper.library.common.enums;
-
-/**
- * @Description: 维度枚举类
- * @Author: CaoZixuan
- * @Date: 2022-05-20
- */
-public enum DimensionEnum {
-    KNOWLEDGE("知识"),
-    ABILITY("能力")
-    ;
-    DimensionEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private final String desc;
-
-    public final String getDesc() {
-        return desc;
-    }
-}

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio