|
@@ -154,12 +154,12 @@ public class TEStudentServiceImpl extends ServiceImpl<TEStudentMapper, TEStudent
|
|
*
|
|
*
|
|
* @param iPage
|
|
* @param iPage
|
|
* @param examRecordId
|
|
* @param examRecordId
|
|
- * @param monitorVideoSource
|
|
|
|
|
|
+ * @param monitorRecord
|
|
* @param log
|
|
* @param log
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
- public TEStudentExamRecordVideoDto examRecordVideoQuery(IPage<Map> iPage, Long examRecordId, MonitorVideoSourceEnum monitorVideoSource, Boolean log) {
|
|
|
|
|
|
+ public TEStudentExamRecordVideoDto examRecordVideoQuery(IPage<Map> iPage, Long examRecordId, MonitorVideoSourceEnum monitorRecord, Boolean log) {
|
|
TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(examRecordId);
|
|
TOeExamRecord tOeExamRecord = SystemConstant.getExamRecord(examRecordId);
|
|
ExamCacheBean examCacheBean = null;
|
|
ExamCacheBean examCacheBean = null;
|
|
ExamStudentCacheBean examStudentCacheBean = null;
|
|
ExamStudentCacheBean examStudentCacheBean = null;
|
|
@@ -178,15 +178,15 @@ public class TEStudentServiceImpl extends ServiceImpl<TEStudentMapper, TEStudent
|
|
|
|
|
|
IPage<TEStudentExamRecordVideoMessageDto> teStudentExamRecordVideoMessageDtoIPage = null;
|
|
IPage<TEStudentExamRecordVideoMessageDto> teStudentExamRecordVideoMessageDtoIPage = null;
|
|
if (Objects.isNull(tOeExamRecord.getTencentVideoUrl())) {
|
|
if (Objects.isNull(tOeExamRecord.getTencentVideoUrl())) {
|
|
- teStudentExamRecordVideoMessageDtoIPage = teStudentMapper.examRecordVideoQuery(iPage, examRecordId, Objects.nonNull(monitorVideoSource) ? monitorVideoSource.name().toLowerCase() : null);
|
|
|
|
|
|
+ teStudentExamRecordVideoMessageDtoIPage = teStudentMapper.examRecordVideoQuery(iPage, examRecordId, Objects.nonNull(monitorRecord) ? monitorRecord.name().toLowerCase() : null);
|
|
} else {
|
|
} else {
|
|
JSONArray jsonArray = JSONArray.parseArray(tOeExamRecord.getTencentVideoUrl());
|
|
JSONArray jsonArray = JSONArray.parseArray(tOeExamRecord.getTencentVideoUrl());
|
|
List<TEStudentExamRecordVideoMessageDto> teStudentExamRecordVideoMessageDtoList = new ArrayList<>(jsonArray.size());
|
|
List<TEStudentExamRecordVideoMessageDto> teStudentExamRecordVideoMessageDtoList = new ArrayList<>(jsonArray.size());
|
|
for (int i = 0; i < jsonArray.size(); i++) {
|
|
for (int i = 0; i < jsonArray.size(); i++) {
|
|
JSONObject json = (JSONObject) jsonArray.get(i);
|
|
JSONObject json = (JSONObject) jsonArray.get(i);
|
|
TEStudentExamRecordVideoMessageDto teStudentExamRecordVideoMessageDto = new TEStudentExamRecordVideoMessageDto((String) json.get(SystemConstant.VIDEO_SOURCE), tOeExamRecord.getFirstStartTime(), tOeExamRecord.getFinishTime(), (String) json.get(SystemConstant.VIDEO_URL));
|
|
TEStudentExamRecordVideoMessageDto teStudentExamRecordVideoMessageDto = new TEStudentExamRecordVideoMessageDto((String) json.get(SystemConstant.VIDEO_SOURCE), tOeExamRecord.getFirstStartTime(), tOeExamRecord.getFinishTime(), (String) json.get(SystemConstant.VIDEO_URL));
|
|
- if (Objects.nonNull(monitorVideoSource)) {
|
|
|
|
- if (MonitorVideoSourceEnum.valueOf(teStudentExamRecordVideoMessageDto.getVideoSource()) == monitorVideoSource) {
|
|
|
|
|
|
+ if (Objects.nonNull(monitorRecord)) {
|
|
|
|
+ if (MonitorVideoSourceEnum.valueOf(teStudentExamRecordVideoMessageDto.getVideoSource()) == monitorRecord) {
|
|
teStudentExamRecordVideoMessageDtoList.add(teStudentExamRecordVideoMessageDto);
|
|
teStudentExamRecordVideoMessageDtoList.add(teStudentExamRecordVideoMessageDto);
|
|
break;
|
|
break;
|
|
}
|
|
}
|