|
@@ -74,8 +74,8 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
|
|
|
@Resource
|
|
|
private MqUtil mqUtil;
|
|
|
|
|
|
- @Resource
|
|
|
- TEAudioService teAudioService;
|
|
|
+// @Resource
|
|
|
+// TEAudioService teAudioService;
|
|
|
|
|
|
@Resource
|
|
|
TSLogService tsLogService;
|
|
@@ -346,27 +346,27 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
|
|
|
.equals(teExam.getMonitorStatus(), InvigilateMonitorStatusEnum.FINISHED)) {
|
|
|
throw new BusinessException("监考结束的考试场次不可以修改");
|
|
|
}
|
|
|
- List<TEAudio> teAudioList = new ArrayList<>();
|
|
|
+// List<TEAudio> teAudioList = new ArrayList<>();
|
|
|
teExamActivityList.forEach(s -> {
|
|
|
if (Objects.nonNull(s.getId())) {
|
|
|
s.setUpdateId(tbUser.getId());
|
|
|
- QueryWrapper<TEAudio> teAudioQueryWrapper = new QueryWrapper<>();
|
|
|
- teAudioQueryWrapper.lambda().eq(TEAudio::getActivityId, s.getId())
|
|
|
- .eq(TEAudio::getType, AudioTypeEnum.BEFORE.name())
|
|
|
- .eq(TEAudio::getAudioDefault, AudioDefaultEnum.SYS.name());
|
|
|
- int count = teAudioService.count(teAudioQueryWrapper);
|
|
|
- if (count == 0) {
|
|
|
- teAudioList.add(new TEAudio(tbUser.getOrgId(), s.getId(), SystemConstant.BEFORE_AUDIO_ATTACHMENT_Id, AudioTypeEnum.BEFORE.getTitle(), AudioTypeEnum.BEFORE, AudioDefaultEnum.SYS, tbUser.getId(), SystemConstant.BEFORE_AUDIO_SECOND, teExam, s));//开考前语音
|
|
|
- }
|
|
|
-
|
|
|
- teAudioQueryWrapper = new QueryWrapper<>();
|
|
|
- teAudioQueryWrapper.lambda().eq(TEAudio::getActivityId, s.getId())
|
|
|
- .eq(TEAudio::getType, AudioTypeEnum.AFTER.name())
|
|
|
- .eq(TEAudio::getAudioDefault, AudioDefaultEnum.SYS.name());
|
|
|
- count = teAudioService.count(teAudioQueryWrapper);
|
|
|
- if (count == 0) {
|
|
|
- teAudioList.add(new TEAudio(tbUser.getOrgId(), s.getId(), SystemConstant.AFTER_AUDIO_ATTACHMENT_Id, AudioTypeEnum.AFTER.getTitle(), AudioTypeEnum.AFTER, AudioDefaultEnum.SYS, tbUser.getId(), SystemConstant.AFTER_AUDIO_SECOND, teExam, s));//考试结束前语音
|
|
|
- }
|
|
|
+// QueryWrapper<TEAudio> teAudioQueryWrapper = new QueryWrapper<>();
|
|
|
+// teAudioQueryWrapper.lambda().eq(TEAudio::getActivityId, s.getId())
|
|
|
+// .eq(TEAudio::getType, AudioTypeEnum.BEFORE.name())
|
|
|
+// .eq(TEAudio::getAudioDefault, AudioDefaultEnum.SYS.name());
|
|
|
+// int count = teAudioService.count(teAudioQueryWrapper);
|
|
|
+// if (count == 0) {
|
|
|
+// teAudioList.add(new TEAudio(tbUser.getOrgId(), s.getId(), SystemConstant.BEFORE_AUDIO_ATTACHMENT_Id, AudioTypeEnum.BEFORE.getTitle(), AudioTypeEnum.BEFORE, AudioDefaultEnum.SYS, tbUser.getId(), SystemConstant.BEFORE_AUDIO_SECOND, teExam, s));//开考前语音
|
|
|
+// }
|
|
|
+
|
|
|
+// teAudioQueryWrapper = new QueryWrapper<>();
|
|
|
+// teAudioQueryWrapper.lambda().eq(TEAudio::getActivityId, s.getId())
|
|
|
+// .eq(TEAudio::getType, AudioTypeEnum.AFTER.name())
|
|
|
+// .eq(TEAudio::getAudioDefault, AudioDefaultEnum.SYS.name());
|
|
|
+// count = teAudioService.count(teAudioQueryWrapper);
|
|
|
+// if (count == 0) {
|
|
|
+// teAudioList.add(new TEAudio(tbUser.getOrgId(), s.getId(), SystemConstant.AFTER_AUDIO_ATTACHMENT_Id, AudioTypeEnum.AFTER.getTitle(), AudioTypeEnum.AFTER, AudioDefaultEnum.SYS, tbUser.getId(), SystemConstant.AFTER_AUDIO_SECOND, teExam, s));//考试结束前语音
|
|
|
+// }
|
|
|
if (Objects.nonNull(s.getEnable()) && s.getEnable().intValue() == 0) {
|
|
|
Integer examCount = tOeExamRecordService.findByExamIdOrExamActivityIdCount(teExam.getId(), s.getId());
|
|
|
if (Objects.nonNull(examCount) && examCount.intValue() > 0) {
|
|
@@ -416,8 +416,8 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
|
|
|
s.setId(uidUtil.getId());
|
|
|
s.setCreateId(tbUser.getId());
|
|
|
s.setCode(String.valueOf(redisUtil.getRedisActivityCodeSequence(s.getExamId())));
|
|
|
- teAudioList.add(new TEAudio(tbUser.getOrgId(), s.getId(), SystemConstant.BEFORE_AUDIO_ATTACHMENT_Id, AudioTypeEnum.BEFORE.getTitle(), AudioTypeEnum.BEFORE, AudioDefaultEnum.SYS, tbUser.getId(), SystemConstant.BEFORE_AUDIO_SECOND, teExam, s));//开考前语音
|
|
|
- teAudioList.add(new TEAudio(tbUser.getOrgId(), s.getId(), SystemConstant.AFTER_AUDIO_ATTACHMENT_Id, AudioTypeEnum.AFTER.getTitle(), AudioTypeEnum.AFTER, AudioDefaultEnum.SYS, tbUser.getId(), SystemConstant.AFTER_AUDIO_SECOND, teExam, s));//考试结束前语音
|
|
|
+// teAudioList.add(new TEAudio(tbUser.getOrgId(), s.getId(), SystemConstant.BEFORE_AUDIO_ATTACHMENT_Id, AudioTypeEnum.BEFORE.getTitle(), AudioTypeEnum.BEFORE, AudioDefaultEnum.SYS, tbUser.getId(), SystemConstant.BEFORE_AUDIO_SECOND, teExam, s));//开考前语音
|
|
|
+// teAudioList.add(new TEAudio(tbUser.getOrgId(), s.getId(), SystemConstant.AFTER_AUDIO_ATTACHMENT_Id, AudioTypeEnum.AFTER.getTitle(), AudioTypeEnum.AFTER, AudioDefaultEnum.SYS, tbUser.getId(), SystemConstant.AFTER_AUDIO_SECOND, teExam, s));//考试结束前语音
|
|
|
}
|
|
|
});
|
|
|
teExamActivityService.saveOrUpdateBatch(teExamActivityList);
|
|
@@ -428,12 +428,12 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (!CollectionUtils.isEmpty(teAudioList)) {
|
|
|
- teAudioService.saveOrUpdateBatch(teAudioList);
|
|
|
-// for (TEAudio t : teAudioList) {
|
|
|
-// teAudioService.sendAudioMessage(t);
|
|
|
-// }
|
|
|
- }
|
|
|
+// if (!CollectionUtils.isEmpty(teAudioList)) {
|
|
|
+// teAudioService.saveOrUpdateBatch(teAudioList);
|
|
|
+//// for (TEAudio t : teAudioList) {
|
|
|
+//// teAudioService.sendAudioMessage(t);
|
|
|
+//// }
|
|
|
+// }
|
|
|
if (size.get() > 0 && (Objects.nonNull(teExam.getForceFinish()) && teExam.getForceFinish().intValue() == 1)) {
|
|
|
//新增quartz任务,发送mq消息start
|
|
|
Map<String, Object> prop = new HashMap<>();
|