|
@@ -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()),
|