考试断点记录

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

@@ -23,9 +23,13 @@ public enum UploadFileEnum {
      */
     upload(2),
     /**
-     * 导入导出
+     * 导入导出&试卷
      */
-    file(3);
+    file(3),
+    /**
+     * 前端资源
+     */
+    frontend(4);
 
     private int id;
 
@@ -37,24 +41,6 @@ public enum UploadFileEnum {
         return id;
     }
 
-    /**
-     * 状态转换 toId
-     *
-     * @param value
-     * @return
-     */
-    public static int convertToId(String value) {
-        if (Objects.equals(value.trim(), client.name())) {
-            return client.getId();
-        } else if (Objects.equals(value.trim(), base_photo.name())) {
-            return base_photo.getId();
-        } else if (Objects.equals(value.trim(), upload.name())) {
-            return upload.getId();
-        } else {
-            return file.getId();
-        }
-    }
-
     /**
      * 状态转换 toName
      *
@@ -68,6 +54,8 @@ public enum UploadFileEnum {
             return base_photo.name();
         } else if (value == upload.getId()) {
             return upload.name();
+        } else if (value == frontend.getId()) {
+            return frontend.name();
         } else {
             return file.name();
         }

themis-business/src/main/resources/mapper/TBUserMapper.xml

@@ -6,6 +6,8 @@
         select
             t.id,
             t.name,
+            t.loginName,
+            t.orgName,
             t.roleName,
             t.enable,
             if(t.updateName is not null, t.updateName, t.createName) as updateName,
@@ -13,7 +15,13 @@
             from
             (
             select
-            tbu.id, tbu.name, tbr.role_name as roleName, tbu.enable, (
+            tbu.id, tbu.login_name as loginName, tbu.name, tbr.role_name as roleName, tbu.enable,(
+            select
+            t.name
+            from
+            t_b_org t
+            where
+            t.id = tbu.org_id) as orgName,(
             select
             tbu.name
             from
@@ -48,6 +56,6 @@
                 <if test="role != null and role != ''">
                     and tbr.role_code = #{role}
                 </if>
-            </where> ) t
+            </where> ) t order by t.name
     </select>
 </mapper>

themis-mq/src/main/java/com/qmth/themis/mq/enums/MqGroupEnum.java

@@ -12,101 +12,101 @@ public enum MqGroupEnum {
     /**
      * web group
      */
-    sessionConsumerWebGroup("themis-group-exam-sessionWeb"),
+    sessionConsumerWebGroup("themis-group-exam-test-sessionWeb"),
 
     /**
      * win group
      */
-    sessionConsumerWinGroup("themis-group-exam-sessionWin"),
+    sessionConsumerWinGroup("themis-group-exam-test-sessionWin"),
 
     /**
      * mac group
      */
-    sessionConsumerMacGroup("themis-group-exam-sessionMac"),
+    sessionConsumerMacGroup("themis-group-exam-test-sessionMac"),
 
     /**
      * wxapp group
      */
-    sessionConsumerWxappGroup("themis-group-exam-sessionWxapp"),
+    sessionConsumerWxappGroup("themis-group-exam-test-sessionWxapp"),
 
     /**
      * ios group
      */
-    sessionConsumerIosGroup("themis-group-exam-sessionIos"),
+    sessionConsumerIosGroup("themis-group-exam-test-sessionIos"),
 
     /**
      * android group
      */
-    sessionConsumerAndroidGroup("themis-group-exam-sessionAndroid"),
+    sessionConsumerAndroidGroup("themis-group-exam-test-sessionAndroid"),
 
     /**
      * 用户轨迹 user group
      */
-    userLogConsumerUserGroup("themis-group-exam-userLogUser"),
+    userLogConsumerUserGroup("themis-group-exam-test-userLogUser"),
 
     /**
      * 用户轨迹 student group
      */
-    userLogConsumerStudentGroup("themis-group-exam-userLogStudent"),
+    userLogConsumerStudentGroup("themis-group-exam-test-userLogStudent"),
 
     /**
      * 异步任务 考生导入 group
      */
-    taskConsumerExamStudentImportGroup("themis-group-exam-taskExamStudentImport"),
+    taskConsumerExamStudentImportGroup("themis-group-exam-test-taskExamStudentImport"),
 
     /**
      * 异步任务 考场导出 group
      */
-    taskConsumerRoomCodeExportGroup("themis-group-exam-taskRoomCodeExport"),
+    taskConsumerRoomCodeExportGroup("themis-group-exam-test-taskRoomCodeExport"),
 
     /**
      * 异步任务 考场导入 group
      */
-    taskConsumerRoomCodeImportGroup("themis-group-exam-taskRoomCodeImport"),
+    taskConsumerRoomCodeImportGroup("themis-group-exam-test-taskRoomCodeImport"),
 
     /**
      * 异步任务 试卷导入 group
      */
-    taskConsumerExamPaperImportGroup("themis-group-exam-taskExamPaperImport"),
+    taskConsumerExamPaperImportGroup("themis-group-exam-test-taskExamPaperImport"),
 
     /**
      * websocket超时退出 考生 group
      */
-    websocketConsumerOeGroup("themis-group-exam-websocketOe"),
+    websocketConsumerOeGroup("themis-group-exam-test-websocketOe"),
 
     /**
      * websocket超时退出 考生 group
      */
-    websocketConsumerUnNormalGroup("themis-group-exam-websocketUnNormal"),
+    websocketConsumerUnNormalGroup("themis-group-exam-test-websocketUnNormal"),
 
     /**
      * quartz 考场 group
      */
-    quartzConsumerExamActivityGroup("themis-group-exam-quartzExamActivity"),
+    quartzConsumerExamActivityGroup("themis-group-exam-test-quartzExamActivity"),
 
     /**
      * 计算客观分
      */
-    calculateObjectiveScoreGroup("themis-group-exam-calculateObjectiveScore"),
+    calculateObjectiveScoreGroup("themis-group-exam-test-calculateObjectiveScore"),
 
     /**
      * 人脸验证
      */
-    faceVerifySaveGroup("themis-group-exam-faceVerifySave"),
+    faceVerifySaveGroup("themis-group-exam-test-faceVerifySave"),
     /**
      * 活体验证
      */
-    livenessVerifySaveGroup("themis-group-exam-livenessVerifySave"),
+    livenessVerifySaveGroup("themis-group-exam-test-livenessVerifySave"),
 
     /**
      * 考试记录数据持久化
      */
-    examRecordPersistedGroup("themis-group-exam-examRecordPersisted"),
+    examRecordPersistedGroup("themis-group-exam-test-examRecordPersisted"),
 
     /**
      * 考试断点记录
      */
-    examBreakHistoryGroup("themis-group-exam-examBreakHistory");
+    examBreakHistoryGroup("themis-group-exam-test-examBreakHistory");
 
     private MqGroupEnum(String code) {
         this.code = code;

themis-mq/src/main/java/com/qmth/themis/mq/enums/MqTopicEnum.java

@@ -9,7 +9,7 @@ package com.qmth.themis.mq.enums;
  */
 public enum MqTopicEnum {
 
-    themisTopic("themis-topic-exam");
+    themisTopic("themis-topic-exam-test");
 
     private MqTopicEnum(String code) {
         this.code = code;