|
@@ -73,8 +73,8 @@ public class TIeInvigilateCallOeController {
|
|
|
String monitorKey = ExamRecordCacheUtil.getMonitorKey(recordId);
|
|
|
TIeExamInvigilateCallLog tIeExamInvigilateCallLog = new TIeExamInvigilateCallLog(recordId, source, liveUrl, MonitorStatusSourceEnum.INIT, monitorKey);
|
|
|
//获取考试记录缓存
|
|
|
- ExamRecordCacheUtil.setMonitorLiveUrl(recordId, source.name(), liveUrl, false);
|
|
|
- ExamRecordCacheUtil.setMonitorStatus(recordId, source.name(), tIeExamInvigilateCallLog.getStatus(), false);
|
|
|
+ ExamRecordCacheUtil.setMonitorLiveUrl(recordId, source, liveUrl, false);
|
|
|
+ ExamRecordCacheUtil.setMonitorStatus(recordId, source, tIeExamInvigilateCallLog.getStatus(), false);
|
|
|
String[] columns = new String[]{ExamRecordFieldEnum.monitor_live_url.name(), ExamRecordFieldEnum.monitor_status_source.name()};
|
|
|
Object[] values = new Object[]{liveUrl, tIeExamInvigilateCallLog.getStatus()};
|
|
|
tOeExamRecordService.dataUpdatesMq(recordId, columns, values);
|
|
@@ -124,10 +124,10 @@ public class TIeInvigilateCallOeController {
|
|
|
throw new BusinessException("异常类型不能为空");
|
|
|
}
|
|
|
//获取考试记录缓存
|
|
|
- String liveUrl = Objects.nonNull(ExamRecordCacheUtil.getMonitorLiveUrl(recordId, source.name())) ? ExamRecordCacheUtil.getMonitorLiveUrl(recordId, source.name()) : null;
|
|
|
- MonitorCallStatusSourceEnum callStatus = Objects.nonNull(ExamRecordCacheUtil.getMonitorCallStatus(recordId, source.name())) ? ExamRecordCacheUtil.getMonitorCallStatus(recordId, source.name()) : null;
|
|
|
- ExamRecordCacheUtil.setMonitorStatus(recordId, source.name(), status, true);
|
|
|
- ExamRecordCacheUtil.setMonitorCallStatus(recordId, source.name(), callStatus);
|
|
|
+ String liveUrl = Objects.nonNull(ExamRecordCacheUtil.getMonitorLiveUrl(recordId, source)) ? ExamRecordCacheUtil.getMonitorLiveUrl(recordId, source) : null;
|
|
|
+ MonitorCallStatusSourceEnum callStatus = Objects.nonNull(ExamRecordCacheUtil.getMonitorCallStatus(recordId, source)) ? ExamRecordCacheUtil.getMonitorCallStatus(recordId, source) : null;
|
|
|
+ ExamRecordCacheUtil.setMonitorStatus(recordId, source, status, true);
|
|
|
+ ExamRecordCacheUtil.setMonitorCallStatus(recordId, source, callStatus);
|
|
|
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"), "")) {
|
|
@@ -162,14 +162,14 @@ public class TIeInvigilateCallOeController {
|
|
|
source = MonitorVideoSourceEnum.CLIENT_CAMERA;
|
|
|
liveUrl = ExamRecordCacheUtil.getMonitorLiveUrlClientCamera(recordId);
|
|
|
}
|
|
|
- if (Objects.isNull(source) || Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
|
|
|
+ if (Objects.isNull(source) || Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source))) {
|
|
|
throw new BusinessException("推流状态为空");
|
|
|
}
|
|
|
- MonitorStatusSourceEnum status = ExamRecordCacheUtil.getMonitorStatus(recordId, source.name());
|
|
|
+ MonitorStatusSourceEnum status = ExamRecordCacheUtil.getMonitorStatus(recordId, source);
|
|
|
if (!Objects.equals(status, MonitorStatusSourceEnum.START)) {
|
|
|
throw new BusinessException("推流状态不正常");
|
|
|
}
|
|
|
- ExamRecordCacheUtil.setMonitorCallStatus(recordId, source.name(), MonitorCallStatusSourceEnum.START);
|
|
|
+ ExamRecordCacheUtil.setMonitorCallStatus(recordId, source, MonitorCallStatusSourceEnum.START);
|
|
|
String monitorKey = ExamRecordCacheUtil.getMonitorKey(recordId);
|
|
|
TIeExamInvigilateCallLog tIeExamInvigilateCallLog = new TIeExamInvigilateCallLog(recordId, source, liveUrl, status, monitorKey, MonitorCallStatusSourceEnum.START);
|
|
|
tIeExamInvigilateCallLog.setStartTime(System.currentTimeMillis());
|
|
@@ -198,11 +198,11 @@ public class TIeInvigilateCallOeController {
|
|
|
source = MonitorVideoSourceEnum.CLIENT_CAMERA;
|
|
|
liveUrl = ExamRecordCacheUtil.getMonitorLiveUrlClientCamera(recordId);
|
|
|
}
|
|
|
- if (Objects.isNull(source) || Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source.name()))) {
|
|
|
+ if (Objects.isNull(source) || Objects.isNull(ExamRecordCacheUtil.getMonitorStatus(recordId, source))) {
|
|
|
throw new BusinessException("推流状态为空");
|
|
|
}
|
|
|
- MonitorStatusSourceEnum status = ExamRecordCacheUtil.getMonitorStatus(recordId, source.name());
|
|
|
- ExamRecordCacheUtil.setMonitorCallStatus(recordId, source.name(), MonitorCallStatusSourceEnum.STOP);
|
|
|
+ MonitorStatusSourceEnum status = ExamRecordCacheUtil.getMonitorStatus(recordId, source);
|
|
|
+ ExamRecordCacheUtil.setMonitorCallStatus(recordId, source, MonitorCallStatusSourceEnum.STOP);
|
|
|
String monitorKey = ExamRecordCacheUtil.getMonitorKey(recordId);
|
|
|
TIeExamInvigilateCallLog tIeExamInvigilateCallLog = new TIeExamInvigilateCallLog(recordId, source, liveUrl, status, monitorKey, MonitorCallStatusSourceEnum.STOP);
|
|
|
tIeExamInvigilateCallLog.setEndTime(System.currentTimeMillis());
|