字段修改

themis-backend/src/main/java/com/qmth/themis/backend/api/TIeInvigilateController.java

@@ -3,7 +3,6 @@ package com.qmth.themis.backend.api;
 import com.qmth.themis.business.annotation.ApiJsonObject;
 import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.business.dto.response.TBOrgDto;
 import com.qmth.themis.business.entity.TBUser;
 import com.qmth.themis.business.enums.FinishTypeEnum;
 import com.qmth.themis.business.enums.MqEnum;
@@ -26,7 +25,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * @Description: 监考信息 前端控制器
@@ -65,17 +66,17 @@ public class TIeInvigilateController {
             @ApiJsonProperty(key = "examRecordId", description = "考试记录id"),
             @ApiJsonProperty(key = "type", description = "收卷类型，手动/强制")
     }) @ApiParam(value = "考试记录信息", required = true) @RequestBody Map<String, Object> mapParameter) {
-        if (Objects.isNull(mapParameter.get("examRecordId")) || Objects.equals(mapParameter.get("examRecordId"), "")) {
+        if (Objects.isNull(mapParameter.get("recordId")) || Objects.equals(mapParameter.get("recordId"), "")) {
             throw new BusinessException(ExceptionResultEnum.RECORD_ID_IS_NULL);
         }
-        List<Long> examRecordIdList = (List<Long>) mapParameter.get("examRecordId");
+        List<Long> recordIdList = (List<Long>) mapParameter.get("recordId");
         if (Objects.isNull(mapParameter.get("type")) || Objects.equals(mapParameter.get("type"), "")) {
             throw new BusinessException(ExceptionResultEnum.FINISH_TYPE_IS_NULL);
         }
         FinishTypeEnum type = FinishTypeEnum.valueOf(String.valueOf(mapParameter.get("type")));
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
         //发送mq给客户端强制收卷
-        MqDto mqDto = new MqDto(MqTopicEnum.themisTopic.getCode(), MqTagEnum.oe.name(), JacksonUtil.parseJson(examRecordIdList), type.ordinal() == FinishTypeEnum.INTERRUPT.ordinal() ? MqEnum.WEBSOCKET_MONITOR_FINISH_LOG : MqEnum.WEBSOCKET_HAND_FINISH_LOG, String.valueOf(tbUser.getId()), mapParameter, tbUser.getName());
+        MqDto mqDto = new MqDto(MqTopicEnum.themisTopic.getCode(), MqTagEnum.oe.name(), JacksonUtil.parseJson(recordIdList), type.ordinal() == FinishTypeEnum.INTERRUPT.ordinal() ? MqEnum.WEBSOCKET_MONITOR_FINISH_LOG : MqEnum.WEBSOCKET_HAND_FINISH_LOG, String.valueOf(tbUser.getId()), mapParameter, tbUser.getName());
         mqDtoService.assembleSendOneWayMsg(mqDto);
         return ResultUtil.ok(SystemConstant.SUCCESS);
     }
@@ -87,6 +88,13 @@ public class TIeInvigilateController {
             @ApiJsonProperty(key = "recordId", description = "考试记录id"),
             @ApiJsonProperty(key = "type", description = "消息类型，text/audio")
     }) @ApiParam(value = "考试记录信息", required = true) @RequestBody Map<String, Object> mapParameter) {
+        if (Objects.isNull(mapParameter.get("recordId")) || Objects.equals(mapParameter.get("recordId"), "")) {
+            throw new BusinessException(ExceptionResultEnum.RECORD_ID_IS_NULL);
+        }
+        Long recordId = Long.parseLong(String.valueOf(mapParameter.get("recordId")));
+        if (Objects.isNull(mapParameter.get("type")) || Objects.equals(mapParameter.get("type"), "")) {
+            throw new BusinessException(ExceptionResultEnum.FINISH_TYPE_IS_NULL);
+        }
         return ResultUtil.ok(SystemConstant.SUCCESS);
     }
 }

themis-business/src/main/java/com/qmth/themis/business/dto/request/TEExamDto.java

