3.3.0 fix

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

@@ -1,7 +1,6 @@
 package com.qmth.distributed.print.business.bean.dto;
 
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
-import com.qmth.distributed.print.business.enums.ExamTaskSyncStatusEnum;
 
 /**
  * 考场科目dto
@@ -12,8 +11,6 @@ public class ExamDetailCourseDto extends ExamDetailCourse {
 
     private Integer thirdRelateId;
 
-    private ExamTaskSyncStatusEnum syncStatus;
-
     private String sequence;
 
     private String loginName;
@@ -36,14 +33,6 @@ public class ExamDetailCourseDto extends ExamDetailCourse {
         this.thirdRelateId = thirdRelateId;
     }
 
-    public ExamTaskSyncStatusEnum getSyncStatus() {
-        return syncStatus;
-    }
-
-    public void setSyncStatus(ExamTaskSyncStatusEnum syncStatus) {
-        this.syncStatus = syncStatus;
-    }
-
     public String getSequence() {
         return sequence;
     }

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

@@ -1,7 +1,6 @@
 package com.qmth.distributed.print.business.bean.dto.initMarkData;
 
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
-import com.qmth.distributed.print.business.enums.ExamTaskSyncStatusEnum;
 
 /**
  * 课程同步阅卷数据dto

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

@@ -4,9 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.distributed.print.business.enums.BackupMethodEnum;
-import com.qmth.teachcloud.common.enums.DrawRuleEnum;
-import com.qmth.distributed.print.business.enums.ExamTaskSyncStatusEnum;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
+import com.qmth.teachcloud.common.enums.DrawRuleEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
@@ -93,9 +92,6 @@ public class PrintPlanResult {
     @ApiModelProperty("第三方系统关联考试名称")
     private String thirdRelateName;
 
-    @ApiModelProperty("是否同步成功")
-    private ExamTaskSyncStatusEnum syncStatus;
-
     @ApiModelProperty("考试id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long examId;
@@ -299,14 +295,6 @@ public class PrintPlanResult {
         this.thirdRelateName = thirdRelateName;
     }
 
-    public ExamTaskSyncStatusEnum getSyncStatus() {
-        return syncStatus;
-    }
-
-    public void setSyncStatus(ExamTaskSyncStatusEnum syncStatus) {
-        this.syncStatus = syncStatus;
-    }
-
     public Long getExamId() {
         return examId;
     }

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

@@ -78,9 +78,6 @@ public class ExamCard extends BaseEntity implements Serializable {
     @TableField("attachment_id")
     private Long attachmentId;
 
-    @TableField(value = "sync_status", updateStrategy = FieldStrategy.IGNORED)
-    private Boolean syncStatus;
-
     private Boolean enable;
 
     private Boolean used;
@@ -186,14 +183,6 @@ public class ExamCard extends BaseEntity implements Serializable {
         this.attachmentId = attachmentId;
     }
 
-    public Boolean getSyncStatus() {
-        return syncStatus;
-    }
-
-    public void setSyncStatus(Boolean syncStatus) {
-        this.syncStatus = syncStatus;
-    }
-
     public CardCreateMethodEnum getCreateMethod() {
         return createMethod;
     }

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

@@ -1,11 +1,9 @@
 package com.qmth.distributed.print.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.distributed.print.business.enums.ExamTaskSyncStatusEnum;
 import com.qmth.teachcloud.common.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 

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

@@ -106,9 +106,6 @@ public class ExamStudent extends BaseEntity implements Serializable {
     @TableField(value = "attachment_id")
     private Long attachmentId;
 
-    @TableField(value = "sync_status")
-    private Boolean syncStatus;
-
     public Long getSchoolId() {
         return schoolId;
     }
@@ -301,11 +298,4 @@ public class ExamStudent extends BaseEntity implements Serializable {
         this.attachmentId = attachmentId;
     }
 
-    public Boolean getSyncStatus() {
-        return syncStatus;
-    }
-
-    public void setSyncStatus(Boolean syncStatus) {
-        this.syncStatus = syncStatus;
-    }
 }

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

@@ -16,11 +16,7 @@ public enum EnumType {
     REQUIRED_FIELDS("考务必选字段"),
     REVIEW_STATUS("审核状态类型"),
     ROLE_TYPE("内置角色类型"),
-    STORAGE_LEVEL("附件存储级别"),
-    STORAGE_TYPE("附件存储方式"),
-    TEMPLATE_TYPE("模板类型"),
     CARD_REQUIRED_FIELDS("题卡规则必选字段"),
-    ORG_CENTER_TYPE_ENUM("机构用户中心类型"),
     MAKE_METHOD("题卡制作方式"),
     PRINT_PLAN_STATUS_ENUM("印刷计划状态类型"),
     EXAM_DETAIL_STATUS_ENUM("考场状态类型"),

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

@@ -1,44 +0,0 @@
-package com.qmth.distributed.print.business.enums;
-
-import com.qmth.teachcloud.common.enums.EnumResult;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 云阅卷同步状态
- */
-public enum ExamTaskSyncStatusEnum {
-
-    INIT("未开始"),
-    STARTING("同步中"),
-    FAIL("同步失败"),
-    FINISH("同步成功");
-
-    ExamTaskSyncStatusEnum(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 (ExamTaskSyncStatusEnum value : ExamTaskSyncStatusEnum.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;
-    }
-
-}

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

@@ -13,8 +13,7 @@ import java.util.List;
 public enum MakeMethodEnum {
 
     SELECT("选择已有题卡"),
-    SELF("自助创建"),
-    CUST("客服制卡");
+    SELF("自助创建");
 
     MakeMethodEnum(String desc) {
         this.desc = desc;

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

@@ -1,44 +0,0 @@
-package com.qmth.distributed.print.business.enums;
-
-import com.qmth.teachcloud.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;
-    }
-
-}

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

@@ -1,43 +0,0 @@
-package com.qmth.distributed.print.business.enums;
-
-import com.qmth.teachcloud.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;
-    }
-
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamDetailCourseMapper.java

