Browse Source

代码整理

wangliang 3 years ago
parent
commit
91eebff7de
41 changed files with 280 additions and 252 deletions
  1. 10 10
      themis-admin/src/main/java/com/qmth/themis/admin/api/SysController.java
  2. 13 13
      themis-admin/src/main/java/com/qmth/themis/admin/api/TBExamInvigilateUserController.java
  3. 2 2
      themis-admin/src/main/java/com/qmth/themis/admin/api/TBOrgController.java
  4. 9 9
      themis-admin/src/main/java/com/qmth/themis/admin/api/TBUserController.java
  5. 6 6
      themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamController.java
  6. 4 4
      themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamPaperController.java
  7. 3 3
      themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamReexamController.java
  8. 24 24
      themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamStudentController.java
  9. 5 4
      themis-admin/src/main/java/com/qmth/themis/admin/api/TEStudentController.java
  10. 18 18
      themis-admin/src/main/java/com/qmth/themis/admin/api/TIeInvigilateController.java
  11. 4 3
      themis-business/src/main/java/com/qmth/themis/business/config/MetaHandler.java
  12. 32 12
      themis-business/src/main/java/com/qmth/themis/business/constant/SystemConstant.java
  13. 3 3
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TBAttachmentServiceImpl.java
  14. 5 4
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamBreachLogServiceImpl.java
  15. 6 6
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamServiceImpl.java
  16. 2 1
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamStudentServiceImpl.java
  17. 7 6
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TEOpenServiceImpl.java
  18. 8 7
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TIeReportServiceImpl.java
  19. 7 7
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TOeExamRecordServiceImpl.java
  20. 2 1
      themis-business/src/main/java/com/qmth/themis/business/service/impl/WarningServiceImpl.java
  21. 8 8
      themis-business/src/main/java/com/qmth/themis/business/templete/TaskExportCommon.java
  22. 11 11
      themis-business/src/main/java/com/qmth/themis/business/templete/TaskImportCommon.java
  23. 4 4
      themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamPaperImportTemplete.java
  24. 5 5
      themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamStudentExportTemplete.java
  25. 4 4
      themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskMarkResultSimpleExportTemplete.java
  26. 4 4
      themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskMarkResultStandardExportTemplete.java
  27. 3 3
      themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskRoomCodeExportTemplete.java
  28. 7 7
      themis-business/src/main/java/com/qmth/themis/business/templete/service/impl/TempleteLogicServiceImpl.java
  29. 2 2
      themis-business/src/main/java/com/qmth/themis/business/util/WebsocketUtil.java
  30. 3 2
      themis-exam/src/main/java/com/qmth/themis/exam/api/SysController.java
  31. 4 4
      themis-exam/src/main/java/com/qmth/themis/exam/api/TEExamController.java
  32. 3 3
      themis-exam/src/main/java/com/qmth/themis/exam/api/TEFaceController.java
  33. 2 2
      themis-exam/src/main/java/com/qmth/themis/exam/api/TELivenessController.java
  34. 1 1
      themis-exam/src/main/java/com/qmth/themis/exam/api/TEMobileController.java
  35. 4 4
      themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java
  36. 11 11
      themis-exam/src/main/java/com/qmth/themis/exam/api/TIeInvigilateCallMobileController.java
  37. 11 11
      themis-exam/src/main/java/com/qmth/themis/exam/api/TIeInvigilateCallOeController.java
  38. 4 4
      themis-exam/src/main/java/com/qmth/themis/exam/listener/service/impl/MqOeLogicServiceImpl.java
  39. 15 15
      themis-mq/src/main/java/com/qmth/themis/mq/service/impl/MqLogicServiceImpl.java
  40. 1 1
      themis-task/src/main/java/com/qmth/themis/task/listener/service/impl/MqTaskLogicServiceImpl.java
  41. 3 3
      themis-task/src/main/java/com/qmth/themis/task/start/StartRunning.java

+ 10 - 10
themis-admin/src/main/java/com/qmth/themis/admin/api/SysController.java

@@ -132,9 +132,9 @@ public class SysController {
             throw new BusinessException(ExceptionResultEnum.ATTACHMENT_ERROR);
         }
         JSONObject jsonObject = JSONObject.parseObject(tbAttachment.getRemark());
-        String attachmentType = String.valueOf(jsonObject.get("type"));
+        String attachmentType = String.valueOf(jsonObject.get(SystemConstant.TYPE));
         String url = null;
-        String filePath = (String) jsonObject.get("path");
+        String filePath = (String) jsonObject.get(SystemConstant.PATH);
         if (Objects.equals(attachmentType, SystemConstant.LOCAL)) {
             url = "http://" + dictionaryConfig.sysDomain().getFileHost() + File.separator + filePath;
         } else {
@@ -149,9 +149,9 @@ public class SysController {
         }
         Map map = new HashMap();
         map.put(SystemConstant.ID, tbAttachment.getId());
-        map.put("name", tbAttachment.getName());
+        map.put(SystemConstant.NAME, tbAttachment.getName());
         map.put(SystemConstant.TYPE, tbAttachment.getType());
-        map.put("url", url);
+        map.put(SystemConstant.URL, url);
         return ResultUtil.ok(map);
     }
 
@@ -186,13 +186,13 @@ public class SysController {
                 jsonObject = JSONObject.parseObject(tbTaskHistory.getResultFilePath());
                 break;
         }
