|
@@ -160,11 +160,10 @@ public class TIeInvigilateController {
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
- if (Objects.nonNull(finalMonitorVideoSourceList) && finalMonitorVideoSourceList.contains(MonitorVideoSourceEnum.CLIENT_CAMERA.name())) {
|
|
|
- String monitorLiveUrl = SystemConstant.setStreamId(dictionaryConfig.monitorDomain().getPrefix(), s.getExamRecordId(), MonitorVideoSourceEnum.CLIENT_CAMERA);
|
|
|
- if (Objects.nonNull(monitorLiveUrl)) {
|
|
|
- s.setMonitorLiveUrl(monitorLiveUrl);
|
|
|
- }
|
|
|
+ if (Objects.nonNull(monitorVideoSource)) {
|
|
|
+ s.setMonitorLiveUrl(SystemConstant.setStreamId(dictionaryConfig.monitorDomain().getPrefix(), s.getExamRecordId(), MonitorVideoSourceEnum.valueOf(monitorVideoSource)));
|
|
|
+ } else if (Objects.nonNull(finalMonitorVideoSourceList) && finalMonitorVideoSourceList.contains(MonitorVideoSourceEnum.CLIENT_CAMERA.name())) {
|
|
|
+ s.setMonitorLiveUrl(SystemConstant.setStreamId(dictionaryConfig.monitorDomain().getPrefix(), s.getExamRecordId(), MonitorVideoSourceEnum.CLIENT_CAMERA));
|
|
|
}
|
|
|
WebsocketStatusEnum websocketStatusEnum = ExamRecordCacheUtil.getClientWebsocketStatus(s.getExamRecordId());
|
|
|
if (Objects.nonNull(websocketStatusEnum)) {
|
|
@@ -207,10 +206,7 @@ public class TIeInvigilateController {
|
|
|
monitorVideoSourceList = Arrays.asList(examCacheBean.getMonitorVideoSource().trim().toUpperCase().replaceAll(" ", "").split(","));
|
|
|
}
|
|
|
if (Objects.nonNull(monitorVideoSourceList) && monitorVideoSourceList.contains(MonitorVideoSourceEnum.CLIENT_CAMERA.name())) {
|
|
|
- String monitorLiveUrl = SystemConstant.setStreamId(dictionaryConfig.monitorDomain().getPrefix(), s.getExamRecordId(), MonitorVideoSourceEnum.CLIENT_CAMERA);
|
|
|
- if (Objects.nonNull(monitorLiveUrl)) {
|
|
|
- s.setMonitorLiveUrl(monitorLiveUrl);
|
|
|
- }
|
|
|
+ s.setMonitorLiveUrl(SystemConstant.setStreamId(dictionaryConfig.monitorDomain().getPrefix(), s.getExamRecordId(), MonitorVideoSourceEnum.CLIENT_CAMERA));
|
|
|
}
|
|
|
WebsocketStatusEnum websocketStatusEnum = ExamRecordCacheUtil.getClientWebsocketStatus(s.getExamRecordId());
|
|
|
if (Objects.nonNull(websocketStatusEnum)) {
|