@@ -1,7 +1,6 @@
 package com.qmth.distributed.print.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.bean.dto.ExamDetailCourseDto;
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 import com.qmth.teachcloud.common.bean.result.TbTaskDetailResult;
 import com.qmth.teachcloud.common.entity.BasicCourse;
@@ -32,8 +31,6 @@ public interface ExamDetailCourseMapper extends BaseMapper<ExamDetailCourse> {
 
     List<ExamDetailCourse> listByAndCourseCodeAndPaperNumber(@Param("schoolId") Long schoolId,@Param("examId") Long examId,@Param("courseCode") String courseCode,@Param("paperNumber") String paperNumber);
 
-    List<ExamDetailCourseDto> listByPrintPlanIdAndExamTaskId(@Param("printPlanIds") List<Long> printPlanIds, @Param("examTaskId") Long examTaskId, @Param("paperType") String paperType);
-
     List<ExamDetailCourse> listExamDetailByExamIdAndPaperNumber(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("paperNumber") String paperNumber);
 
     TbTaskDetailResult getByExamDetailId(Long examDetailId);

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

@@ -3,9 +3,6 @@ package com.qmth.distributed.print.business.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.entity.BasicTemplateOrg;
 import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
-import com.qmth.teachcloud.common.entity.SysOrg;
-
-import java.util.List;
 
 /**
  * <p>

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

@@ -1,17 +1,16 @@
 package com.qmth.distributed.print.business.service;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.bean.dto.ExamDetailCourseDto;
 import com.qmth.distributed.print.business.bean.dto.ExamDetailCourseFieldsDto;
 import com.qmth.distributed.print.business.bean.params.SingleExamStudentAddParam;
 import com.qmth.distributed.print.business.entity.ExamDetailCourse;
 import com.qmth.teachcloud.common.bean.result.TbTaskDetailResult;
 import com.qmth.teachcloud.common.entity.BasicCourse;
 
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * <p>
  * 考务数据（考场关联科目） 服务类
@@ -34,8 +33,6 @@ public interface ExamDetailCourseService extends IService<ExamDetailCourse> {
 
     List<ExamDetailCourse> listByCourseCodeAndPaperNumber(Long schoolId, Long examId, String courseCode, String paperNumber);
 
-    List<ExamDetailCourseDto> listByPrintPlanIdAndExamTaskId(List<Long> printPlanIds, Long examTaskId, String paperType);
-
     List<ExamDetailCourse> listExamDetailByExamIdAndPaperNumber(Long schoolId, Long examId, String paperNumber);
 
     TbTaskDetailResult getByExamDetailId(Long examDetailId);

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

@@ -160,6 +160,7 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             }
 
             examCard = this.getById(examCardParams.getId());
+//            String oldContent = examCard.getContent();
             examCard.setTitle(examCardParams.getTitle());
             examCard.setStatus(examCardParams.getStatus());
             examCard.setUpdateId(user.getId());
@@ -178,9 +179,13 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
             }
             this.updateById(examCard);
 
-            //内容有变动，且已经生成过任务的考场数据，重新生成pdf
+            // todo 内容有变动，且已经生成过任务的考场数据，重新生成pdf
+//            if (CardStatusEnum.SUBMIT.equals(examCardParams.getStatus())) {
+//                if(CardTypeEnum.CUSTOM.equals(examCard.getType()) && !oldContent.equals(examCardParams.getContent())){
+//                    List<>
+//                }
+//            }
         }
-
         return String.valueOf(examCard.getId());
     }
 
@@ -393,7 +398,6 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
         String title = checkTitle(examCard, courseCode);
         copyExamCard.setTitle(title);
         copyExamCard.insertInfo(requestUser.getId());
-        copyExamCard.setSyncStatus(null);
         if (CardTypeEnum.GENERIC.equals(examCard.getType()) && CardCreateMethodEnum.STANDARD.equals(examCard.getCreateMethod())) {
             BasicCourse basicCourse = basicCourseService.findByCourseCode(courseCode, requestUser.getSchoolId());
             copyExamCard.setCourseCode(courseCode);

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

@@ -1,23 +1,10 @@
 package com.qmth.distributed.print.business.service.impl;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.bean.dto.ExamDetailCourseDto;
 import com.qmth.distributed.print.business.bean.dto.ExamDetailCourseFieldsDto;
 import com.qmth.distributed.print.business.bean.examRule.CodeName;
 import com.qmth.distributed.print.business.bean.examRule.CodeNameEnableValue;
@@ -35,6 +22,16 @@ import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.ServletUtil;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -84,11 +81,6 @@ public class ExamDetailCourseServiceImpl extends ServiceImpl<ExamDetailCourseMap
         return this.baseMapper.listByAndCourseCodeAndPaperNumber(schoolId, examId, courseCode, paperNumber);
     }
 
-    @Override
-    public List<ExamDetailCourseDto> listByPrintPlanIdAndExamTaskId(List<Long> printPlanIds, Long examTaskId, String paperType) {
-        return this.baseMapper.listByPrintPlanIdAndExamTaskId(printPlanIds, examTaskId, paperType);
-    }
-
     @Override
     public List<ExamDetailCourse> listExamDetailByExamIdAndPaperNumber(Long schoolId, Long examId, String paperNumber) {
         return this.baseMapper.listExamDetailByExamIdAndPaperNumber(schoolId, examId, paperNumber);

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

@@ -78,7 +78,6 @@ public class TBSyncTaskServiceImpl extends ServiceImpl<TBSyncTaskMapper, TBSyncT
 
     @Override
     public TBSyncTask saveTask(Long schoolId, Long examId, String paperNumber, String paperType, PushTypeEnum type, String remark) {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         QueryWrapper<TBSyncTask> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(TBSyncTask::getSchoolId, schoolId)
                 .eq(TBSyncTask::getExamId, examId)
@@ -93,17 +92,17 @@ public class TBSyncTaskServiceImpl extends ServiceImpl<TBSyncTaskMapper, TBSyncT
             }
             tbSyncTask.setStatus(TaskStatusEnum.INIT);
             tbSyncTask.setRemark(remark);
-            tbSyncTask.setUpdateId(sysUser.getId());
             tbSyncTask.setUpdateTime(System.currentTimeMillis());
         } else {
             tbSyncTask = new TBSyncTask();
             tbSyncTask.setId(SystemConstant.getDbUuid());
             tbSyncTask.setSchoolId(schoolId);
             tbSyncTask.setExamId(examId);
+            tbSyncTask.setPaperNumber(paperNumber);
+            tbSyncTask.setPaperType(paperType);
             tbSyncTask.setType(type);
             tbSyncTask.setRemark(remark);
             tbSyncTask.setStatus(TaskStatusEnum.INIT);
-            tbSyncTask.setCreateId(sysUser.getId());
             tbSyncTask.setCreateTime(System.currentTimeMillis());
         }
         this.saveOrUpdate(tbSyncTask);

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

@@ -120,47 +120,6 @@
                 AND a.course_code = #{courseCode}
                 AND a.paper_number = #{paperNumber}
     </select>
-    <select id="listByPrintPlanIdAndExamTaskId"
-            resultType="com.qmth.distributed.print.business.bean.dto.ExamDetailCourseDto">
-        SELECT b.id,
-               et.id examTaskId,
-               b.course_code   courseCode,
-               b.course_name   courseName,
-               b.paper_number  paperNumber,
-               b.paper_type paperType,
-               ets.third_relate_id thirdRelateId,
-               ets.sync_status syncStatus,
-               et.sequence
-        FROM exam_detail_course b
-                 LEFT JOIN
-             exam_detail_course_paper_type edcpt ON edcpt.exam_detail_course_id = b.id
-                 LEFT JOIN
-             exam_detail c ON b.exam_detail_id = c.id
-                 LEFT JOIN
-             exam_task et ON b.school_id = et.school_id
-                 and c.exam_id = et.exam_id
-                 and b.course_code = et.course_code
-                 and b.paper_number = et.paper_number
-                 LEFT JOIN
-             exam_task_sync ets ON et.school_id = ets.school_id
-                and et.exam_id = ets.exam_id
-                and et.paper_number = ets.paper_number
-                and edcpt.paper_type = ets.paper_type
-        <where>
-            <if test="examTaskId != null">
-                and et.id = #{examTaskId}
-            </if>
-            <if test="printPlanIds != null">
-                and c.print_plan_id in
-                <foreach collection="printPlanIds" open="(" close=")" item="printPlanId" separator=",">
-                    #{printPlanId}
-                </foreach>
-            </if>
-            <if test="paperType != null and paperType != ''">
-                and edcpt.paper_type = #{paperType}
-            </if>
-        </where>
-    </select>
     <select id="listExamDetailByExamIdAndPaperNumber"
             resultMap="BaseResultMap">
         SELECT

distributed-print/install/mysql/upgrade/3.3.0.sql

@@ -184,3 +184,6 @@ ALTER TABLE `t_b_sync_task`
     ADD COLUMN `paper_type` VARCHAR(10) NULL COMMENT '试卷类型' AFTER `paper_number`;
 ALTER TABLE `sys_user`
     ADD COLUMN `allow_manual_card` TINYINT(1) NULL DEFAULT 0 COMMENT '是否允许新增卡格式' AFTER `ui_setting`;
+ALTER TABLE `exam_card` DROP COLUMN `sync_status`;
+ALTER TABLE `exam_student` DROP COLUMN `sync_status`;
+ALTER TABLE `exam_print_plan` DROP COLUMN `sync_status`;

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

@@ -83,21 +83,9 @@ public class EnumsController {
         } else if (type.equals(EnumType.ROLE_TYPE.name())) {
             //内置角色类型
             list = RoleTypeEnum.listTypes(false);
-        } else if (type.equals(EnumType.STORAGE_LEVEL.name())) {
-            //附件存储级别
-            list = StorageLevelEnum.listTypes();
-        } else if (type.equals(EnumType.STORAGE_TYPE.name())) {
-            //附件存储方式
-            list = StorageTypeEnum.listTypes();
-        } else if (type.equals(EnumType.TEMPLATE_TYPE.name())) {
-            //模板类型
-            list = TemplateTypeEnum.listTypes();
         } else if (type.equals(EnumType.CARD_REQUIRED_FIELDS.name())) {
             //题卡必选字段
             list = CardRequiredFieldsEnum.listTypes();
-        } else if (type.equals(EnumType.ORG_CENTER_TYPE_ENUM.name())) {
-            //机构用户中心类型
-            list = OrgCenterTypeEnum.listTypes();
         } else if (type.equals(EnumType.PRINT_PLAN_STATUS_ENUM.name())) {
             //印刷计划状态
             list = PrintPlanStatusEnum.listTypes();

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

@@ -1,99 +0,0 @@
-package com.qmth.distributed.print;
-
-import com.alibaba.fastjson.JSONObject;
-import com.qmth.boot.tools.signature.SignatureType;
-import com.qmth.teachcloud.common.SignatureEntityTest;
-import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.enums.SyncFileTypeEnum;
-import com.qmth.teachcloud.common.util.HttpKit;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- */
-@SpringBootTest
-@RunWith(SpringRunner.class)
-public class UploadCardTest {
-
-    static String accessKey = "d81badf113d1450c9f554809e1282ae1";
-    static String accessSecret = "dmILQXiRESNasxUylMNGl05R0JsaVb9t";
-
-    @Test
-    public void uploadCard() {
-        File file = new File("C:\\Users\\xf520\\Desktop\\SOFT400227-操作系统.json");
-        String examId = "230";
-        String subjectCode = "202211160001A10";
-        String hostUrl = "http://192.168.10.225:8000";
-
-        SyncFileTypeEnum type = SyncFileTypeEnum.CARD;
-        String fileUploadUrl = SystemConstant.CLOUD_MARK_FILE_UPLOAD_API;
-        fileUploadUrl = fileUploadUrl.replace("{type}", type.name().toLowerCase());
-        String postUrl = hostUrl.concat(fileUploadUrl);
-        try {
-            Map<String, String> files = new HashMap<>();
-            if (file.exists()) {
-                files.put(file.getName(), file.getPath());
-            }
-            //表单数据
-            Map<String, Object> formText = new HashMap<>();
-            formText.put("examId", examId);
-            formText.put("subjectCode", subjectCode);
-            String fileName = file.getName();
-            String suffix = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase();
-            if (type.equals(SyncFileTypeEnum.CARD)) {
-                if (!"zip".equals(suffix) && !"json".equals(suffix)) {
-                    throw ExceptionResultEnum.ERROR.exception("文件类型有误");
-                }
-            } else if (type.equals(SyncFileTypeEnum.PAPER) || type.equals(SyncFileTypeEnum.ANSWER)) {
-                if (!"pdf".equals(suffix) && !"json".equals(suffix)) {
-                    throw ExceptionResultEnum.ERROR.exception("文件类型有误");
-                }
-            } else {
-                throw ExceptionResultEnum.ERROR.exception("请传入文件上传类型");
-            }
-            formText.put("format", suffix);
-            formText.put("md5", DigestUtils.md5Hex(new FileInputStream(file)));
-
-            String result = HttpKit.sendPost(postUrl, getHeaders(fileUploadUrl), formText, files, null, null);
-            JSONObject jsonObject = JSONObject.parseObject(result);
-            if (jsonObject.containsKey("success")) {
-                String success = jsonObject.get("success").toString();
-                if (Boolean.parseBoolean(success)) {
-                    if (jsonObject.containsKey("url")) {
-                        System.out.println(jsonObject.get("url").toString());
-                    } else {
-                        System.out.println(success);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw ExceptionResultEnum.ERROR.exception(e.getMessage());
-        } finally {
-            if (file != null && file.exists()) {
-                file.delete();
-            }
-        }
-    }
-
-    private Map<String, String> getHeaders(String url) {
-        long time = System.currentTimeMillis();
-        Map<String, String> header = new HashMap<>();
-        header.put(SystemConstant.HEADER_AUTHORIZATION, createSign(time, url));
-        header.put(SystemConstant.HEADER_TIME, String.valueOf(time));
-        return header;
-    }
-
-    private String createSign(long time, String url) {
-        return SignatureEntityTest.build(SignatureType.SECRET, "POST", url, time, accessKey, accessSecret);
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/ObjectiveTypeEnum.java

@@ -1,43 +0,0 @@
-package com.qmth.teachcloud.common.enums;
-
-/**
- * 客观题类型enum
- */
-public enum ObjectiveTypeEnum {
-
-    SINGLE(1, "单选题"),
-    MULTIPLE(2, "多选题"),
-
-    TRUE_OR_FALSE(3, "判断题");
-
-    private int type;
-    private String name;
-
-    private ObjectiveTypeEnum(int type, String name) {
-        this.type = type;
-        this.name = name;
-    }
-
-    public int getType() {
-        return type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param type
-     * @return
-     */
-    public static String getByType(int type) {
-        for (ObjectiveTypeEnum e : ObjectiveTypeEnum.values()) {
-            if (type == e.getType()) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/OrgCenterTypeEnum.java

@@ -1,49 +0,0 @@
-package com.qmth.teachcloud.common.enums;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 机构用户中心机构类别
- * @Author: CaoZixuan
- * @Date: 2021-03-27
- */
-public enum OrgCenterTypeEnum {
-    NETWORK("NETWORK","高校网院"),
-    COLLEGE("COLLEGE","高校教务处"),
-    UNDERGRADUATE("UNDERGRADUATE","本科招办"),
-    POSTGRADUATE("COLLEGE","研究生招办"),
-    MINISTRY("MINISTRY","考试院"),
-    AOPENG("AOPENG","奥鹏"),
-    PARTNER("PARTNER","合作机构"),
-    OTHER("OTHER","其他");
-
-    OrgCenterTypeEnum(String typeCode, String typeName) {
-        this.typeCode = typeCode;
-        this.typeName = typeName;
-    }
-
-    private final String typeCode;
-    private final String typeName;
-
-    public String getTypeCode() {
-        return typeCode;
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-    public static List<EnumResult> listTypes() {
-        List<EnumResult> list = new ArrayList<EnumResult>();
-        for (OrgCenterTypeEnum value : OrgCenterTypeEnum.values()) {
-            EnumResult result = new EnumResult();
-            result.setName(value.name());
-            result.setOrdinal(value.ordinal());
-            result.setCode(value.getTypeCode());
-            result.setDesc(value.getTypeName());
-            list.add(result);
-        }
-        return list;
-    }
-
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/Source.java

@@ -1,22 +0,0 @@
-package com.qmth.teachcloud.common.enums;
-
-public enum Source {
-
-    ADMIN_WEB, ADMIN_CLIENT, OE_CLIENT, OE_ANSWER, MOBILE_MONITOR_FIRST, MOBILE_MONITOR_SECOND;
-
-    public static Source findByName(String name) {
-        if (name == null) {
-            return null;
-        }
-        for (Source item : Source.values()) {
-            if (item.toString().equalsIgnoreCase(name)) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public boolean equals(String name) {
-        return toString().equalsIgnoreCase(name);
-    }
-}

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/SyncFileTypeEnum.java

@@ -1,42 +0,0 @@
-package com.qmth.teachcloud.common.enums;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 云阅卷文件上传类型
- * @Date: 2021/10/29.
- */
-public enum SyncFileTypeEnum {
-
-    PAPER("试卷文件"),
-    ANSWER("标答文件"),
-    CARD("题卡文件");
-
-    SyncFileTypeEnum(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 (SyncFileTypeEnum value : SyncFileTypeEnum.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;
-    }
-
-}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/bean/scananswer/AnswerQueryDomain.java

@@ -38,6 +38,7 @@ public class AnswerQueryDomain extends PagerQuery {
     private Boolean omrAbsent;
 
     private Boolean assigned;
+    private Boolean assignConfirmed;
 
     private Boolean incomplete;
 
@@ -122,6 +123,15 @@ public class AnswerQueryDomain extends PagerQuery {
 	public void setAssigned(Boolean assigned) {
 		this.assigned = assigned;
 	}
+
+	public Boolean getAssignConfirmed() {
+		return assignConfirmed;
+	}
+
+	public void setAssignConfirmed(Boolean assignConfirmed) {
+		this.assignConfirmed = assignConfirmed;
+	}
+
 	public Boolean getIncomplete() {
 		return incomplete;
 	}

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkStudent.java

@@ -190,6 +190,8 @@ public class MarkStudent implements Serializable {
         this.isAbsent = false;
         this.isManualAbsent = false;
         this.isBreach = false;
+        this.absentSuspect = false;
+        this.assignConfirmed = false;
         this.subjectiveStatus = SubjectiveStatus.UNMARK;
     }
 

teachcloud-task/src/main/java/com/qmth/teachcloud/task/service/impl/PrintFinishServiceImpl.java

@@ -175,7 +175,7 @@ public class PrintFinishServiceImpl implements PrintFinishService {
                     scanAnswerCard.setCoursePaperId(dto.getCoursePaperId());
                     scanAnswerCard.setPaperType(dto.getPaperType());
                     scanAnswerCard.setCardId(paperInfoVo.getCardId());
-                    scanAnswerCard.setNumber(number);
+                    scanAnswerCard.setNumber(number + 1);
                     scanAnswerCard.setSource(CardSource.WEB);
                     scanAnswerCard.setUri(uploadPath);
                     scanAnswerCard.setMd5(md5);