字段修改

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

@@ -169,6 +169,10 @@ public class TEExamDto extends BaseEntity {
     @TableField(value = "progress")
     private Double progress;
 
+    @ApiModelProperty(value = "是否允许使用移动端拍照答题，0：不开启，1：开启")
+    @TableField(value = "mobile_photo_upload")
+    private Integer mobilePhotoUpload;
+
     public TEExamDto() {
 
     }
@@ -191,6 +195,7 @@ public class TEExamDto extends BaseEntity {
         this.breakExpireSeconds = teExam.getBreakExpireSeconds();
         this.breakResumeCount = teExam.getBreakResumeCount();
         this.cameraPhotoUpload = teExam.getCameraPhotoUpload();
+        this.mobilePhotoUpload = teExam.getMobilePhotoUpload();
         this.reexamAuditing = teExam.getReexamAuditing();
         this.showObjectiveScore = teExam.getShowObjectiveScore();
         this.mode = teExam.getMode();
@@ -229,6 +234,14 @@ public class TEExamDto extends BaseEntity {
         setUpdateTime(teExam.getUpdateTime());
     }
 
+    public Integer getMobilePhotoUpload() {
+        return mobilePhotoUpload;
+    }
+
+    public void setMobilePhotoUpload(Integer mobilePhotoUpload) {
+        this.mobilePhotoUpload = mobilePhotoUpload;
+    }
+
     public Long getOrgId() {
         return orgId;
     }

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

@@ -173,6 +173,10 @@ public class TEExam extends BaseEntity {
     @TableField(value = "progress")
     private Double progress;
 
+    @ApiModelProperty(value = "是否允许使用移动端拍照答题，0：不开启，1：开启")
+    @TableField(value = "mobile_photo_upload")
+    private Integer mobilePhotoUpload;
+
     public TEExam() {
 
     }
@@ -195,6 +199,7 @@ public class TEExam extends BaseEntity {
         this.breakExpireSeconds = teExamDto.getBreakExpireSeconds();
         this.breakResumeCount = teExamDto.getBreakResumeCount();
         this.cameraPhotoUpload = teExamDto.getCameraPhotoUpload();
+        this.mobilePhotoUpload = teExamDto.getMobilePhotoUpload();
         this.reexamAuditing = teExamDto.getReexamAuditing();
         this.showObjectiveScore = teExamDto.getShowObjectiveScore();
         this.mode = teExamDto.getMode();
@@ -227,6 +232,14 @@ public class TEExam extends BaseEntity {
         setUpdateTime(teExamDto.getUpdateTime());
     }
 
+    public Integer getMobilePhotoUpload() {
+        return mobilePhotoUpload;
+    }
+
+    public void setMobilePhotoUpload(Integer mobilePhotoUpload) {
+        this.mobilePhotoUpload = mobilePhotoUpload;
+    }
+
     public Integer getCameraPhotoUpload() {
         return cameraPhotoUpload;
     }

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

@@ -11,23 +11,23 @@ import java.util.Objects;
  */
 public enum WebsocketTypeEnum {
 
-    CLIENT_PAPER_DOWNLOAD("客户端已下载试卷","clientPaperDownload"),
+    CLIENT_PAPER_DOWNLOAD("客户端已下载试卷", "clientPaperDownload"),
 
-    SYNC_STATUS("状态同步","syncStatus"),
+    SYNC_STATUS("状态同步", "syncStatus"),
 
-    SYNC_ACK( "同步确认","syncAck"),
+    SYNC_ACK("同步确认", "syncAck"),
 
-    INVIGILATE_LIVENESS_VERIFY( "监考强制活体验证","invigilateLivenessVerify"),
+    INVIGILATE_LIVENESS_VERIFY("监考强制活体验证", "invigilateLivenessVerify"),
 
-    INVIGILATE_NOTICE( "监考消息","invigilateNotice"),
+    INVIGILATE_NOTICE("监考消息", "invigilateNotice"),
 
-    INVIGILATE_NOTICE_ACK( "监考消息确认","invigilateNoticeAck"),
+    INVIGILATE_NOTICE_ACK("监考消息确认", "invigilateNoticeAck"),
 
-    INVIGILATE_STOP_EXAM( "监考强制收卷","invigilateStopExam"),
+    INVIGILATE_STOP_EXAM("监考强制收卷", "invigilateStopExam"),
 
-    BREACH_STOP_EXAM( "预警强制收卷","breachStopExam"),
+    BREACH_STOP_EXAM("预警强制收卷", "breachStopExam"),
 
-    HAND_STOP_EXAM( "手动收卷","handStopExam");
+    HAND_STOP_EXAM("手动收卷", "handStopExam");
 
     private String code;
     private String desc;
@@ -44,4 +44,32 @@ public enum WebsocketTypeEnum {
     public String getDesc() {
         return desc;
     }
+
+    /**
+     * 状态转换 toName
+     *
+     * @param value
+     * @return
+     */
+    public static String convertToName(String value) {
+        if (Objects.equals(value.trim(), CLIENT_PAPER_DOWNLOAD.getDesc())) {
+            return CLIENT_PAPER_DOWNLOAD.name();
+        } else if (Objects.equals(value.trim(), SYNC_STATUS.getDesc())) {
+            return SYNC_STATUS.name();
+        } else if (Objects.equals(value.trim(), SYNC_ACK.getDesc())) {
+            return SYNC_ACK.name();
+        } else if (Objects.equals(value.trim(), INVIGILATE_LIVENESS_VERIFY.getDesc())) {
+            return INVIGILATE_LIVENESS_VERIFY.name();
+        } else if (Objects.equals(value.trim(), INVIGILATE_NOTICE.getDesc())) {
+            return INVIGILATE_NOTICE.name();
+        } else if (Objects.equals(value.trim(), INVIGILATE_NOTICE_ACK.getDesc())) {
+            return INVIGILATE_NOTICE_ACK.name();
+        } else if (Objects.equals(value.trim(), INVIGILATE_STOP_EXAM.getDesc())) {
+            return INVIGILATE_STOP_EXAM.name();
+        } else if (Objects.equals(value.trim(), BREACH_STOP_EXAM.getDesc())) {
+            return BREACH_STOP_EXAM.name();
+        } else {
+            return HAND_STOP_EXAM.name();
+        }
+    }
 }

themis-exam/src/main/java/com/qmth/themis/exam/websocketTemplete/WebSocketOeMessageTemplete.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.qmth.themis.business.cache.RedisKeyHelper;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.WebsocketDto;
+import com.qmth.themis.business.enums.WebsocketTypeEnum;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.exception.BusinessException;
@@ -91,7 +92,7 @@ public class WebSocketOeMessageTemplete {
     public WebsocketDto syncAck() {
         Map map = new HashMap<>();
         map.put(SystemConstant.ACK_MESSAGE, System.currentTimeMillis());
-        return new WebsocketDto(Thread.currentThread().getStackTrace()[1].getMethodName(), map);
+        return new WebsocketDto(WebsocketTypeEnum.convertToName(Thread.currentThread().getStackTrace()[1].getMethodName()), map);
     }
 
     /**
@@ -112,6 +113,6 @@ public class WebSocketOeMessageTemplete {
     public WebsocketDto invigilateNoticeAck() {
         Map map = new HashMap<>();
         map.put(SystemConstant.ACK_MESSAGE, System.currentTimeMillis());
-        return new WebsocketDto(Thread.currentThread().getStackTrace()[1].getMethodName(), map);
+        return new WebsocketDto(WebsocketTypeEnum.convertToName(Thread.currentThread().getStackTrace()[1].getMethodName()), map);
     }
 }