@@ -173,6 +173,10 @@ public class TEExamDto extends BaseEntity {
     @TableField(value = "mobile_photo_upload")
     private Integer mobilePhotoUpload;
 
+    @ApiModelProperty(value = "监考人工审核，now：实时审核，later：事后审核")
+    @TableField(value = "invigilate_verify")
+    private InvigilateVerifyEnum invigilateVerify;
+
     public TEExamDto() {
 
     }
@@ -238,6 +242,15 @@ public class TEExamDto extends BaseEntity {
         setCreateTime(teExam.getCreateTime());
         setUpdateId(teExam.getUpdateId());
         setUpdateTime(teExam.getUpdateTime());
+        this.invigilateVerify = teExam.getInvigilateVerify();
+    }
+
+    public InvigilateVerifyEnum getInvigilateVerify() {
+        return invigilateVerify;
+    }
+
+    public void setInvigilateVerify(InvigilateVerifyEnum invigilateVerify) {
+        this.invigilateVerify = invigilateVerify;
     }
 
     public Integer getMobilePhotoUpload() {

themis-business/src/main/java/com/qmth/themis/business/entity/TEExam.java

@@ -177,6 +177,10 @@ public class TEExam extends BaseEntity {
     @TableField(value = "mobile_photo_upload")
     private Integer mobilePhotoUpload;
 
+    @ApiModelProperty(value = "监考人工审核，now：实时审核，later：事后审核")
+    @TableField(value = "invigilate_verify")
+    private InvigilateVerifyEnum invigilateVerify;
+
     public TEExam() {
 
     }
@@ -240,6 +244,15 @@ public class TEExam extends BaseEntity {
         setCreateTime(teExamDto.getCreateTime());
         setUpdateId(teExamDto.getUpdateId());
         setUpdateTime(teExamDto.getUpdateTime());
+        this.invigilateVerify = teExamDto.getInvigilateVerify();
+    }
+
+    public InvigilateVerifyEnum getInvigilateVerify() {
+        return invigilateVerify;
+    }
+
+    public void setInvigilateVerify(InvigilateVerifyEnum invigilateVerify) {
+        this.invigilateVerify = invigilateVerify;
     }
 
     public Integer getMobilePhotoUpload() {

themis-business/src/main/java/com/qmth/themis/business/entity/TOeExamRecord.java

@@ -172,6 +172,10 @@ public class TOeExamRecord implements Serializable {
     @TableField(value = "score_status")
     private ScoreStatusEnum scoreStatus;
 
+    @ApiModelProperty(value = "监考人工审核状态，auditing：审核中，no_audit：无需审核，finished：审核完成")
+    @TableField(value = "invigilate_status")
+    private InvigilateStatusEnum invigilateStatus;
+
     public ScoreStatusEnum getScoreStatus() {
         return scoreStatus;
     }

themis-business/src/main/java/com/qmth/themis/business/enums/InvigilateStatusEnum.java

@@ -0,0 +1,27 @@
+package com.qmth.themis.business.enums;
+
+/**
+* @Description: 监考人工审核状态 enum
+* @Param:
+* @return:
+* @Author: wangliang
+* @Date: 2020/8/10
+*/
+public enum InvigilateStatusEnum {
+
+    AUDITING("审核中"),
+
+    NO_AUDIT("无需审核"),
+
+    FINISHED("审核完成");
+
+    private String code;
+
+    private InvigilateStatusEnum(String code){
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}

themis-business/src/main/java/com/qmth/themis/business/enums/InvigilateVerifyEnum.java

@@ -0,0 +1,25 @@
+package com.qmth.themis.business.enums;
+
+/**
+* @Description: 监考人工审核 enum
+* @Param:
+* @return:
+* @Author: wangliang
+* @Date: 2020/8/10
+*/
+public enum InvigilateVerifyEnum {
+
+    NOW("实时审核"),
+
+    LATER("事后审核");
+
+    private String code;
+
+    private InvigilateVerifyEnum(String code){
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}