-        if (Objects.isNull(jsonObject) || Objects.isNull(jsonObject.get("path"))) {
+        if (Objects.isNull(jsonObject) || Objects.isNull(jsonObject.get(SystemConstant.PATH))) {
             throw new BusinessException("下载文件地址不存在");
         }
-        String filePath = (String) jsonObject.get("path");
+        String filePath = (String) jsonObject.get(SystemConstant.PATH);
         String url = null;
         if (oss) {
-            Integer uploadType = (Integer) jsonObject.get("uploadType");
+            Integer uploadType = (Integer) jsonObject.get(SystemConstant.UPLOAD_TYPE);
             if (uploadType == UploadFileEnum.file.ordinal()) {
                 url = ossUtil.getPrivateUrl(filePath);
             } else {
@@ -201,7 +201,7 @@ public class SysController {
         } else {
             url = "http://" + dictionaryConfig.sysDomain().getFileHost() + File.separator + filePath;
         }
-        return ResultUtil.ok(Collections.singletonMap("url", url));
+        return ResultUtil.ok(Collections.singletonMap(SystemConstant.URL, url));
     }
 
     @ApiOperation(value = "根据机构代码查询机构信息接口")
@@ -369,8 +369,8 @@ public class SysController {
                 teExamStudentList.forEach(s -> {
                     finalExamActivityIdSet.add(s.getExamActivityId());
                     Map map = new HashMap();
-                    map.put("courseCode", s.getCourseCode());
-                    map.put("courseName", s.getCourseName());
+                    map.put(SystemConstant.COURSE_CODE, s.getCourseCode());
+                    map.put(SystemConstant.COURSE_NAME, s.getCourseName());
                     finalCourseSet.add(map);
                 });
                 teExamActivityList = teExamActivityService.listByIds(examActivityIdSet);

+ 13 - 13
themis-admin/src/main/java/com/qmth/themis/admin/api/TBExamInvigilateUserController.java

@@ -88,14 +88,14 @@ public class TBExamInvigilateUserController {
             @ApiJsonProperty(key = "userIds", description = "用户id")}) @ApiParam(value = "监考员信息", required = true) @RequestBody Map<String, Object> mapParameter) {
         String roomCode = null;
         try {
-            if (Objects.isNull(mapParameter.get("examId")) || Objects.equals(mapParameter.get("examId"), "")) {
+            if (Objects.isNull(mapParameter.get(SystemConstant.EXAM_ID)) || Objects.equals(mapParameter.get(SystemConstant.EXAM_ID), "")) {
                 throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
             }
-            Long examId = Long.parseLong(String.valueOf(mapParameter.get("examId")));
-            if (Objects.isNull(mapParameter.get("roomCode")) || Objects.equals(mapParameter.get("roomCode"), "")) {
+            Long examId = Long.parseLong(String.valueOf(mapParameter.get(SystemConstant.EXAM_ID)));
+            if (Objects.isNull(mapParameter.get(SystemConstant.ROOM_CODE)) || Objects.equals(mapParameter.get(SystemConstant.ROOM_CODE), "")) {
                 throw new BusinessException(ExceptionResultEnum.ROOMCODE_IS_NULL);
             }
-            roomCode = String.valueOf(mapParameter.get("roomCode"));
+            roomCode = String.valueOf(mapParameter.get(SystemConstant.ROOM_CODE));
             if (Objects.isNull(mapParameter.get("userIds")) || Objects.equals(mapParameter.get("userIds"), "")) {
                 throw new BusinessException(ExceptionResultEnum.USER_ID_IS_NULL);
             }
@@ -179,10 +179,10 @@ public class TBExamInvigilateUserController {
                 taskHistoryService.save(tbTaskHistory);
                 transMap.put("tbTaskHistory", tbTaskHistory);
             }
-            transMap.put("examId", examId);
-            transMap.put("createId", tbUser.getId());
-            transMap.put("orgId", tbUser.getOrgId());
-            transMap.put("remark", tbAttachment.getRemark());
+            transMap.put(SystemConstant.EXAM_ID, examId);
+            transMap.put(SystemConstant.CREATE_ID, tbUser.getId());
+            transMap.put(SystemConstant.ORG_ID, tbUser.getOrgId());
+            transMap.put(SystemConstant.REMARK, tbAttachment.getRemark());
             //mq发送消息start
             MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.ROOM_CODE_IMPORT.name(), transMap,
                     MqTagEnum.ROOM_CODE_IMPORT, String.valueOf(tbTaskHistory.getId()), tbUser.getName());
@@ -221,11 +221,11 @@ public class TBExamInvigilateUserController {
                 tbTaskHistory.setExamId(examId);
                 taskHistoryService.save(tbTaskHistory);
                 transMap.put("tbTaskHistory", tbTaskHistory);
-                transMap.put("createId", tbUser.getId());
-                transMap.put("orgId", tbUser.getOrgId());
-                transMap.put("examId", examId);
-                transMap.put("roomCode", roomCode);
-                transMap.put("userId", userId);
+                transMap.put(SystemConstant.CREATE_ID, tbUser.getId());
+                transMap.put(SystemConstant.ORG_ID, tbUser.getOrgId());
+                transMap.put(SystemConstant.EXAM_ID, examId);
+                transMap.put(SystemConstant.ROOM_CODE, roomCode);
+                transMap.put(SystemConstant.USER_ID, userId);
                 //mq发送消息start
                 MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.ROOM_CODE_EXPORT.name(), transMap,
                         MqTagEnum.ROOM_CODE_EXPORT, String.valueOf(tbTaskHistory.getId()), tbUser.getName());

+ 2 - 2
themis-admin/src/main/java/com/qmth/themis/admin/api/TBOrgController.java

@@ -112,10 +112,10 @@ public class TBOrgController {
     public Result enableOrg(@ApiJsonObject(name = "enableOrg", value = {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "机构id"),
             @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "停用/启用")}) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> user) {
-        if (Objects.isNull(user.get("id")) || Objects.equals(user.get("id"), "")) {
+        if (Objects.isNull(user.get(SystemConstant.ID)) || Objects.equals(user.get(SystemConstant.ID), "")) {
             throw new BusinessException(ExceptionResultEnum.ORG_ID_IS_NULL);
         }
-        Long orgId = Long.parseLong(String.valueOf(user.get("id")));
+        Long orgId = Long.parseLong(String.valueOf(user.get(SystemConstant.ID)));
         if (Objects.isNull(user.get("enable")) || Objects.equals(user.get("enable"), "")) {
             throw new BusinessException(ExceptionResultEnum.ENABLE_IS_NULL);
         }

+ 9 - 9
themis-admin/src/main/java/com/qmth/themis/admin/api/TBUserController.java

@@ -220,7 +220,7 @@ public class TBUserController {
         map.put("roleCodes", authDto.getRoleCodes());
         if (Objects.nonNull(authDto.getTbOrg())) {
             Map orgMap = new HashMap();
-            orgMap.put("name", authDto.getTbOrg().getName());
+            orgMap.put(SystemConstant.NAME, authDto.getTbOrg().getName());
             orgMap.put("logo", authDto.getTbOrg().getLogo());
             orgMap.put("enableMonitorRecord", authDto.getTbOrg().getEnableMonitorRecord());
             map.put(SystemConstant.ORG_INFO, orgMap);
@@ -598,15 +598,15 @@ public class TBUserController {
         if (Objects.isNull(mapParameter)) {
             throw new BusinessException(ExceptionResultEnum.USER_INFO_IS_NULL);
         }
-        if (Objects.isNull(mapParameter.get("orgId"))) {
+        if (Objects.isNull(mapParameter.get(SystemConstant.ORG_ID))) {
             throw new BusinessException(ExceptionResultEnum.ORG_ID_IS_NULL);
         }
         boolean cacheClean = false;
         TBUser loginUser = (TBUser) ServletUtil.getRequestAccount();
         TBUser dbUser = null;
         AuthDto authDto = null;
-        if (Objects.nonNull(mapParameter.get("id"))) {
-            dbUser = cacheService.addAccountCache(Long.parseLong(String.valueOf(mapParameter.get("id"))));
+        if (Objects.nonNull(mapParameter.get(SystemConstant.ID))) {
+            dbUser = cacheService.addAccountCache(Long.parseLong(String.valueOf(mapParameter.get(SystemConstant.ID))));
             authDto = cacheService.addAccountAuthCache(dbUser.getId());
         }
         Gson gson = new Gson();
@@ -626,7 +626,7 @@ public class TBUserController {
                 || (Objects.nonNull(authDto) && !roleSet.equals(authDto.getRoleCodes()))) {
             cacheClean = true;
         }
-        Long orgId = Long.parseLong(String.valueOf(mapParameter.get("orgId")));
+        Long orgId = Long.parseLong(String.valueOf(mapParameter.get(SystemConstant.ORG_ID)));
         try {
             if (Objects.isNull(tbUser.getId())) {
                 tbUser.setId(uidUtil.getId());
@@ -718,10 +718,10 @@ public class TBUserController {
     public Result enableUser(@ApiJsonObject(name = "enableUser", value = {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "用户id"),
             @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "停用/启用")}) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> user) throws NoSuchAlgorithmException {
-        if (Objects.isNull(user.get("id")) || Objects.equals(user.get("id"), "")) {
+        if (Objects.isNull(user.get(SystemConstant.ID)) || Objects.equals(user.get(SystemConstant.ID), "")) {
             throw new BusinessException(ExceptionResultEnum.USER_ID_IS_NULL);
         }
-        Long userId = Long.parseLong(String.valueOf(user.get("id")));
+        Long userId = Long.parseLong(String.valueOf(user.get(SystemConstant.ID)));
         if (Objects.isNull(user.get("enable")) || Objects.equals(user.get("enable"), "")) {
             throw new BusinessException(ExceptionResultEnum.ENABLE_IS_NULL);
         }
@@ -759,10 +759,10 @@ public class TBUserController {
     public Result userUpdatePwd(@ApiJsonObject(name = "userUpdatePwd", value = {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "用户ID"),
             @ApiJsonProperty(key = "password", description = "新密码")}) @ApiParam(value = "用户信息", required = true) @RequestBody Map<String, Object> mapParameter) {
-        if (Objects.isNull(mapParameter.get("id")) || Objects.equals(mapParameter.get("id"), "")) {
+        if (Objects.isNull(mapParameter.get(SystemConstant.ID)) || Objects.equals(mapParameter.get(SystemConstant.ID), "")) {
             throw new BusinessException(ExceptionResultEnum.USER_ID_IS_NULL);
         }
-        Long id = Long.parseLong(String.valueOf(mapParameter.get("id")));
+        Long id = Long.parseLong(String.valueOf(mapParameter.get(SystemConstant.ID)));
         if (Objects.isNull(mapParameter.get("password")) || Objects.equals(mapParameter.get("password"), "")) {
             throw new BusinessException(ExceptionResultEnum.PASSWORD_IS_NULL);
         }

+ 6 - 6
themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamController.java

@@ -294,10 +294,10 @@ public class TEExamController {
     public Result examToggle(@ApiJsonObject(name = "examToggle", value = {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "考试批次ID"),
             @ApiJsonProperty(key = "enable", type = "int", example = "1", description = "是否启用")}) @ApiParam(value = "考试批次信息", required = true) @RequestBody Map<String, Object> mapParameter) {
-        if (Objects.isNull(mapParameter.get("id")) || Objects.equals(mapParameter.get("id"), "")) {
+        if (Objects.isNull(mapParameter.get(SystemConstant.ID)) || Objects.equals(mapParameter.get(SystemConstant.ID), "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
         }
-        Long examId = Long.parseLong(String.valueOf(mapParameter.get("id")));
+        Long examId = Long.parseLong(String.valueOf(mapParameter.get(SystemConstant.ID)));
         if (Objects.isNull(mapParameter.get("enable")) || Objects.equals(mapParameter.get("enable"), "")) {
             throw new BusinessException(ExceptionResultEnum.ENABLE_IS_NULL);
         }
@@ -345,10 +345,10 @@ public class TEExamController {
             throw new BusinessException(ExceptionResultEnum.EXAM_CODE_IS_NULL);
         }
         String code = String.valueOf(mapParameter.get("code"));
-        if (Objects.isNull(mapParameter.get("name")) || Objects.equals(mapParameter.get("name"), "")) {
+        if (Objects.isNull(mapParameter.get(SystemConstant.NAME)) || Objects.equals(mapParameter.get(SystemConstant.NAME), "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_NAME_IS_NULL);
         }
-        String name = String.valueOf(mapParameter.get("name"));
+        String name = String.valueOf(mapParameter.get(SystemConstant.NAME));
         ExamCacheBean examCacheBean = teExamService.getExamCacheBean(examId);
         if (Objects.isNull(examCacheBean)) {
             throw new BusinessException(ExceptionResultEnum.EXAM_NO);
@@ -566,8 +566,8 @@ public class TEExamController {
             tbTaskHistory.setEntityId(id);
             tbTaskHistory.setExamId(id);
             taskHistoryService.save(tbTaskHistory);
-            transMap.put("examId", id);
-            transMap.put("orgId", tbUser.getOrgId());
+            transMap.put(SystemConstant.EXAM_ID, id);
+            transMap.put(SystemConstant.ORG_ID, tbUser.getOrgId());
             transMap.put(SystemConstant.TASK_ID, tbTaskHistory.getId());
             //mq发送消息start
             MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.EXAM_SCORE_CALCULATE.name(), transMap,

+ 4 - 4
themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamPaperController.java

@@ -154,9 +154,9 @@ public class TEExamPaperController {
                 taskHistoryService.save(tbTaskHistory);
                 transMap.put("tbTaskHistory", tbTaskHistory);
             }
-            transMap.put("examId", examId);
-            transMap.put("createId", tbUser.getId());
-            transMap.put("orgId", tbUser.getOrgId());
+            transMap.put(SystemConstant.EXAM_ID, examId);
+            transMap.put(SystemConstant.CREATE_ID, tbUser.getId());
+            transMap.put(SystemConstant.ORG_ID, tbUser.getOrgId());
             //先查询考试相关信息
             ExamCacheBean examCacheBean = teExamService.getExamCacheBean(examId);
             if (Objects.isNull(examCacheBean)) {
@@ -168,7 +168,7 @@ public class TEExamPaperController {
             transMap.put("audioPlayCount", audioPlayCount);
             transMap.put("processPaper", processPaper);
             transMap.put("processAnswer", processAnswer);
-            transMap.put("remark", tbAttachment.getRemark());
+            transMap.put(SystemConstant.REMARK, tbAttachment.getRemark());
             //mq发送消息start
             MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.EXAM_PAPER_IMPORT.name(), transMap,
                     MqTagEnum.EXAM_PAPER_IMPORT, String.valueOf(tbTaskHistory.getId()), tbUser.getName());

+ 3 - 3
themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamReexamController.java

@@ -75,10 +75,10 @@ public class TEExamReexamController {
             @ApiJsonProperty(key = "reason", description = "重考原因", required = true),
             @ApiJsonProperty(key = "remark", description = "备注")
     }) @ApiParam(value = "重考信息", required = true) @RequestBody Map<String, Object> mapParameter) {
-        if (Objects.isNull(mapParameter.get("examStudentId")) || Objects.equals(mapParameter.get("examStudentId"), "")) {
+        if (Objects.isNull(mapParameter.get(SystemConstant.EXAM_STUDENT_ID)) || Objects.equals(mapParameter.get(SystemConstant.EXAM_STUDENT_ID), "")) {
             throw new BusinessException(ExceptionResultEnum.EXAM_STUDENT_ID_IS_NULL);
         }
-        List<String> examStudentIdList = (List<String>) mapParameter.get("examStudentId");
+        List<String> examStudentIdList = (List<String>) mapParameter.get(SystemConstant.EXAM_STUDENT_ID);
         if (Objects.isNull(mapParameter.get("model")) || Objects.equals(mapParameter.get("model"), "")) {
             throw new BusinessException("重考方式不能为空");
         }
@@ -103,7 +103,7 @@ public class TEExamReexamController {
                         }
                         reexamAuditing = examCacheBean.getReexamAuditing();
                         status = Objects.isNull(reexamAuditing) || reexamAuditing.intValue() == 0 ? 0 : 1;
-                        TEExamReexam teExamReexam = new TEExamReexam(teExamStudent.getExamId(), teExamStudent.getExamActivityId(), teExamStudent.getId(), model, reason, status, Objects.isNull(mapParameter.get("remark")) ? null : String.valueOf(mapParameter.get("remark")));
+                        TEExamReexam teExamReexam = new TEExamReexam(teExamStudent.getExamId(), teExamStudent.getExamActivityId(), teExamStudent.getId(), model, reason, status, Objects.isNull(mapParameter.get(SystemConstant.REMARK)) ? null : String.valueOf(mapParameter.get(SystemConstant.REMARK)));
                         teExamReexam.setCreateId(tbUser.getId());
                         if (Objects.nonNull(status) && status.intValue() == 1) {
                             //这里查询该机构下所有为管理员角色的账号

+ 24 - 24
themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamStudentController.java

@@ -109,18 +109,18 @@ public class TEExamStudentController {
         tbTaskHistory.setExamId(examId);
         taskHistoryService.save(tbTaskHistory);
         transMap.put("tbTaskHistory", tbTaskHistory);
-        transMap.put("orgId", tbUser.getOrgId());
-        transMap.put("examId", examId);
-        transMap.put("activityId", activityId);
+        transMap.put(SystemConstant.ORG_ID, tbUser.getOrgId());
+        transMap.put(SystemConstant.EXAM_ID, examId);
+        transMap.put(SystemConstant.ACTIVITY_ID, activityId);
         transMap.put("identity", identity);
-        transMap.put("name", name);
-        transMap.put("roomCode", roomCode);
-        transMap.put("courseCode", courseCode);
+        transMap.put(SystemConstant.NAME, name);
+        transMap.put(SystemConstant.ROOM_CODE, roomCode);
+        transMap.put(SystemConstant.COURSE_CODE, courseCode);
         transMap.put("grade", grade);
         transMap.put("enable", enable);
         transMap.put("classNo", classNo);
         transMap.put("hasPhoto", hasPhoto);
-        transMap.put("createId", tbUser.getId());
+        transMap.put(SystemConstant.CREATE_ID, tbUser.getId());
 
         //mq发送消息start
         MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.EXAM_STUDENT_EXPORT.name(), transMap,
@@ -177,7 +177,7 @@ public class TEExamStudentController {
         List<TEExamStudent> teExamStudentList = new ArrayList<>();
         for (int i = 0; i < mapParameter.size(); i++) {
             Map map = mapParameter.get(i);
-            TEExamStudent teExamStudent = teExamStudentService.getById(Long.parseLong(String.valueOf(map.get("id"))));
+            TEExamStudent teExamStudent = teExamStudentService.getById(Long.parseLong(String.valueOf(map.get(SystemConstant.ID))));
             if (Objects.isNull(teExamStudent)) {
                 throw new BusinessException(ExceptionResultEnum.EXAM_STUDENT_NO);
             }
@@ -305,8 +305,8 @@ public class TEExamStudentController {
                 taskHistoryService.save(tbTaskHistory);
                 transMap.put("tbTaskHistory", tbTaskHistory);
             }
-            transMap.put("examId", examId);
-            transMap.put("createId", tbUser.getId());
+            transMap.put(SystemConstant.EXAM_ID, examId);
+            transMap.put(SystemConstant.CREATE_ID, tbUser.getId());
 
             // 先查询考试相关信息
             ExamCacheBean examCacheBean = teExamService.getExamCacheBean(examId);
@@ -315,7 +315,7 @@ public class TEExamStudentController {
             }
             TEExam teExam = teExamService.cacheConvert(examCacheBean);
             transMap.put("mode", teExam.getMode());
-            transMap.put("orgId", teExam.getOrgId());
+            transMap.put(SystemConstant.ORG_ID, teExam.getOrgId());
             transMap.put("examCount", teExam.getExamCount());
 
             // 获取该批次下的所有考场,校验考场id是否存在
@@ -340,7 +340,7 @@ public class TEExamStudentController {
                         Collectors.toMap(TBExamInvigilateUser::getRoomCode, Function.identity(), (dto1, dto2) -> dto1));
                 transMap.put("tbExamInvigilateUserMap", tbExamInvigilateUserMap);
             }
-            transMap.put("remark", tbAttachment.getRemark());
+            transMap.put(SystemConstant.REMARK, tbAttachment.getRemark());
             // mq发送消息start
             MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.EXAM_STUDENT_IMPORT.name(), transMap,
                     MqTagEnum.EXAM_STUDENT_IMPORT, String.valueOf(tbTaskHistory.getId()), tbUser.getName());
@@ -422,13 +422,13 @@ public class TEExamStudentController {
             tbTaskHistory.setExamId(examId);
             taskHistoryService.save(tbTaskHistory);
             transMap.put("tbTaskHistory", tbTaskHistory);
-            transMap.put("createId", tbUser.getId());
-            transMap.put("orgId", tbUser.getOrgId());
-            transMap.put("examId", examId);
-            transMap.put("activityId", activityId);
+            transMap.put(SystemConstant.CREATE_ID, tbUser.getId());
+            transMap.put(SystemConstant.ORG_ID, tbUser.getOrgId());
+            transMap.put(SystemConstant.EXAM_ID, examId);
+            transMap.put(SystemConstant.ACTIVITY_ID, activityId);
             transMap.put("identity", identity);
-            transMap.put("name", name);
-            transMap.put("courseCode", courseCode);
+            transMap.put(SystemConstant.NAME, name);
+            transMap.put(SystemConstant.COURSE_CODE, courseCode);
             //mq发送消息start
             MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.MARK_RESULT_SIMPLE_EXPORT.name(),
                     transMap, MqTagEnum.MARK_RESULT_SIMPLE_EXPORT, String.valueOf(tbTaskHistory.getId()),
@@ -469,13 +469,13 @@ public class TEExamStudentController {
             tbTaskHistory.setExamId(examId);
             taskHistoryService.save(tbTaskHistory);
             transMap.put("tbTaskHistory", tbTaskHistory);
-            transMap.put("createId", tbUser.getId());
-            transMap.put("orgId", tbUser.getOrgId());
-            transMap.put("examId", examId);
-            transMap.put("activityId", activityId);
+            transMap.put(SystemConstant.CREATE_ID, tbUser.getId());
+            transMap.put(SystemConstant.ORG_ID, tbUser.getOrgId());
+            transMap.put(SystemConstant.EXAM_ID, examId);
+            transMap.put(SystemConstant.ACTIVITY_ID, activityId);
             transMap.put("identity", identity);
-            transMap.put("name", name);
-            transMap.put("courseCode", courseCode);
+            transMap.put(SystemConstant.NAME, name);
+            transMap.put(SystemConstant.COURSE_CODE, courseCode);
             //mq发送消息start
             MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.MARK_RESULT_STANDARD_EXPORT.name(),
                     transMap, MqTagEnum.MARK_RESULT_STANDARD_EXPORT, String.valueOf(tbTaskHistory.getId()),

+ 5 - 4
themis-admin/src/main/java/com/qmth/themis/admin/api/TEStudentController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.TEStudentDto;
 import com.qmth.themis.business.entity.TBUser;
 import com.qmth.themis.business.entity.TEStudent;
@@ -71,10 +72,10 @@ public class TEStudentController {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "学生ID"),
             @ApiJsonProperty(key = "enable", type = "long", example = "1", description = "是否启用")
     }) @ApiParam(value = "学生信息", required = true) @RequestBody Map<String, Object> mapParameter) {
-        if (Objects.isNull(mapParameter.get("id")) || Objects.equals(mapParameter.get("id"), "")) {
+        if (Objects.isNull(mapParameter.get(SystemConstant.ID)) || Objects.equals(mapParameter.get(SystemConstant.ID), "")) {
             throw new BusinessException(ExceptionResultEnum.STUDENT_ID_IS_NULL);
         }
-        Long id = Long.parseLong(String.valueOf(mapParameter.get("id")));
+        Long id = Long.parseLong(String.valueOf(mapParameter.get(SystemConstant.ID)));
         if (Objects.isNull(mapParameter.get("enable")) || Objects.equals(mapParameter.get("enable"), "")) {
             throw new BusinessException(ExceptionResultEnum.ENABLE_IS_NULL);
         }
@@ -99,10 +100,10 @@ public class TEStudentController {
             @ApiJsonProperty(key = "id", type = "long", example = "1", description = "用户ID"),
             @ApiJsonProperty(key = "password", description = "新密码")
     }) @ApiParam(value = "学生信息", required = true) @RequestBody Map<String, Object> mapParameter) {
-        if (Objects.isNull(mapParameter.get("id")) || Objects.equals(mapParameter.get("id"), "")) {
+        if (Objects.isNull(mapParameter.get(SystemConstant.ID)) || Objects.equals(mapParameter.get(SystemConstant.ID), "")) {
             throw new BusinessException(ExceptionResultEnum.STUDENT_ID_IS_NULL);
         }
-        Long id = Long.parseLong(String.valueOf(mapParameter.get("id")));
+        Long id = Long.parseLong(String.valueOf(mapParameter.get(SystemConstant.ID)));
         if (Objects.isNull(mapParameter.get("password")) || Objects.equals(mapParameter.get("password"), "")) {
             throw new BusinessException(ExceptionResultEnum.PASSWORD_IS_NULL);
         }

+ 18 - 18
themis-admin/src/main/java/com/qmth/themis/admin/api/TIeInvigilateController.java

@@ -346,15 +346,15 @@ public class TIeInvigilateController {
             @ApiJsonProperty(key = "examRecordId", type = "long", example = "1", 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(SystemConstant.EXAM_RECORD_ID)) || Objects.equals(mapParameter.get(SystemConstant.EXAM_RECORD_ID), "")) {
             throw new BusinessException(ExceptionResultEnum.RECORD_ID_IS_NULL);
         }
-        List<String> recordIdList = (List<String>) mapParameter.get("examRecordId");
-        if (Objects.isNull(mapParameter.get("type")) || Objects.equals(mapParameter.get("type"), "")) {
+        List<String> recordIdList = (List<String>) mapParameter.get(SystemConstant.EXAM_RECORD_ID);
+        if (Objects.isNull(mapParameter.get(SystemConstant.TYPE)) || Objects.equals(mapParameter.get(SystemConstant.TYPE), "")) {
             throw new BusinessException(ExceptionResultEnum.FINISH_TYPE_IS_NULL);
         }
         if (recordIdList.size() > 0) {
-            FinishTypeEnum type = FinishTypeEnum.valueOf(String.valueOf(mapParameter.get("type")));
+            FinishTypeEnum type = FinishTypeEnum.valueOf(String.valueOf(mapParameter.get(SystemConstant.TYPE)));
             TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
             //发送mq给客户端强制收卷start
             MqTagEnum mqTagEnum = null;
@@ -478,27 +478,27 @@ public class TIeInvigilateController {
             @ApiJsonProperty(key = "description", description = "描述", required = true),
             @ApiJsonProperty(key = "status", type = "int", example = "1", description = "新建/撤销", required = true)
     }) @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(SystemConstant.EXAM_RECORD_ID)) || Objects.equals(mapParameter.get(SystemConstant.EXAM_RECORD_ID), "")) {
             throw new BusinessException(ExceptionResultEnum.RECORD_ID_IS_NULL);
         }
-        List<String> recordIdList = (List<String>) mapParameter.get("examRecordId");
-        if (Objects.isNull(mapParameter.get("type")) || Objects.equals(mapParameter.get("type"), "")) {
+        List<String> recordIdList = (List<String>) mapParameter.get(SystemConstant.EXAM_RECORD_ID);
+        if (Objects.isNull(mapParameter.get(SystemConstant.TYPE)) || Objects.equals(mapParameter.get(SystemConstant.TYPE), "")) {
             throw new BusinessException(ExceptionResultEnum.BREACH_TYPE_IS_NULL);
         }
         if (Objects.isNull(mapParameter.get("description")) || Objects.equals(mapParameter.get("description"), "")) {
             throw new BusinessException(ExceptionResultEnum.BREACH_DESC_IS_NULL);
         }
         String description = String.valueOf(mapParameter.get("description"));
-        if (Objects.isNull(mapParameter.get("status")) || Objects.equals(mapParameter.get("status"), "")) {
+        if (Objects.isNull(mapParameter.get(SystemConstant.STATUS)) || Objects.equals(mapParameter.get(SystemConstant.STATUS), "")) {
             throw new BusinessException(ExceptionResultEnum.BREACH_STATUS_IS_NULL);
         }
         List<TOeExamRecord> tOeExamRecordList = new ArrayList<>();
         if (recordIdList.size() > 0) {
-            Integer status = Integer.parseInt(String.valueOf(mapParameter.get("status")));
+            Integer status = Integer.parseInt(String.valueOf(mapParameter.get(SystemConstant.STATUS)));
             TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
             List<TEExamBreachLog> teExamBreachLogList = new ArrayList<>();
             if (status == 0) {//新建违纪
-                BreachTypeEnum type = BreachTypeEnum.valueOf(String.valueOf(mapParameter.get("type")));
+                BreachTypeEnum type = BreachTypeEnum.valueOf(String.valueOf(mapParameter.get(SystemConstant.TYPE)));
                 List<TEExamBreachLog> finalTeExamBreachLogList = teExamBreachLogList;
                 for (int i = 0; i < recordIdList.size(); i++) {
                     Long l = Long.parseLong(String.valueOf(recordIdList.get(i)));
@@ -526,7 +526,7 @@ public class TIeInvigilateController {
                     }
                 }
             } else {//撤销违纪
-                BreachCancelTypeEnum type = BreachCancelTypeEnum.valueOf(String.valueOf(mapParameter.get("type")));
+                BreachCancelTypeEnum type = BreachCancelTypeEnum.valueOf(String.valueOf(mapParameter.get(SystemConstant.TYPE)));
                 QueryWrapper<TEExamBreachLog> teExamBreachLogQueryWrapper = new QueryWrapper<>();
                 teExamBreachLogQueryWrapper.lambda().in(TEExamBreachLog::getExamRecordId, recordIdList)
                         .eq(TEExamBreachLog::getStatus, 0);
@@ -552,10 +552,10 @@ public class TIeInvigilateController {
             }
             for (TEExamBreachLog eb : teExamBreachLogList) {
                 Map<String, Object> properties = new HashMap<>();
-                properties.put("type", eb.getDescription());
-                properties.put("remark", eb.getType());
-                properties.put("examStudentId", eb.getExamStudentId());
-                properties.put("examRecordId", eb.getExamRecordId());
+                properties.put(SystemConstant.TYPE, eb.getDescription());
+                properties.put(SystemConstant.REMARK, eb.getType());
+                properties.put(SystemConstant.EXAM_STUDENT_ID, eb.getExamStudentId());
+                properties.put(SystemConstant.EXAM_RECORD_ID, eb.getExamRecordId());
                 ExamStudentCacheBean examStudentCacheBean = teExamStudentService.getExamStudentCacheBean(eb.getExamStudentId());
                 MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.STUDENT.name(), eb.getStatus() == 0 ? SystemOperationEnum.BREACH_HANDLE : SystemOperationEnum.BREACH_REVOKE, MqTagEnum.STUDENT, String.valueOf(examStudentCacheBean.getStudentId()), properties, examStudentCacheBean.getIdentity());
                 mqDtoService.assembleSendOneWayMsg(mqDto);
@@ -573,11 +573,11 @@ public class TIeInvigilateController {
             @ApiJsonProperty(key = "type", description = "消息类型,text/audio", required = true),
             @ApiJsonProperty(key = "content", description = "消息内容", required = true)
     }) @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(SystemConstant.EXAM_RECORD_ID)) || Objects.equals(mapParameter.get(SystemConstant.EXAM_RECORD_ID), "")) {
             throw new BusinessException(ExceptionResultEnum.RECORD_ID_IS_NULL);
         }
-        Long recordId = Long.parseLong(String.valueOf(mapParameter.get("examRecordId")));
-        if (Objects.isNull(mapParameter.get("type")) || Objects.equals(mapParameter.get("type"), "")) {
+        Long recordId = Long.parseLong(String.valueOf(mapParameter.get(SystemConstant.EXAM_RECORD_ID)));
+        if (Objects.isNull(mapParameter.get(SystemConstant.TYPE)) || Objects.equals(mapParameter.get(SystemConstant.TYPE), "")) {
             throw new BusinessException(ExceptionResultEnum.MESSAGE_TYPE_IS_NULL);
         }
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();

+ 4 - 3
themis-business/src/main/java/com/qmth/themis/business/config/MetaHandler.java

@@ -1,6 +1,7 @@
 package com.qmth.themis.business.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.qmth.themis.business.constant.SystemConstant;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
 
@@ -16,12 +17,12 @@ public class MetaHandler implements MetaObjectHandler {
 
     @Override
     public void insertFill(MetaObject metaObject) {
-        this.setFieldValByName("createTime", System.currentTimeMillis(), metaObject);
-        this.setFieldValByName("updateTime", System.currentTimeMillis(), metaObject);
+        this.setFieldValByName(SystemConstant.CREATE_TIME, System.currentTimeMillis(), metaObject);
+        this.setFieldValByName(SystemConstant.UPDATE_TIME, System.currentTimeMillis(), metaObject);
     }
 
     @Override
     public void updateFill(MetaObject metaObject) {
-        this.setFieldValByName("updateTime", System.currentTimeMillis(), metaObject);
+        this.setFieldValByName(SystemConstant.UPDATE_TIME, System.currentTimeMillis(), metaObject);
     }
 }

+ 32 - 12
themis-business/src/main/java/com/qmth/themis/business/constant/SystemConstant.java

@@ -89,6 +89,34 @@ public class SystemConstant {
     /**
      * 系统相关
      */
+    public static final String STATUS = "status";
+
+    public static final String EXAM_ID = "examId";
+
+    public static final String ORG_ID = "orgId";
+
+    public static final String REMARK = "remark";
+
+    public static final String USER_ID = "userId";
+
+    public static final String CREATE_ID = "createId";
+
+    public static final String EXAM_RECORD_ID = "examRecordId";
+
+    public static final String EXAM_STUDENT_ID = "examStudentId";
+
+    public static final String COURSE_CODE = "courseCode";
+
+    public static final String COURSE_NAME = "courseName";
+
+    public static final String ROOM_CODE = "roomCode";
+
+    public static final String ACTIVITY_ID = "activityId";
+
+    public static final String CREATE_TIME = "createTime";
+
+    public static final String UPDATE_TIME = "updateTime";
+
     public static final String WEB_SOCKET_OE_SERVER = "webSocketOeServer";
 
     public static final String WEBSOCKET_CLOSE = "服务器端关闭";
@@ -111,16 +139,12 @@ public class SystemConstant {
 
     public static final String BREACH_STATUS = "breachStatus";
 
-    public static final String USER = "user:";
-
     public static final String STUDENT = "student:";
 
     public static final String SESSION = "session:";
 
     public static final String ORG = "org:cache:";
 
-    public static final String ROLE = "role:cache";
-
     public static final String LINK = "LINK";
 
     public static final String SYSADMIN = "系统管理员";
@@ -199,8 +223,6 @@ public class SystemConstant {
 
     public static final String MONITOR_CALL_STATUS_ = "monitorCallStatus_";
 
-    public final static String REDIS_MONITOR_SEQUENCE = "redis:seq:monitor";
-
     public final static String REDIS_ACTIVITY_CODE_SEQUENCE = "redis:seq:activity:code:";
 
     public static final String VERSION = "version";
@@ -217,8 +239,6 @@ public class SystemConstant {
     public static final int MOBILE_SESSION_EXPIRE = 30;//过期时间30天
 
     //二维码过期时间(秒)
-//        private final static int qrExpireTime = 120;
-//    public final static Long QR_EXPIRE_TIME = 86400L;
 //    public final static Long QR_EXPIRE_TIME = 30L;
 
     /**
@@ -428,8 +448,8 @@ public class SystemConstant {
     //     * @return
     //     */
     //    public static Map timeTransform(Map map) {
-    //        if (Objects.nonNull(map) && Objects.nonNull(map.get("createTime")) && map.get("createTime") instanceof Long) {
-    //            map.put("createTime", new Date((Long) map.get("createTime")));
+    //        if (Objects.nonNull(map) && Objects.nonNull(map.get(SystemConstant.CREATE_TIME)) && map.get(SystemConstant.CREATE_TIME) instanceof Long) {
+    //            map.put(SystemConstant.CREATE_TIME, new Date((Long) map.get(SystemConstant.CREATE_TIME)));
     //        }
     //        if (Objects.nonNull(map) && Objects.nonNull(map.get("startTime")) && map.get("startTime") instanceof Long) {
     //            map.put("startTime", new Date((Long) map.get("startTime")));
@@ -437,8 +457,8 @@ public class SystemConstant {
     //        if (Objects.nonNull(map) && Objects.nonNull(map.get("finishTime")) && map.get("finishTime") instanceof Long) {
     //            map.put("finishTime", new Date((Long) map.get("finishTime")));
     //        }
-    //        if (Objects.nonNull(map) && Objects.nonNull(map.get("updateTime")) && map.get("updateTime") instanceof Long) {
-    //            map.put("updateTime", new Date((Long) map.get("updateTime")));
+    //        if (Objects.nonNull(map) && Objects.nonNull(map.get(SystemConstant.UPDATE_TIME)) && map.get(SystemConstant.UPDATE_TIME) instanceof Long) {
+    //            map.put(SystemConstant.UPDATE_TIME, new Date((Long) map.get(SystemConstant.UPDATE_TIME)));
     //        }
     //        return map;
     //    }

+ 3 - 3
themis-business/src/main/java/com/qmth/themis/business/service/impl/TBAttachmentServiceImpl.java

@@ -281,9 +281,9 @@ public class TBAttachmentServiceImpl extends ServiceImpl<TBAttachmentMapper, TBA
         if (Objects.nonNull(map)) {
             paths = new ArrayList<>();
             for (Map m : list) {
-                JSONObject jsonObject = JSONObject.parseObject((String) m.get("remark"));
-                type = (String) jsonObject.get("type");
-                paths.add((String) jsonObject.get("path"));
+                JSONObject jsonObject = JSONObject.parseObject((String) m.get(SystemConstant.REMARK));
+                type = (String) jsonObject.get(SystemConstant.TYPE);
+                paths.add((String) jsonObject.get(SystemConstant.PATH));
             }
         }
         if (Objects.nonNull(type) && Objects.equals(type, SystemConstant.OSS)) {//删除阿里云附件

+ 5 - 4
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamBreachLogServiceImpl.java

@@ -3,6 +3,7 @@ package com.qmth.themis.business.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.themis.business.cache.ExamRecordCacheUtil;
+import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dao.TEExamBreachLogMapper;
 import com.qmth.themis.business.entity.TBUser;
 import com.qmth.themis.business.entity.TEExamBreachLog;
@@ -42,12 +43,12 @@ public class TEExamBreachLogServiceImpl extends ServiceImpl<TEExamBreachLogMappe
     @Override
     @Transactional
     public void breachOper(Map<String, Object> mapParameter) {
-        Integer status = Integer.parseInt(String.valueOf(mapParameter.get("status")));
+        Integer status = Integer.parseInt(String.valueOf(mapParameter.get(SystemConstant.STATUS)));
         TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
-        List<String> recordIdList = (List<String>) mapParameter.get("examRecordId");
+        List<String> recordIdList = (List<String>) mapParameter.get(SystemConstant.EXAM_RECORD_ID);
         List<TEExamBreachLog> teExamBreachLogList = new ArrayList<>();
         if (status == 0) {//新建违纪
-            BreachTypeEnum type = BreachTypeEnum.valueOf(String.valueOf(mapParameter.get("type")));
+            BreachTypeEnum type = BreachTypeEnum.valueOf(String.valueOf(mapParameter.get(SystemConstant.TYPE)));
             List<TEExamBreachLog> finalTeExamBreachLogList = teExamBreachLogList;
             for (int i = 0; i < recordIdList.size(); i++) {
                 Long l = Long.parseLong(String.valueOf(recordIdList.get(i)));
@@ -71,7 +72,7 @@ public class TEExamBreachLogServiceImpl extends ServiceImpl<TEExamBreachLogMappe
                 tOeExamRecordService.sendExamRecordDataSaveMq(l, System.currentTimeMillis());
             }
         } else {//撤销违纪
-            BreachCancelTypeEnum type = BreachCancelTypeEnum.valueOf(String.valueOf(mapParameter.get("type")));
+            BreachCancelTypeEnum type = BreachCancelTypeEnum.valueOf(String.valueOf(mapParameter.get(SystemConstant.TYPE)));
             QueryWrapper<TEExamBreachLog> teExamBreachLogQueryWrapper = new QueryWrapper<>();
             teExamBreachLogQueryWrapper.lambda().in(TEExamBreachLog::getExamRecordId, recordIdList)
                     .eq(TEExamBreachLog::getStatus, 0);

+ 6 - 6
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamServiceImpl.java

@@ -348,7 +348,7 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
 
     private void updateExamStudent(Long examStudentId, Integer alreadyExamCount, Long currentRecordId) {
         Map<String, Object> transMap = new HashMap<String, Object>();
-        transMap.put("examStudentId", examStudentId);
+        transMap.put(SystemConstant.EXAM_STUDENT_ID, examStudentId);
         transMap.put("alreadyExamCount", alreadyExamCount);
         transMap.put("currentRecordId", currentRecordId);
         MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.EXAM_STUDNET_UPDATE.name(), transMap,
@@ -1387,9 +1387,9 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
                                  MqDto mqDto) {
         //mq发送消息start
         Map<String, Object> properties = new HashMap<>();
-        properties.put("remark", systemOperationEnum.getCode());
-        properties.put("examStudentId", examStudentId);
-        properties.put("examRecordId", recordId);
+        properties.put(SystemConstant.REMARK, systemOperationEnum.getCode());
+        properties.put(SystemConstant.EXAM_STUDENT_ID, examStudentId);
+        properties.put(SystemConstant.EXAM_RECORD_ID, recordId);
         mqDto.setProperties(properties);
         mqDtoService.assembleSendOneWayMsg(mqDto);
         //mq发送消息end
@@ -1505,8 +1505,8 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
             task.setFinishTime(System.currentTimeMillis());
             JSONObject json = new JSONObject();
             String reportFilePath = sdf.format(new Date()) + "/" + uuid() + SystemConstant.TXT_PREFIX;
-            json.put("path", reportFilePath);
-            json.put("type", SystemConstant.OSS);
+            json.put(SystemConstant.PATH, reportFilePath);
+            json.put(SystemConstant.TYPE, SystemConstant.OSS);
             ossUtil.upload(false, reportFilePath, e.getMessage());
             task.setReportFilePath(json.toJSONString());
         } finally {

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamStudentServiceImpl.java

@@ -3,6 +3,7 @@ package com.qmth.themis.business.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.themis.business.cache.bean.ExamStudentCacheBean;
+import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dao.TEExamStudentMapper;
 import com.qmth.themis.business.dto.MarkResultSimpleExportDto;
 import com.qmth.themis.business.dto.response.MarkResultDto;
@@ -141,7 +142,7 @@ public class TEExamStudentServiceImpl extends ServiceImpl<TEExamStudentMapper, T
     @Transactional
     @Override
     public void updateByMqMsg(Map<String, Object> param) {
-        Long examStudentId = (Long) param.get("examStudentId");
+        Long examStudentId = (Long) param.get(SystemConstant.EXAM_STUDENT_ID);
         Integer alreadyExamCount = (Integer) param.get("alreadyExamCount");
         Long currentRecordId = (Long) param.get("currentRecordId");
         if (alreadyExamCount != null) {

+ 7 - 6
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEOpenServiceImpl.java

@@ -11,6 +11,7 @@ import com.qmth.themis.business.bean.admin.*;
 import com.qmth.themis.business.cache.RedisKeyHelper;
 import com.qmth.themis.business.cache.bean.ExamCacheBean;
 import com.qmth.themis.business.cache.bean.ExamPaperCacheBean;
+import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.response.TEExamStudentDto;
 import com.qmth.themis.business.entity.TEExam;
 import com.qmth.themis.business.enums.InvigilateMonitorStatusEnum;
@@ -95,9 +96,9 @@ public class TEOpenServiceImpl implements TEOpenService {
         //解析试卷JSON文件
         JSONObject paperResult = JSONObject
                 .parseObject(new String(ossUtil.download(false, paper.getPaperViewPath()), StandardCharsets.UTF_8));
-        paperResult.put("id", paper.getId());
+        paperResult.put(SystemConstant.ID, paper.getId());
         paperResult.put("code", paper.getCode());
-        paperResult.put("name", paper.getName());
+        paperResult.put(SystemConstant.NAME, paper.getName());
         JSONArray detailCollection = new JSONArray();
         JSONArray paperDetails = paperResult.getJSONArray("details");
         for (int i = 0; i < paperDetails.size(); i++) {
@@ -216,12 +217,12 @@ public class TEOpenServiceImpl implements TEOpenService {
         if (examStudents != null) {
             for (TEExamStudentDto examStudent : examStudents) {
                 JSONObject obj = new JSONObject();
-                obj.put("id", examStudent.getId());
+                obj.put(SystemConstant.ID, examStudent.getId());
                 obj.put("identity", examStudent.getIdentity());
-                obj.put("name", examStudent.getName());
+                obj.put(SystemConstant.NAME, examStudent.getName());
                 obj.put("activityCode", examStudent.getActivityCode());
-                obj.put("courseCode", examStudent.getCourseCode());
-                obj.put("courseName", examStudent.getCourseName());
+                obj.put(SystemConstant.COURSE_CODE, examStudent.getCourseCode());
+                obj.put(SystemConstant.COURSE_NAME, examStudent.getCourseName());
                 //查询需要主观题评卷的考试记录
                 List<OpenRecordNeedMarkBean> recordList = findExamRecordNeedMark(examStudent.getId(), paperMap,
                         exam.getRecordSelectStrategy());

+ 8 - 7
themis-business/src/main/java/com/qmth/themis/business/service/impl/TIeReportServiceImpl.java

@@ -8,6 +8,7 @@ import com.qmth.themis.business.bean.admin.*;
 import com.qmth.themis.business.cache.bean.ExamActivityCacheBean;
 import com.qmth.themis.business.cache.bean.ExamCacheBean;
 import com.qmth.themis.business.cache.bean.ExamStudentCacheBean;
+import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dao.*;
 import com.qmth.themis.business.entity.TBUser;
 import com.qmth.themis.business.entity.TEExam;
@@ -76,7 +77,7 @@ public class TIeReportServiceImpl implements TIeReportService {
         List<Map<String, Object>> total = examStudentMapper.getTotalCount(orgId, examId, examActivityId, roomCode, courseCode);
         Map<Long, Long> totalMap = new HashMap<Long, Long>();
         for (Map<String, Object> map : total) {
-            Long acId = (Long) map.get("activityId");
+            Long acId = (Long) map.get(SystemConstant.ACTIVITY_ID);
             Long count = (Long) map.get("cc");
             totalMap.put(acId, count);
             totalNum = totalNum + count;
@@ -87,7 +88,7 @@ public class TIeReportServiceImpl implements TIeReportService {
                 courseCode);
         Map<Long, Long> doneMap = new HashMap<Long, Long>();
         for (Map<String, Object> map : doneCount) {
-            Long acId = (Long) map.get("activityId");
+            Long acId = (Long) map.get(SystemConstant.ACTIVITY_ID);
             if (acId != null) {
                 Long count = (Long) map.get("cc");
                 doneMap.put(acId, count);
@@ -154,8 +155,8 @@ public class TIeReportServiceImpl implements TIeReportService {
         List<Map<String, Object>> doneCountByDay = examStudentMapper.getDoneCountByActivityIds(examId, activityIds);
         Map<String, Long> doneMap = new HashMap<String, Long>();
         for (Map<String, Object> map : doneCountByDay) {
-            Long acId = (Long) map.get("activityId");
-            String roomcode = (String) map.get("roomCode");
+            Long acId = (Long) map.get(SystemConstant.ACTIVITY_ID);
+            String roomcode = (String) map.get(SystemConstant.ROOM_CODE);
             Long count = (Long) map.get("cc");
             doneMap.put(acId + "-" + roomcode, count);
         }
@@ -175,8 +176,8 @@ public class TIeReportServiceImpl implements TIeReportService {
             List<Map<String, Object>> absentCountByDay = examStudentMapper.getAbsentCountByActivityIds(examId,
                     absentActivityIds);
             for (Map<String, Object> map : absentCountByDay) {
-                Long acId = (Long) map.get("activityId");
-                String roomcode = (String) map.get("roomCode");
+                Long acId = (Long) map.get(SystemConstant.ACTIVITY_ID);
+                String roomcode = (String) map.get(SystemConstant.ROOM_CODE);
                 Long count = (Long) map.get("cc");
                 absentMap.put(acId + "-" + roomcode, count);
             }
@@ -561,7 +562,7 @@ public class TIeReportServiceImpl implements TIeReportService {
                     for (Map<String, String> map : users) {
                         if (map != null) {
                             String lname = map.get("loginName");
-                            String name = map.get("name");
+                            String name = map.get(SystemConstant.NAME);
                             if (StringUtils.isNotBlank(lname) && StringUtils.isNotBlank(name)) {
                                 usersb.append(lname).append("(账号:").append(name).append(") ");
                             }

+ 7 - 7
themis-business/src/main/java/com/qmth/themis/business/service/impl/TOeExamRecordServiceImpl.java

@@ -110,9 +110,9 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
         if (Objects.nonNull(teExamUnFinishDto)) {
             Map finalMap = new HashMap();
             Map<String, Object> waitingMap = new HashMap();
-            waitingMap.put("id", teExamUnFinishDto.getId());
+            waitingMap.put(SystemConstant.ID, teExamUnFinishDto.getId());
             waitingMap.put("examActivityId", teExamUnFinishDto.getExamActivityId());
-            waitingMap.put("name", teExamUnFinishDto.getName());
+            waitingMap.put(SystemConstant.NAME, teExamUnFinishDto.getName());
             waitingMap.put("mode", teExamUnFinishDto.getMode());
             waitingMap.put("preNotice", teExamUnFinishDto.getPreNotice());
             waitingMap.put("preNoticeStaySeconds", teExamUnFinishDto.getPreNoticeStaySeconds());
@@ -123,13 +123,13 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
             activityMap.put(SystemConstant.RECORD_ID, teExamUnFinishDto.getRecordId());
             activityMap.put("minDurationSeconds", teExamUnFinishDto.getMinDurationSeconds());
             activityMap.put("cameraPhotoUpload", teExamUnFinishDto.getCameraPhotoUpload());
-            activityMap.put("courseCode", teExamUnFinishDto.getCourseCode());
-            activityMap.put("examStudentId", teExamUnFinishDto.getExamStudentId());
+            activityMap.put(SystemConstant.COURSE_CODE, teExamUnFinishDto.getCourseCode());
+            activityMap.put(SystemConstant.EXAM_STUDENT_ID, teExamUnFinishDto.getExamStudentId());
             activityMap.put("inProcessLivenessVerify", teExamUnFinishDto.getInProcessLivenessVerify());
             activityMap.put("inProcessRealnessVerify", teExamUnFinishDto.getInProcessRealnessVerify());
             activityMap.put("inProcessFaceStrangerIgnore", teExamUnFinishDto.getInProcessFaceStrangerIgnore());
             activityMap.put("inProcessFaceVerify", teExamUnFinishDto.getInProcessFaceVerify());
-            activityMap.put("courseName", teExamUnFinishDto.getCourseName());
+            activityMap.put(SystemConstant.COURSE_NAME, teExamUnFinishDto.getCourseName());
             activityMap.put("inProcessLivenessFixedRange", teExamUnFinishDto.getInProcessLivenessFixedRange());
             activityMap.put("prepareSeconds", teExamUnFinishDto.getPrepareSeconds());
             activityMap.put("fouceFinish", teExamUnFinishDto.getFouceFinish());
@@ -137,7 +137,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
             activityMap.put("maxDurationSeconds", teExamUnFinishDto.getMaxDurationSeconds());
             activityMap.put("examCount", teExamUnFinishDto.getExamCount());
             activityMap.put("inProcessLivenessJudgePolicy", teExamUnFinishDto.getInProcessLivenessJudgePolicy());
-            activityMap.put("id", teExamUnFinishDto.getExamActivityId());
+            activityMap.put(SystemConstant.ID, teExamUnFinishDto.getExamActivityId());
 
             finalMap.put("activity", activityMap);
             return finalMap;
@@ -190,7 +190,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
         }
         Map<String, Object> map = SimpleBeanUtil.objectToMap(er);
         ExamStatusBean examStatusBean = new ExamStatusBean(ExamRecordStatusEnum.FIRST_PREPARE, System.currentTimeMillis());
-        map.put("status", examStatusBean);
+        map.put(SystemConstant.STATUS, examStatusBean);
         redisUtil.setForHash(RedisKeyHelper.examRecordCacheKey(er.getId()), map);
         sendExamRecordDataSaveMq(er.getId(), System.currentTimeMillis());
         return er.getId();

+ 2 - 1
themis-business/src/main/java/com/qmth/themis/business/service/impl/WarningServiceImpl.java

@@ -3,6 +3,7 @@ package com.qmth.themis.business.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.qmth.themis.business.cache.ExamRecordCacheUtil;
 import com.qmth.themis.business.cache.bean.ExamStudentCacheBean;
+import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.WarningDto;
 import com.qmth.themis.business.entity.TEConfig;
 import com.qmth.themis.business.entity.TEExamStudentLog;
@@ -253,7 +254,7 @@ public class WarningServiceImpl implements WarningService {
         }
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("PHOTOS", photoUrls);
-        jsonObject.put("MIN_CREATE_TIME", map.get("createTime"));
+        jsonObject.put("MIN_CREATE_TIME", map.get(SystemConstant.CREATE_TIME));
         TEExamStudentLog teExamStudentLog = new TEExamStudentLog(tIeInvigilateWarnInfo.getType().name(), WarningLevelEnum.valueOf(tIeInvigilateWarnInfo.getLevel()).getTitle(), jsonObject.toJSONString(), examStudentCacheBean.getStudentId(), examStudentCacheBean.getId(), recordId, WarningLevelEnum.valueOf(tIeInvigilateWarnInfo.getLevel()).getSecondTitle());
         teExamStudentLogService.saveOrUpdate(teExamStudentLog);
     }

+ 8 - 8
themis-business/src/main/java/com/qmth/themis/business/templete/TaskExportCommon.java

@@ -69,13 +69,13 @@ public class TaskExportCommon {
     public void init() {
         OssUtil ossUtil = SpringContextHolder.getBean(OssUtil.class);
         Gson gson = new Gson();
-        if (Objects.nonNull(this.map.get("orgId"))) {
-            this.orgId = Long.parseLong(String.valueOf(this.map.get("orgId")));
+        if (Objects.nonNull(this.map.get(SystemConstant.ORG_ID))) {
+            this.orgId = Long.parseLong(String.valueOf(this.map.get(SystemConstant.ORG_ID)));
         }
-        this.createId = Long.parseLong(String.valueOf(this.map.get("createId")));
+        this.createId = Long.parseLong(String.valueOf(this.map.get(SystemConstant.CREATE_ID)));
         this.ossUtil = SpringContextHolder.getBean(OssUtil.class);
         this.ossEnv = ossUtil.getAliYunOssPrivateDomain().getMap();
-        this.type = (boolean) this.ossEnv.get("oss") ? SystemConstant.OSS : SystemConstant.LOCAL;
+        this.type = (boolean) this.ossEnv.get(SystemConstant.OSS) ? SystemConstant.OSS : SystemConstant.LOCAL;
         Map tbTaskHistoryMap = (Map) this.map.get("tbTaskHistory");
         this.tbTaskHistory = gson.fromJson(gson.toJson(tbTaskHistoryMap), TBTaskHistory.class);
         this.tbTaskHistoryService = SpringContextHolder.getBean(TBTaskHistoryService.class);
@@ -157,14 +157,14 @@ public class TaskExportCommon {
                         .add(SystemConstant.TXT_PREFIX).toString();
                 this.ossUtil.upload(false, stringJoiner.toString(), inputStream, null);
             }
-            json.put("path", stringJoiner.toString());
-            json.put("type", this.type);
+            json.put(SystemConstant.PATH, stringJoiner.toString());
+            json.put(SystemConstant.TYPE, this.type);
             json.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.file.ordinal());
             this.tbTaskHistory.setReportFilePath(json.toJSONString());
             if (Objects.nonNull(excelFilePath)) {
                 JSONObject excelJson = new JSONObject();
-                excelJson.put("path", excelFilePath);
-                excelJson.put("type", this.type);
+                excelJson.put(SystemConstant.PATH, excelFilePath);
+                excelJson.put(SystemConstant.TYPE, this.type);
                 excelJson.put(SystemConstant.UPLOAD_TYPE, UploadFileEnum.file.ordinal());
                 this.tbTaskHistory.setResultFilePath(excelJson.toJSONString());
             }

+ 11 - 11
themis-business/src/main/java/com/qmth/themis/business/templete/TaskImportCommon.java

@@ -73,17 +73,17 @@ public class TaskImportCommon {
         if (Objects.nonNull(this.map.get("mode"))) {
             this.mode = String.valueOf(this.map.get("mode"));
         }
-        if (Objects.nonNull(this.map.get("orgId"))) {
-            this.orgId = Long.parseLong(String.valueOf(this.map.get("orgId")));
+        if (Objects.nonNull(this.map.get(SystemConstant.ORG_ID))) {
+            this.orgId = Long.parseLong(String.valueOf(this.map.get(SystemConstant.ORG_ID)));
         }
-        this.createId = Long.parseLong(String.valueOf(this.map.get("createId")));
-        if (Objects.nonNull(this.map.get("examId"))) {
-            this.examId = Long.parseLong(String.valueOf(this.map.get("examId")));
+        this.createId = Long.parseLong(String.valueOf(this.map.get(SystemConstant.CREATE_ID)));
+        if (Objects.nonNull(this.map.get(SystemConstant.EXAM_ID))) {
+            this.examId = Long.parseLong(String.valueOf(this.map.get(SystemConstant.EXAM_ID)));
         }
-        JSONObject remarkJs = JSONObject.parseObject(String.valueOf(this.map.get("remark")));
-        this.type = String.valueOf(remarkJs.get("type"));
-        this.path = String.valueOf(remarkJs.get("path"));
-        this.uploadType = Integer.parseInt(String.valueOf(remarkJs.get("uploadType")));
+        JSONObject remarkJs = JSONObject.parseObject(String.valueOf(this.map.get(SystemConstant.REMARK)));
+        this.type = String.valueOf(remarkJs.get(SystemConstant.TYPE));
+        this.path = String.valueOf(remarkJs.get(SystemConstant.PATH));
+        this.uploadType = Integer.parseInt(String.valueOf(remarkJs.get(SystemConstant.UPLOAD_TYPE)));
         this.ossUtil = SpringContextHolder.getBean(OssUtil.class);
         this.ossEnv = ossUtil.getAliYunOssPrivateDomain().getMap();
         Map tbTaskHistoryMap = (Map) this.map.get("tbTaskHistory");
@@ -151,8 +151,8 @@ public class TaskImportCommon {
                 this.ossUtil.upload(false, stringJoiner.toString(), inputStream, null);
             }
             JSONObject json = new JSONObject();
-            json.put("path", stringJoiner.toString());
-            json.put("type", this.type);
+            json.put(SystemConstant.PATH, stringJoiner.toString());
+            json.put(SystemConstant.TYPE, this.type);
             json.put(SystemConstant.UPLOAD_TYPE, this.uploadType);
             this.tbTaskHistory.setReportFilePath(json.toJSONString());
             tbTaskHistoryService.updateById(this.tbTaskHistory);

+ 4 - 4
themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamPaperImportTemplete.java

@@ -111,7 +111,7 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
     @Transactional
     public void dispose(File file, Map<String, Object> map, StringBuilder result) throws IOException {
 
-        Long examId = (Long) map.get("examId");
+        Long examId = (Long) map.get(SystemConstant.EXAM_ID);
         ExamCacheBean examCacheBean = teExamService.getExamCacheBean(examId);
         if (Objects.isNull(examCacheBean)) {
             throw new BusinessException(ExceptionResultEnum.EXAM_NO);
@@ -258,10 +258,10 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
                 .findByExamIdAndCourseCodeAndPaperCode(teExam.getId(), course.getCourseCode(), paperCode);
         if (paper == null) {
             paper = new TEExamPaper();
-            String createId = map.get("createId").toString();
+            String createId = map.get(SystemConstant.CREATE_ID).toString();
             JSONObject paperJson = JSONObject.parseObject(FileUtil.readFileContent(paperFile));
             paper.setId(uidUtil.getId());
-            paper.setName(paperJson.getString("name"));
+            paper.setName(paperJson.getString(SystemConstant.NAME));
             paper.setTotalScore(paperJson.getDouble("totalScore"));
             paper.setDecryptSecret(RandomStringUtils.randomAlphanumeric(16));
             paper.setEncryptMode(EncryptModeEnum.AUTO);
@@ -542,7 +542,7 @@ public class TaskExamPaperImportTemplete implements TaskImportTemplete {
 
     private void uploadImageAndAudio(String rootDir, JSONObject blockInfo, Long paperId, File attachmentDir)
             throws IOException {
-        String type = blockInfo.getString("type");
+        String type = blockInfo.getString(SystemConstant.TYPE);
         String value = blockInfo.getString("value");
         if (("image".equals(type) || "audio".equals(type)) && StringUtils.isNotBlank(value) && !value.toLowerCase()
                 .startsWith("https://") && !value.toLowerCase().startsWith("http://")) {

+ 5 - 5
themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamStudentExportTemplete.java

@@ -68,12 +68,12 @@ public class TaskExamStudentExportTemplete implements TaskExportTemplete {
             }
             stringJoiner.add(sdf.format(new Date()));
             fos = new ByteArrayOutputStream();
-            Long examId = (Long) transMap.get("examId");
-            Long activityId = (Long) transMap.get("activityId");
+            Long examId = (Long) transMap.get(SystemConstant.EXAM_ID);
+            Long activityId = (Long) transMap.get(SystemConstant.ACTIVITY_ID);
             String identity = (String) transMap.get("identity");
-            String name = (String) transMap.get("name");
-            String roomCode = (String) transMap.get("roomCode");
-            String courseCode = (String) transMap.get("courseCode");
+            String name = (String) transMap.get(SystemConstant.NAME);
+            String roomCode = (String) transMap.get(SystemConstant.ROOM_CODE);
+            String courseCode = (String) transMap.get(SystemConstant.COURSE_CODE);
             String grade = (String) transMap.get("grade");
             Integer enable = (Integer) transMap.get("enable");
             String classNo = (String) transMap.get("classNo");

+ 4 - 4
themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskMarkResultSimpleExportTemplete.java

@@ -75,11 +75,11 @@ public class TaskMarkResultSimpleExportTemplete implements TaskExportTemplete {
         int min = 0, line = 0;
         try {
             taskExportCommon.getTxtList().add(DateUtil.format(new Date(), Constants.DEFAULT_DATE_PATTERN) + "->开始准备处理导出的成绩简版数据");
-            Long examId = (Long) map.get("examId");
-            Long activityId = (Long) map.get("activityId");
+            Long examId = (Long) map.get(SystemConstant.EXAM_ID);
+            Long activityId = (Long) map.get(SystemConstant.ACTIVITY_ID);
             String identity = (String) map.get("identity");
-            String name = (String) map.get("name");
-            String courseCode = (String) map.get("courseCode");
+            String name = (String) map.get(SystemConstant.NAME);
+            String courseCode = (String) map.get(SystemConstant.COURSE_CODE);
             Gson gson = new Gson();
             List<MarkResultSimpleExportDto> markResultSimpleExportDtoList = teExamStudentService.markResultQueryExport(examId, activityId, identity, name, courseCode);
             if (Objects.nonNull(markResultSimpleExportDtoList) && markResultSimpleExportDtoList.size() > 0) {

+ 4 - 4
themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskMarkResultStandardExportTemplete.java

@@ -87,11 +87,11 @@ public class TaskMarkResultStandardExportTemplete implements TaskExportTemplete
         int min = 0, line = 0;
         try {
             taskExportCommon.getTxtList().add(DateUtil.format(new Date(), Constants.DEFAULT_DATE_PATTERN) + "->开始准备处理导出的成绩标准版数据");
-            Long examId = (Long) map.get("examId");
-            Long activityId = (Long) map.get("activityId");
+            Long examId = (Long) map.get(SystemConstant.EXAM_ID);
+            Long activityId = (Long) map.get(SystemConstant.ACTIVITY_ID);
             String identity = (String) map.get("identity");
-            String name = (String) map.get("name");
-            String courseCode = (String) map.get("courseCode");
+            String name = (String) map.get(SystemConstant.NAME);
+            String courseCode = (String) map.get(SystemConstant.COURSE_CODE);
             Gson gson = new Gson();
             List<MarkResultSimpleExportDto> markResultSimpleExportDtoList = teExamStudentService.markResultQueryExport(examId, activityId, identity, name, courseCode);
             if (Objects.nonNull(markResultSimpleExportDtoList) && markResultSimpleExportDtoList.size() > 0) {

+ 3 - 3
themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskRoomCodeExportTemplete.java

@@ -61,9 +61,9 @@ public class TaskRoomCodeExportTemplete implements TaskExportTemplete {
         int min = 0, line = 0;
         try {
             taskExportCommon.getTxtList().add(DateUtil.format(new Date(), Constants.DEFAULT_DATE_PATTERN) + "->开始准备处理导出的考场数据");
-            Long examId = (Long) map.get("examId");
-            String roomCode = (String) map.get("roomCode");
-            Long userId = (Long) map.get("userId");
+            Long examId = (Long) map.get(SystemConstant.EXAM_ID);
+            String roomCode = (String) map.get(SystemConstant.ROOM_CODE);
+            Long userId = (Long) map.get(SystemConstant.USER_ID);
             List<RoomCodeExportDto> roomCodeExportDtoList = tbExamInvigilateUserService.examInvigilateUserExport(examId, roomCode, userId, taskExportCommon.getOrgId());
 
             boolean oss = (boolean) taskExportCommon.getOssEnv().get(SystemConstant.OSS);

+ 7 - 7
themis-business/src/main/java/com/qmth/themis/business/templete/service/impl/TempleteLogicServiceImpl.java

@@ -66,9 +66,9 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
     @Override
     @Transactional
     public Map<String, Object> execImportExamStudentLogic(List<LinkedMultiValueMap<Integer, Object>> finalList, Map<String, Object> map) throws UnsupportedEncodingException {
-        Long orgId = Long.parseLong(String.valueOf(map.get("orgId")));
-        Long examId = Long.parseLong(String.valueOf(map.get("examId")));
-        Long createId = Long.parseLong(String.valueOf(map.get("createId")));
+        Long orgId = Long.parseLong(String.valueOf(map.get(SystemConstant.ORG_ID)));
+        Long examId = Long.parseLong(String.valueOf(map.get(SystemConstant.EXAM_ID)));
+        Long createId = Long.parseLong(String.valueOf(map.get(SystemConstant.CREATE_ID)));
         List<String> txtList = (List<String>) map.get("txtList");
         TBTaskHistory tbTaskHistory = (TBTaskHistory) map.get("tbTaskHistory");
         List<TEExamStudent> teExamStudentList = new ArrayList<>();
@@ -226,11 +226,11 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
     @Transactional
     public Map<String, Object> execImportRoomCodeLogic(List<LinkedMultiValueMap<Integer, Object>> finalList, Map<String, Object> map) {
         Long orgId = null;
-        if (Objects.nonNull(map.get("orgId"))) {
-            orgId = Long.parseLong(String.valueOf(map.get("orgId")));
+        if (Objects.nonNull(map.get(SystemConstant.ORG_ID))) {
+            orgId = Long.parseLong(String.valueOf(map.get(SystemConstant.ORG_ID)));
         }
-        Long examId = Long.parseLong(String.valueOf(map.get("examId")));
-        Long createId = Long.parseLong(String.valueOf(map.get("createId")));
+        Long examId = Long.parseLong(String.valueOf(map.get(SystemConstant.EXAM_ID)));
+        Long createId = Long.parseLong(String.valueOf(map.get(SystemConstant.CREATE_ID)));
         List<String> txtList = (List<String>) map.get("txtList");
         Set<TBUser> tbUserList = new HashSet<>();
         Set<TBUserRole> tbUserRoleList = new HashSet<>();

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/util/WebsocketUtil.java

@@ -112,11 +112,11 @@ public class WebsocketUtil {
         if (Objects.nonNull(recordId)) {
             tranMap.put(SystemConstant.RECORD_ID, recordId);
         } else if (Objects.nonNull(userId)) {
-            tranMap.put("userId", userId);
+            tranMap.put(SystemConstant.USER_ID, userId);
         }
         tranMap.put("deviceId", deviceId);
         tranMap.put("ip", ip);
-        tranMap.put("updateTime", updateTime);
+        tranMap.put(SystemConstant.UPDATE_TIME, updateTime);
         return tranMap;
     }
 }

+ 3 - 2
themis-exam/src/main/java/com/qmth/themis/exam/api/SysController.java

@@ -5,6 +5,7 @@ import com.qmth.themis.business.annotation.ApiJsonProperty;
 import com.qmth.themis.business.bean.exam.EnvBean;
 import com.qmth.themis.business.bean.exam.OrgInfoBean;
 import com.qmth.themis.business.bean.exam.VersionBean;
+import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.entity.TBClientVersion;
 import com.qmth.themis.business.entity.TBOrg;
 import com.qmth.themis.business.enums.UploadFileEnum;
@@ -46,8 +47,8 @@ public class SysController {
             @ApiJsonProperty(key = "orgId", type = "long", example = "1", description = "机构id"),
     }) @ApiParam(value = "机构id", required = false) @RequestBody Map<String, Object> mapParameter) {
         EnvBean env = new EnvBean();
-        if (Objects.nonNull(mapParameter.get("orgId"))) {
-            Long orgId = Long.parseLong(String.valueOf(mapParameter.get("orgId")));
+        if (Objects.nonNull(mapParameter.get(SystemConstant.ORG_ID))) {
+            Long orgId = Long.parseLong(String.valueOf(mapParameter.get(SystemConstant.ORG_ID)));
             TBOrg org = cacheService.addOrgCache(orgId);
             if (Objects.nonNull(org)) {
                 OrgInfoBean orgInfo = new OrgInfoBean(org.getName(), org.getLogo(), (org.getUpdateTime() == null ? null : org.getUpdateTime()));

+ 4 - 4
themis-exam/src/main/java/com/qmth/themis/exam/api/TEExamController.java

@@ -95,7 +95,7 @@ public class TEExamController {
     public Result waiting(@ApiJsonObject(name = "examWaiting", value = {
             @ApiJsonProperty(key = "examId", type = "long", example = "1", description = "批次id")
     }) @ApiParam(value = "考试口令", required = true) @RequestBody Map<String, Object> mapParameter) {
-        Long examId = Objects.nonNull(mapParameter.get("examId")) ? Long.parseLong(String.valueOf(mapParameter.get("examId"))) : null;
+        Long examId = Objects.nonNull(mapParameter.get(SystemConstant.EXAM_ID)) ? Long.parseLong(String.valueOf(mapParameter.get(SystemConstant.EXAM_ID))) : null;
         TEStudentCacheDto teStudent = (TEStudentCacheDto) ServletUtil.getRequestStudentAccount();
         List<TEExamWaitDto> list = teExamService.getWaitingExam(teStudent.getId(), examId, teStudent.getOrgId());
         return ResultUtil.ok(Collections.singletonMap("waiting", list));
@@ -170,7 +170,7 @@ public class TEExamController {
                 Long breakId = ExamRecordCacheUtil.getLastBreakId(param.getRecordId());
                 if (Objects.nonNull(breakId)) {
                     JSONObject jsonObject = JSONObject.parseObject(param.getReason());
-                    ExceptionEnum exceptionEnum = ExceptionEnum.valueOf(ExceptionEnum.convertToName(String.valueOf(jsonObject.get("type"))));
+                    ExceptionEnum exceptionEnum = ExceptionEnum.valueOf(ExceptionEnum.convertToName(String.valueOf(jsonObject.get(SystemConstant.TYPE))));
                     String reason = String.valueOf(jsonObject.get("reason"));
                     ExamBreakCacheUtil.setBreakReason(breakId, exceptionEnum);
                     ExamBreakCacheUtil.setResumeReason(breakId, reason);
@@ -373,7 +373,7 @@ public class TEExamController {
             ExamRecordCacheUtil.setPaperDownload(param.getRecordId(), 0);
             tOeExamRecordService.sendExamRecordDataSaveMq(param.getRecordId(), System.currentTimeMillis());
         }
-        return ResultUtil.ok(Collections.singletonMap("updateTime", System.currentTimeMillis()));
+        return ResultUtil.ok(Collections.singletonMap(SystemConstant.UPDATE_TIME, System.currentTimeMillis()));
     }
 
     @ApiOperation(value = "查询考试状态")
@@ -394,7 +394,7 @@ public class TEExamController {
             }
         }
         Map<String, Object> map = new HashMap<>();
-        map.put("status", examRecordStatusEnum);
+        map.put(SystemConstant.STATUS, examRecordStatusEnum);
         return ResultUtil.ok(map);
     }
 }

+ 3 - 3
themis-exam/src/main/java/com/qmth/themis/exam/api/TEFaceController.java

@@ -79,14 +79,14 @@ public class TEFaceController {
                 param.getFaceCount(),
                 param.getSimilarity(), param.getRealness(), param.getTime(), param.getException());
         Map<String, Object> transMap = new HashMap<String, Object>();
-        transMap.put("id", ret.getId());
+        transMap.put(SystemConstant.ID, ret.getId());
         transMap.put(SystemConstant.RECORD_ID, param.getRecordId());
-        transMap.put("type", param.getType());
+        transMap.put(SystemConstant.TYPE, param.getType());
         transMap.put("photoUrl", param.getPhotoUrl());
         transMap.put("faceCount", param.getFaceCount());
         transMap.put("similarity", param.getSimilarity());
         transMap.put("realness", param.getRealness());
-        transMap.put("time", param.getTime());
+        transMap.put(SystemConstant.HEADER_TIME, param.getTime());
         transMap.put("exception", param.getException());
         //mq发送消息start
         MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.FACE_VERIFY_SAVE.name(), transMap, MqTagEnum.FACE_VERIFY_SAVE, param.getRecordId().toString(), param.getRecordId().toString());

+ 2 - 2
themis-exam/src/main/java/com/qmth/themis/exam/api/TELivenessController.java

@@ -78,9 +78,9 @@ public class TELivenessController {
                 param.getActions(), param.getRetry(), param.getStartTime(), param.getFinishTime(),
                 param.getException());
         Map<String, Object> transMap = new HashMap<String, Object>();
-        transMap.put("id", ret.getId());
+        transMap.put(SystemConstant.ID, ret.getId());
         transMap.put(SystemConstant.RECORD_ID, param.getRecordId());
-        transMap.put("type", param.getType());
+        transMap.put(SystemConstant.TYPE, param.getType());
         transMap.put("actions", param.getActions());
         transMap.put("retry", param.getRetry());
         transMap.put("startTime", param.getStartTime());

+ 1 - 1
themis-exam/src/main/java/com/qmth/themis/exam/api/TEMobileController.java

@@ -202,7 +202,7 @@ public class TEMobileController {
             }
         }
         Map<String, Object> map = new HashMap<>();
-        map.put("status", examRecordStatusEnum);
+        map.put(SystemConstant.STATUS, examRecordStatusEnum);
         return ResultUtil.ok(map);
     }
 }

+ 4 - 4
themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java

@@ -119,13 +119,13 @@ public class TEStudentController {
             throw new BusinessException(ExceptionResultEnum.PASSWORD_IS_NULL);
         }
         Long orgId = null;
-        if (Objects.nonNull(mapParameter.get("orgId"))) {
-            orgId = Long.parseLong(String.valueOf(mapParameter.get("orgId")));
+        if (Objects.nonNull(mapParameter.get(SystemConstant.ORG_ID))) {
+            orgId = Long.parseLong(String.valueOf(mapParameter.get(SystemConstant.ORG_ID)));
         }
         Long examId = null;
         TBOrg tbOrg = null;
-        if (Objects.nonNull(mapParameter.get("examId"))) {
-            examId = Long.parseLong(String.valueOf(mapParameter.get("examId")));
+        if (Objects.nonNull(mapParameter.get(SystemConstant.EXAM_ID))) {
+            examId = Long.parseLong(String.valueOf(mapParameter.get(SystemConstant.EXAM_ID)));
             ExamCacheBean ec = teExamService.getExamCacheBean(examId);
             tbOrg = cacheService.addOrgCache(ec.getOrgId());
         }

+ 11 - 11
themis-exam/src/main/java/com/qmth/themis/exam/api/TIeInvigilateCallMobileController.java

@@ -105,7 +105,7 @@ public class TIeInvigilateCallMobileController {
 //                throw new RuntimeException(e);
 //            }
 //        }
-//        return ResultUtil.ok(Collections.singletonMap("updateTime", System.currentTimeMillis()));
+//        return ResultUtil.ok(Collections.singletonMap(SystemConstant.UPDATE_TIME, System.currentTimeMillis()));
 //    }
 
     @ApiOperation(value = "发送通话申请接口")
@@ -143,7 +143,7 @@ public class TIeInvigilateCallMobileController {
         MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.MONITOR_LOG.name(), tIeExamInvigilateCallLog, MqTagEnum.MONITOR_LOG, String.valueOf(tIeExamInvigilateCallLog.getId()), source.name());
         mqDtoService.assembleSendOneWayMsg(mqDto);
         //监考监控通话信息 发送mq end
-        return ResultUtil.ok(Collections.singletonMap("updateTime", System.currentTimeMillis()));
+        return ResultUtil.ok(Collections.singletonMap(SystemConstant.UPDATE_TIME, System.currentTimeMillis()));
     }
 
     @ApiOperation(value = "监控状态更新接口")
@@ -164,11 +164,11 @@ public class TIeInvigilateCallMobileController {
             throw new BusinessException("监考视频源不能为空");
         }
         MonitorVideoSourceEnum source = MonitorVideoSourceEnum.valueOf(String.valueOf(mapParameter.get("source")).toUpperCase());
-        if (Objects.isNull(mapParameter.get("status")) || Objects.equals(mapParameter.get("status"), "")) {
+        if (Objects.isNull(mapParameter.get(SystemConstant.STATUS)) || Objects.equals(mapParameter.get(SystemConstant.STATUS), "")) {
             throw new BusinessException("监考视频状态不能为空");
         }
-        MonitorStatusSourceEnum status = MonitorStatusSourceEnum.valueOf(String.valueOf(mapParameter.get("status")).toUpperCase());
-        if (Objects.equals(status, MonitorStatusSourceEnum.STOP.name()) && (Objects.isNull(mapParameter.get("type")) || Objects.equals(mapParameter.get("type"), ""))) {
+        MonitorStatusSourceEnum status = MonitorStatusSourceEnum.valueOf(String.valueOf(mapParameter.get(SystemConstant.STATUS)).toUpperCase());
+        if (Objects.equals(status, MonitorStatusSourceEnum.STOP.name()) && (Objects.isNull(mapParameter.get(SystemConstant.TYPE)) || Objects.equals(mapParameter.get(SystemConstant.TYPE), ""))) {
             throw new BusinessException("异常类型不能为空");
         }
         //获取考试记录缓存
@@ -180,8 +180,8 @@ public class TIeInvigilateCallMobileController {
         tOeExamRecordService.sendExamRecordDataSaveMq(recordId, timestamp);
         String monitorKey = ExamRecordCacheUtil.getMonitorKey(recordId);
         TIeExamInvigilateCallLog tIeExamInvigilateCallLog = new TIeExamInvigilateCallLog(recordId, source, liveUrl, MonitorStatusSourceEnum.START, monitorKey, callStatus);
-        if (Objects.nonNull(mapParameter.get("type")) && !Objects.equals(mapParameter.get("type"), "")) {
-            tIeExamInvigilateCallLog.setType(ExceptionEnum.valueOf(String.valueOf(mapParameter.get("type"))));
+        if (Objects.nonNull(mapParameter.get(SystemConstant.TYPE)) && !Objects.equals(mapParameter.get(SystemConstant.TYPE), "")) {
+            tIeExamInvigilateCallLog.setType(ExceptionEnum.valueOf(String.valueOf(mapParameter.get(SystemConstant.TYPE))));
         }
 
         //监考监控通话信息 发送mq start
@@ -202,8 +202,8 @@ public class TIeInvigilateCallMobileController {
             mqDtoService.assembleSendOneOrderMsg(mqDtoStop);
         }
         Map map = new HashMap();
-        map.put("status", status.name());
-        map.put("updateTime", System.currentTimeMillis());
+        map.put(SystemConstant.STATUS, status.name());
+        map.put(SystemConstant.UPDATE_TIME, System.currentTimeMillis());
         return ResultUtil.ok(map);
     }
 
@@ -226,7 +226,7 @@ public class TIeInvigilateCallMobileController {
         //获取考试记录缓存
         ExamRecordStatusEnum statusEnum = ExamRecordCacheUtil.getStatus(recordId);
         if (Objects.isNull(statusEnum) || Objects.equals(statusEnum, ExamRecordStatusEnum.FINISHED) || Objects.equals(statusEnum, ExamRecordStatusEnum.PERSISTED)) {
-            return ResultUtil.ok(Collections.singletonMap("updateTime", System.currentTimeMillis()));
+            return ResultUtil.ok(Collections.singletonMap(SystemConstant.UPDATE_TIME, System.currentTimeMillis()));
         } else if (Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source))) {
             throw new BusinessException("推流状态为空");
         }
@@ -242,6 +242,6 @@ public class TIeInvigilateCallMobileController {
         MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.MONITOR_LOG.name(), tIeExamInvigilateCallLog, MqTagEnum.MONITOR_LOG, String.valueOf(tIeExamInvigilateCallLog.getId()), source.name());
         mqDtoService.assembleSendOneWayMsg(mqDto);
         //监考监控通话信息 发送mq end
-        return ResultUtil.ok(Collections.singletonMap("updateTime", System.currentTimeMillis()));
+        return ResultUtil.ok(Collections.singletonMap(SystemConstant.UPDATE_TIME, System.currentTimeMillis()));
     }
 }

+ 11 - 11
themis-exam/src/main/java/com/qmth/themis/exam/api/TIeInvigilateCallOeController.java

@@ -104,7 +104,7 @@ public class TIeInvigilateCallOeController {
 //                throw new RuntimeException(e);
 //            }
 //        }
-//        return ResultUtil.ok(Collections.singletonMap("updateTime", System.currentTimeMillis()));
+//        return ResultUtil.ok(Collections.singletonMap(SystemConstant.UPDATE_TIME, System.currentTimeMillis()));
 //    }
 
     @ApiOperation(value = "监控状态更新接口")
@@ -125,11 +125,11 @@ public class TIeInvigilateCallOeController {
             throw new BusinessException("监考视频源不能为空");
         }
         MonitorVideoSourceEnum source = MonitorVideoSourceEnum.valueOf(String.valueOf(mapParameter.get("source")).toUpperCase());
-        if (Objects.isNull(mapParameter.get("status")) || Objects.equals(mapParameter.get("status"), "")) {
+        if (Objects.isNull(mapParameter.get(SystemConstant.STATUS)) || Objects.equals(mapParameter.get(SystemConstant.STATUS), "")) {
             throw new BusinessException("监考视频状态不能为空");
         }
-        MonitorStatusSourceEnum status = MonitorStatusSourceEnum.valueOf(String.valueOf(mapParameter.get("status")).toUpperCase());
-        if (Objects.equals(status, MonitorStatusSourceEnum.STOP.name()) && (Objects.isNull(mapParameter.get("type")) || Objects.equals(mapParameter.get("type"), ""))) {
+        MonitorStatusSourceEnum status = MonitorStatusSourceEnum.valueOf(String.valueOf(mapParameter.get(SystemConstant.STATUS)).toUpperCase());
+        if (Objects.equals(status, MonitorStatusSourceEnum.STOP.name()) && (Objects.isNull(mapParameter.get(SystemConstant.TYPE)) || Objects.equals(mapParameter.get(SystemConstant.TYPE), ""))) {
             throw new BusinessException("异常类型不能为空");
         }
         //获取考试记录缓存
@@ -141,8 +141,8 @@ public class TIeInvigilateCallOeController {
         tOeExamRecordService.sendExamRecordDataSaveMq(recordId, timestamp);
         String monitorKey = ExamRecordCacheUtil.getMonitorKey(recordId);
         TIeExamInvigilateCallLog tIeExamInvigilateCallLog = new TIeExamInvigilateCallLog(recordId, source, liveUrl, MonitorStatusSourceEnum.START, monitorKey, callStatus);
-        if (Objects.nonNull(mapParameter.get("type")) && !Objects.equals(mapParameter.get("type"), "")) {
-            tIeExamInvigilateCallLog.setType(ExceptionEnum.valueOf(String.valueOf(mapParameter.get("type"))));
+        if (Objects.nonNull(mapParameter.get(SystemConstant.TYPE)) && !Objects.equals(mapParameter.get(SystemConstant.TYPE), "")) {
+            tIeExamInvigilateCallLog.setType(ExceptionEnum.valueOf(String.valueOf(mapParameter.get(SystemConstant.TYPE))));
         }
 
         //监考监控通话信息 发送mq start
@@ -150,8 +150,8 @@ public class TIeInvigilateCallOeController {
         mqDtoService.assembleSendOneWayMsg(mqDto);
         //监考监控通话信息 发送mq end
         Map map = new HashMap();
-        map.put("status", status.name());
-        map.put("updateTime", System.currentTimeMillis());
+        map.put(SystemConstant.STATUS, status.name());
+        map.put(SystemConstant.UPDATE_TIME, System.currentTimeMillis());
         return ResultUtil.ok(map);
     }
 
@@ -186,7 +186,7 @@ public class TIeInvigilateCallOeController {
         MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.MONITOR_LOG.name(), tIeExamInvigilateCallLog, MqTagEnum.MONITOR_LOG, String.valueOf(tIeExamInvigilateCallLog.getId()), source.name());
         mqDtoService.assembleSendOneWayMsg(mqDto);
         //监考监控通话信息 发送mq end
-        return ResultUtil.ok(Collections.singletonMap("updateTime", System.currentTimeMillis()));
+        return ResultUtil.ok(Collections.singletonMap(SystemConstant.UPDATE_TIME, System.currentTimeMillis()));
     }
 
     @ApiOperation(value = "撤销通话申请接口")
@@ -205,7 +205,7 @@ public class TIeInvigilateCallOeController {
         String liveUrl = SystemConstant.setStreamId(dictionaryConfig.monitorDomain().getPrefix(), recordId, source);
         ExamRecordStatusEnum statusEnum = ExamRecordCacheUtil.getStatus(recordId);
         if (Objects.isNull(statusEnum) || Objects.equals(statusEnum, ExamRecordStatusEnum.FINISHED) || Objects.equals(statusEnum, ExamRecordStatusEnum.PERSISTED)) {
-            return ResultUtil.ok(Collections.singletonMap("updateTime", System.currentTimeMillis()));
+            return ResultUtil.ok(Collections.singletonMap(SystemConstant.UPDATE_TIME, System.currentTimeMillis()));
         } else if (Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source))) {
             throw new BusinessException("推流状态为空");
         }
@@ -220,6 +220,6 @@ public class TIeInvigilateCallOeController {
         MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.MONITOR_LOG.name(), tIeExamInvigilateCallLog, MqTagEnum.MONITOR_LOG, String.valueOf(tIeExamInvigilateCallLog.getId()), source.name());
         mqDtoService.assembleSendOneWayMsg(mqDto);
         //监考监控通话信息 发送mq end
-        return ResultUtil.ok(Collections.singletonMap("updateTime", System.currentTimeMillis()));
+        return ResultUtil.ok(Collections.singletonMap(SystemConstant.UPDATE_TIME, System.currentTimeMillis()));
     }
 }

+ 4 - 4
themis-exam/src/main/java/com/qmth/themis/exam/listener/service/impl/MqOeLogicServiceImpl.java

@@ -92,7 +92,7 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
                 map.put("form", mqDto.getObjName());
                 map.put(SystemConstant.WEB_SOCKET_OE_SERVER, webSocketOeServer);
                 map.put(SystemConstant.RECORD_ID, recordId);
-                map.put(SystemConstant.MESSAGE, FinishTypeEnum.valueOf(String.valueOf(mqDto.getProperties().get("type"))).getCode());
+                map.put(SystemConstant.MESSAGE, FinishTypeEnum.valueOf(String.valueOf(mqDto.getProperties().get(SystemConstant.TYPE))).getCode());
                 TEExamStudentLog teExamStudentLog = new TEExamStudentLog(mqDto.getType().name(), mqDto.getType().getCode(), mqDto.getType().getCode(), examStudentCacheBean.getStudentId(), examStudentId, recordId, mqDto.getType().getCode());
                 teExamStudentLogService.save(teExamStudentLog);
 
@@ -138,7 +138,7 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
                     && webSocketOeServer.getRecordId().longValue() == recordId.longValue()) {
                 map.put(SystemConstant.WEB_SOCKET_OE_SERVER, webSocketOeServer);
                 map.put(SystemConstant.RECORD_ID, recordId);
-                map.put(SystemConstant.BREACH_STATUS, FinishTypeEnum.valueOf(String.valueOf(mqDto.getProperties().get("type"))).getCode());
+                map.put(SystemConstant.BREACH_STATUS, FinishTypeEnum.valueOf(String.valueOf(mqDto.getProperties().get(SystemConstant.TYPE))).getCode());
                 TEExamStudentLog teExamStudentLog = new TEExamStudentLog(mqDto.getType().name(), mqDto.getType().getCode(), mqDto.getType().getCode(), examStudentCacheBean.getStudentId(), examStudentId, recordId, mqDto.getType().getCode());
                 teExamStudentLogService.save(teExamStudentLog);
                 mqDto.setAck(SystemConstant.STANDARD_ACK_TYPE);
@@ -184,9 +184,9 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
                 map.put(SystemConstant.RECORD_ID, recordId);
                 map.put("from", mqDto.getObjName());
                 map.put(SystemConstant.WEB_SOCKET_OE_SERVER, webSocketOeServer);
-                map.put("type", prop.get("type"));
+                map.put(SystemConstant.TYPE, prop.get(SystemConstant.TYPE));
                 map.put("content", prop.get("content"));
-                TIeExamInvigilateNotice tIeExamInvigilateNotice = new TIeExamInvigilateNotice(examId, examActivityId, recordId, Long.parseLong(String.valueOf(prop.get("formUserId"))), examStudentId, MessageTypeEnum.valueOf(String.valueOf(prop.get("type")).toUpperCase()), String.valueOf(prop.get("content")));
+                TIeExamInvigilateNotice tIeExamInvigilateNotice = new TIeExamInvigilateNotice(examId, examActivityId, recordId, Long.parseLong(String.valueOf(prop.get("formUserId"))), examStudentId, MessageTypeEnum.valueOf(String.valueOf(prop.get(SystemConstant.TYPE)).toUpperCase()), String.valueOf(prop.get("content")));
                 tIeExamInvigilateNoticeService.saveOrUpdate(tIeExamInvigilateNotice);
 
                 mqDto.setAck(SystemConstant.STANDARD_ACK_TYPE);

+ 15 - 15
themis-mq/src/main/java/com/qmth/themis/mq/service/impl/MqLogicServiceImpl.java

@@ -168,13 +168,13 @@ public class MqLogicServiceImpl implements MqLogicService {
             TEExamStudentLog teExamStudentLog = null;
             if (Objects.nonNull(mqDto.getProperties())) {
                 teExamStudentLog = new TEExamStudentLog(String.valueOf(mqDto.getBody()),
-                        Objects.nonNull(mqDto.getProperties().get("type")) ?
-                                String.valueOf(mqDto.getProperties().get("type")) :
+                        Objects.nonNull(mqDto.getProperties().get(SystemConstant.TYPE)) ?
+                                String.valueOf(mqDto.getProperties().get(SystemConstant.TYPE)) :
                                 SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(),
-                        String.valueOf(mqDto.getProperties().get("remark")),
+                        String.valueOf(mqDto.getProperties().get(SystemConstant.REMARK)),
                         Long.parseLong(String.valueOf(mqDto.getObjId())),
-                        Long.parseLong(String.valueOf(mqDto.getProperties().get("examStudentId"))),
-                        Long.parseLong(String.valueOf(mqDto.getProperties().get("examRecordId"))),
+                        Long.parseLong(String.valueOf(mqDto.getProperties().get(SystemConstant.EXAM_STUDENT_ID))),
+                        Long.parseLong(String.valueOf(mqDto.getProperties().get(SystemConstant.EXAM_RECORD_ID))),
                         SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getTitle());
             } else {
                 teExamStudentLog = new TEExamStudentLog(String.valueOf(mqDto.getBody()),
@@ -420,14 +420,14 @@ public class MqLogicServiceImpl implements MqLogicService {
     public void execMqFaceVerifySaveLogic(MqDto mqDto, String key) {
         Gson gson = new Gson();
         Map<String, Object> param = (Map<String, Object>) mqDto.getBody();
-        Long id = (Long) param.get("id");
+        Long id = (Long) param.get(SystemConstant.ID);
         Long recordId = (Long) param.get(SystemConstant.RECORD_ID);
-        String type = (String) param.get("type");
+        String type = (String) param.get(SystemConstant.TYPE);
         String photoUrl = (String) param.get("photoUrl");
         Integer faceCount = (Integer) param.get("faceCount");
         Double similarity = (Double) param.get("similarity");
         Double realness = (Double) param.get("realness");
-        Long time = (Long) param.get("time");
+        Long time = (Long) param.get(SystemConstant.HEADER_TIME);
         String exception = (String) param.get("exception");
         TEConfig teConfig = teConfigService.getGlobalConfig();
         Long examStudentId = ExamRecordCacheUtil.getExamStudentId(recordId);
@@ -577,9 +577,9 @@ public class MqLogicServiceImpl implements MqLogicService {
     public void execMqLivenessVerifySaveLogic(MqDto mqDto, String key) {
         Gson gson = new Gson();
         Map<String, Object> param = (Map<String, Object>) mqDto.getBody();
-        Long id = (Long) param.get("id");
+        Long id = (Long) param.get(SystemConstant.ID);
         Long recordId = (Long) param.get(SystemConstant.RECORD_ID);
-        String type = (String) param.get("type");
+        String type = (String) param.get(SystemConstant.TYPE);
         String actions = (String) param.get("actions");
         Integer retry = (Integer) param.get("retry");
         Long startTime = (Long) param.get("startTime");
@@ -598,8 +598,8 @@ public class MqLogicServiceImpl implements MqLogicService {
             JSONArray jsonArray = JSONArray.parseArray(actions);
             for (int i = 0; i < jsonArray.size(); i++) {
                 JSONObject jsonObject = jsonArray.getJSONObject(i);
-                String photoType = Objects.nonNull(jsonObject.get("type")) ?
-                        String.valueOf(jsonObject.get("type")) :
+                String photoType = Objects.nonNull(jsonObject.get(SystemConstant.TYPE)) ?
+                        String.valueOf(jsonObject.get(SystemConstant.TYPE)) :
                         null;
                 String photoUrl = Objects.nonNull(jsonObject.get("photoUrl")) ?
                         String.valueOf(jsonObject.get("photoUrl")) :
@@ -823,7 +823,7 @@ public class MqLogicServiceImpl implements MqLogicService {
         } else if (Objects.equals(MqTagEnum.EXCEPTION_LOG.name(), tag)) {//考试断点异常日志
             JSONObject jsonObject = JSONObject.parseObject(String.valueOf(mqDto.getBody()));
             ExceptionEnum exceptionEnum = ExceptionEnum.valueOf(
-                    ExceptionEnum.convertToName(String.valueOf(jsonObject.getJSONObject("reason").get("type"))));
+                    ExceptionEnum.convertToName(String.valueOf(jsonObject.getJSONObject("reason").get(SystemConstant.TYPE))));
             Long recordId = Long.parseLong(mqDto.getObjId());
             Long breakId = ExamRecordCacheUtil.getLastBreakId(recordId);
             if (Objects.nonNull(breakId)) {
@@ -872,8 +872,8 @@ public class MqLogicServiceImpl implements MqLogicService {
     public void execMqCalculateScoreLogic(MqDto mqDto, String key) {
         Gson gson = new Gson();
         Map<String, Object> param = (Map<String, Object>) mqDto.getBody();
-        Long examId = (Long) param.get("examId");
-        Long taskId = (Long) param.get("taskId");
+        Long examId = (Long) param.get(SystemConstant.EXAM_ID);
+        Long taskId = (Long) param.get(SystemConstant.TASK_ID);
         teExamService.calculateScore(examId, taskId);
         mqDto.setAck(SystemConstant.STANDARD_ACK_TYPE);
         TMRocketMessage tmRocketMessage = gson.fromJson(gson.toJson(mqDto), TMRocketMessage.class);

+ 1 - 1
themis-task/src/main/java/com/qmth/themis/task/listener/service/impl/MqTaskLogicServiceImpl.java

@@ -128,7 +128,7 @@ public class MqTaskLogicServiceImpl implements MqTaskLogicService {
             log.info("cron:{}", cron);
             //执行一次性延时任务
             Map mapJob = new HashMap();
-            mapJob.put("name", jobName);
+            mapJob.put(SystemConstant.NAME, jobName);
             quartzService.deleteJob(jobName, quartzTaskEnum.name());
             quartzService.addJob(cls, jobName, quartzTaskEnum.name(), cron, mapJob);
         }

+ 3 - 3
themis-task/src/main/java/com/qmth/themis/task/start/StartRunning.java

@@ -53,21 +53,21 @@ public class StartRunning implements CommandLineRunner {
         log.info("服务器启动时执行 start");
         log.info("增加mqjob start");
         Map mqMap = new HashMap();
-        mqMap.put("name", MqJob.class.getName());
+        mqMap.put(SystemConstant.NAME, MqJob.class.getName());
         quartzService.deleteJob(QuartzTaskEnum.MQ_JOB_NAME.name(), QuartzTaskEnum.MQ_JOB_GROUP_NAME.name());
         quartzService.addJob(MqJob.class, QuartzTaskEnum.MQ_JOB_NAME.name(), QuartzTaskEnum.MQ_JOB_GROUP_NAME.name(), "0 0/1 * * * ?", mqMap);
         log.info("增加mqjob end");
 
         log.info("增加mqActivityjob start");
         Map mqActivityMap = new HashMap();
-        mqActivityMap.put("name", MqActivityJob.class.getName());
+        mqActivityMap.put(SystemConstant.NAME, MqActivityJob.class.getName());
         quartzService.deleteJob(QuartzTaskEnum.MQ_ACTIVITY_JOB_NAME.name(), QuartzTaskEnum.MQ_ACTIVITY_JOB_GROUP_NAME.name());
         quartzService.addJob(MqActivityJob.class, QuartzTaskEnum.MQ_ACTIVITY_JOB_NAME.name(), QuartzTaskEnum.MQ_ACTIVITY_JOB_GROUP_NAME.name(), "0 0 0 * * ?", mqActivityMap);
         log.info("增加mqActivityjob end");
 
         log.info("增加客观题答案缓存加载job start");
         Map objectiveAnswerCacheMap = new HashMap();
-        objectiveAnswerCacheMap.put("name", ObjectiveAnswerCacheLoadJob.class.getName());
+        objectiveAnswerCacheMap.put(SystemConstant.NAME, ObjectiveAnswerCacheLoadJob.class.getName());
         quartzService.deleteJob(QuartzTaskEnum.OBJECTIVE_ANSWER_CACHE_LOAD_JOB_NAME.name(), QuartzTaskEnum.OBJECTIVE_ANSWER_CACHE_LOAD_JOB_GROUP_NAME.name());
         quartzService.addJob(ObjectiveAnswerCacheLoadJob.class, QuartzTaskEnum.OBJECTIVE_ANSWER_CACHE_LOAD_JOB_NAME.name(), QuartzTaskEnum.OBJECTIVE_ANSWER_CACHE_LOAD_JOB_GROUP_NAME.name(), "0 0 1 * * ?", objectiveAnswerCacheMap);
         log.info("增加客观题答案缓存加载job end");