Ver código fonte

移动端接口

wangliang 4 anos atrás
pai
commit
47a970f825

+ 10 - 52
themis-business/src/main/java/com/qmth/themis/business/enums/AttachmentEnum.java

@@ -50,33 +50,12 @@ public enum AttachmentEnum {
      * @return
      */
     public static String convertToName(String value) {
-        if (Objects.equals(value.trim(), name.code)) {
-            return name.name();
-        } else if (Objects.equals(value.trim(), courseCode.code)) {
-            return courseCode.name();
-        } else if (Objects.equals(value.trim(), courseName.code)) {
-            return courseName.name();
-        } else if (Objects.equals(value.trim(), extendColumn.code)) {
-            return extendColumn.name();
-        } else if (Objects.equals(value.trim(), grade.code)) {
-            return grade.name();
-        } else if (Objects.equals(value.trim(), classNo.code)) {
-            return classNo.name();
-        } else if (Objects.equals(value.trim(), examActivityCode.code)) {
-            return examActivityCode.name();
-        } else if (Objects.equals(value.trim(), roomCode.code)) {
-            return roomCode.name();
-        } else if (Objects.equals(value.trim(), roomName.code)) {
-            return roomName.name();
-        } else if (Objects.equals(value.trim(), teacher1.code)) {
-            return teacher1.name();
-        } else if (Objects.equals(value.trim(), teacher2.code)) {
-            return teacher2.name();
-        } else if (Objects.equals(value.trim(), teacher3.code)) {
-            return teacher3.name();
-        } else {
-            return identity.name();
+        for (AttachmentEnum e : AttachmentEnum.values()) {
+            if (Objects.equals(value.trim(), e.code)) {
+                return e.name();
+            }
         }
+        return null;
     }
 
     /**
@@ -86,33 +65,12 @@ public enum AttachmentEnum {
      * @return
      */
     public static String convertToCode(String value) {
-        if (Objects.equals(value.trim(), name.name())) {
-            return name.code;
-        } else if (Objects.equals(value.trim(), courseCode.name())) {
-            return courseCode.code;
-        } else if (Objects.equals(value.trim(), courseName.name())) {
-            return courseName.code;
-        } else if (Objects.equals(value.trim(), extendColumn.name())) {
-            return extendColumn.code;
-        } else if (Objects.equals(value.trim(), grade.name())) {
-            return grade.code;
-        } else if (Objects.equals(value.trim(), classNo.name())) {
-            return classNo.code;
-        } else if (Objects.equals(value.trim(), examActivityCode.name())) {
-            return examActivityCode.code;
-        } else if (Objects.equals(value.trim(), roomCode.name())) {
-            return roomCode.code;
-        } else if (Objects.equals(value.trim(), roomName.name())) {
-            return roomName.code;
-        } else if (Objects.equals(value.trim(), teacher1.name())) {
-            return teacher1.code;
-        } else if (Objects.equals(value.trim(), teacher2.name())) {
-            return teacher2.code;
-        } else if (Objects.equals(value.trim(), teacher3.name())) {
-            return teacher3.code;
-        } else {
-            return identity.code;
+        for (AttachmentEnum e : AttachmentEnum.values()) {
+            if (Objects.equals(value.trim(), e.name())) {
+                return e.code;
+            }
         }
+        return null;
     }
 
     public String getCode() {

+ 5 - 8
themis-business/src/main/java/com/qmth/themis/business/enums/DownloadFileEnum.java

@@ -1,7 +1,5 @@
 package com.qmth.themis.business.enums;
 
-import java.util.Objects;
-
 /**
  * @Description: 下载文件类型
  * @Param:
@@ -42,12 +40,11 @@ public enum DownloadFileEnum {
      * @return
      */
     public static String convertToName(int value) {
-        if (value == IMPORTFILE.getId()) {
-            return IMPORTFILE.name();
-        } else if (value == ERROR.getId()) {
-            return ERROR.name();
-        } else {
-            return RESULT.name();
+        for (DownloadFileEnum e : DownloadFileEnum.values()) {
+            if (value == e.getId()) {
+                return e.name();
+            }
         }
+        return null;
     }
 }

+ 11 - 41
themis-business/src/main/java/com/qmth/themis/business/enums/FieldUniqueEnum.java

@@ -19,7 +19,7 @@ public enum FieldUniqueEnum {
 
     t_e_exam_paper_examId_code_Idx("考试试卷编码"),
 
-//    t_e_exam_student_examId_roomCode_Idx("考场代码"),
+    t_e_exam_student_examId_roomCode_Idx("考场代码"),
 
     t_e_student_orgId_identity_Idx("证件号"),
 
@@ -46,27 +46,12 @@ public enum FieldUniqueEnum {
      * @return
      */
     public static String convertToName(String value) {
-        if (Objects.equals(value.trim(), t_e_exam_orgId_code_Idx.code)) {
-            return t_e_exam_orgId_code_Idx.name();
-        } else if (Objects.equals(value.trim(), t_e_exam_course_examId_courseCode_Idx.code)) {
-            return t_e_exam_course_examId_courseCode_Idx.name();
-        } else if (Objects.equals(value.trim(), t_e_exam_paper_examId_code_Idx.code)) {
-            return t_e_exam_paper_examId_code_Idx.name();
-        }
-//        else if (Objects.equals(value.trim(), t_e_exam_student_examId_roomCode_Idx.code)) {
-//            return t_e_exam_student_examId_roomCode_Idx.name();
-//        }
-        else if (Objects.equals(value.trim(), t_e_student_orgId_identity_Idx.code)) {
-            return t_e_student_orgId_identity_Idx.name();
-        } else if (Objects.equals(value.trim(), t_b_exam_invigilate_user_orgId_userId_roomCode_Idx.code)) {
-            return t_b_exam_invigilate_user_orgId_userId_roomCode_Idx.name();
-        } else if (Objects.equals(value.trim(), t_b_user_loginName_orgId_Idx.code)) {
-            return t_b_user_loginName_orgId_Idx.name();
-        } else if (Objects.equals(value.trim(), t_ie_exam_invigilate_call_recordId_source_Idx.code)) {
-            return t_ie_exam_invigilate_call_recordId_source_Idx.name();
-        } else {
-            return t_e_exam_activity_examId_code_Idx.name();
+        for (FieldUniqueEnum e : FieldUniqueEnum.values()) {
+            if (Objects.equals(value.trim(), e.code)) {
+                return e.name();
+            }
         }
+        return null;
     }
 
     /**
@@ -76,26 +61,11 @@ public enum FieldUniqueEnum {
      * @return
      */
     public static String convertToCode(String value) {
-        if (value.trim().contains(t_e_exam_orgId_code_Idx.name())) {
-            return t_e_exam_orgId_code_Idx.code;
-        } else if (value.trim().contains(t_e_exam_course_examId_courseCode_Idx.name())) {
-            return t_e_exam_course_examId_courseCode_Idx.code;
-        } else if (value.trim().contains(t_e_exam_paper_examId_code_Idx.name())) {
-            return t_e_exam_paper_examId_code_Idx.code;
-        }
-//        else if (value.trim().contains(t_e_exam_student_examId_roomCode_Idx.name())) {
-//            return t_e_exam_student_examId_roomCode_Idx.code;
-//        }
-        else if (value.trim().contains(t_e_student_orgId_identity_Idx.name())) {
-            return t_e_student_orgId_identity_Idx.code;
-        } else if (value.trim().contains(t_b_exam_invigilate_user_orgId_userId_roomCode_Idx.name())) {
-            return t_b_exam_invigilate_user_orgId_userId_roomCode_Idx.code;
-        } else if (value.trim().contains(t_b_user_loginName_orgId_Idx.name())) {
-            return t_b_user_loginName_orgId_Idx.code;
-        } else if (value.trim().contains(t_ie_exam_invigilate_call_recordId_source_Idx.name())) {
-            return t_ie_exam_invigilate_call_recordId_source_Idx.code;
-        } else {
-            return t_e_exam_activity_examId_code_Idx.code;
+        for (FieldUniqueEnum e : FieldUniqueEnum.values()) {
+            if (Objects.equals(value.trim(), e.name())) {
+                return e.code;
+            }
         }
+        return null;
     }
 }

+ 5 - 12
themis-business/src/main/java/com/qmth/themis/business/enums/UploadFileEnum.java

@@ -1,7 +1,5 @@
 package com.qmth.themis.business.enums;
 
-import java.util.Objects;
-
 /**
  * @Description: 上传文件类型
  * @Param:
@@ -48,16 +46,11 @@ public enum UploadFileEnum {
      * @return
      */
     public static String convertToName(int value) {
-        if (value == client.getId()) {
-            return client.name();
-        } else if (value == base_photo.getId()) {
-            return base_photo.name();
-        } else if (value == upload.getId()) {
-            return upload.name();
-        } else if (value == frontend.getId()) {
-            return frontend.name();
-        } else {
-            return file.name();
+        for (UploadFileEnum e : UploadFileEnum.values()) {
+            if (value == e.getId()) {
+                return e.name();
+            }
         }
+        return null;
     }
 }

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

@@ -32,8 +32,14 @@ public enum WebsocketTypeEnum {
     EXAM_START("考试开始", "examStart"),
 
     EXAM_STOP("考试结束", "examStop"),
-    		
-	MOBILE_ANSWER_READY("移动端拍照/录音扫描完成", "mobileAnswerReady");
+
+    MOBILE_ANSWER_READY("移动端拍照/录音扫描完成", "mobileAnswerReady"),
+
+    MOBILE_ANSWER_UPLOAD("移动端拍照/录音上传成功", "mobileAnswerUpload"),
+
+    MOBILE_MONITOR_START("移动端监控开始", "mobileMonitorStart"),
+
+    MOBILE_MONITOR_STOP("移动端监控停止", "mobileMonitorStop");
 
     private String code;
     private String desc;
@@ -58,34 +64,11 @@ public enum WebsocketTypeEnum {
      * @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 if (Objects.equals(value.trim(), EXAM_START.getDesc())) {
-//            return EXAM_START.name();
-//        } else if (Objects.equals(value.trim(), EXAM_STOP.getDesc())) {
-//            return EXAM_STOP.name();
-//        } else {
-//            return HAND_STOP_EXAM.name();
-//        }
-    	for(WebsocketTypeEnum e:WebsocketTypeEnum.values()) {
-    		if (Objects.equals(value.trim(), e.getDesc())) {
-    			return e.name();
-    		}
-    	}
-    	return HAND_STOP_EXAM.name();
+        for (WebsocketTypeEnum e : WebsocketTypeEnum.values()) {
+            if (Objects.equals(value.trim(), e.getDesc())) {
+                return e.name();
+            }
+        }
+        return null;
     }
 }