Browse Source

新增学生视频监考回放查询兼容之前版本数据

wangliang 2 năm trước cách đây
mục cha
commit
b7129c5a67

+ 2 - 2
themis-admin/src/main/java/com/qmth/themis/admin/api/TEStudentController.java

@@ -138,11 +138,11 @@ public class TEStudentController {
     @RequestMapping(value = "/exam_record/video/query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "学生视频监考回放信息", response = TOeExamRecord.class)})
     public Result examRecordVideoQuery(@ApiParam(value = "考试记录id", required = true) @RequestParam(required = true) Long examRecordId,
-                                       @ApiParam(value = "视频源") @RequestParam(required = false) MonitorVideoSourceEnum monitorVideoSource,
+                                       @ApiParam(value = "视频源") @RequestParam(required = false) MonitorVideoSourceEnum monitorRecord,
                                        @ApiParam(value = "是否查询轨迹日志") @RequestParam(required = false) Boolean log,
                                        @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) int pageNumber,
                                        @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) int pageSize) {
-        return ResultUtil.ok(teStudentService.examRecordVideoQuery(new Page<>(pageNumber, pageSize), examRecordId, monitorVideoSource, log));
+        return ResultUtil.ok(teStudentService.examRecordVideoQuery(new Page<>(pageNumber, pageSize), examRecordId, monitorRecord, log));
     }
 
     @ApiOperation(value = "底照上传")

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/dao/TEStudentMapper.java

@@ -49,8 +49,8 @@ public interface TEStudentMapper extends CustomBaseMapper<TEStudent> {
      *
      * @param iPage
      * @param examRecordId
-     * @param monitorVideoSource
+     * @param monitorRecord
      * @return
      */
-    public IPage<TEStudentExamRecordVideoMessageDto> examRecordVideoQuery(IPage<Map> iPage, @Param("examRecordId") Long examRecordId, @Param("monitorVideoSource") String monitorVideoSource);
+    public IPage<TEStudentExamRecordVideoMessageDto> examRecordVideoQuery(IPage<Map> iPage, @Param("examRecordId") Long examRecordId, @Param("monitorRecord") String monitorRecord);
 }

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/service/TEStudentService.java

@@ -68,9 +68,9 @@ public interface TEStudentService extends IService<TEStudent> {
      *
      * @param iPage
      * @param examRecordId
-     * @param monitorVideoSource
+     * @param monitorRecord
      * @param log
      * @return
      */
-    public TEStudentExamRecordVideoDto examRecordVideoQuery(IPage<Map> iPage, Long examRecordId, MonitorVideoSourceEnum monitorVideoSource, Boolean log);
+    public TEStudentExamRecordVideoDto examRecordVideoQuery(IPage<Map> iPage, Long examRecordId, MonitorVideoSourceEnum monitorRecord, Boolean log);
 }

+ 5 - 5
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEStudentServiceImpl.java

@@ -154,12 +154,12 @@ public class TEStudentServiceImpl extends ServiceImpl<TEStudentMapper, TEStudent
      *
      * @param iPage
      * @param examRecordId
-     * @param monitorVideoSource
+     * @param monitorRecord
      * @param log
      * @return
      */
     @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);
         ExamCacheBean examCacheBean = null;
         ExamStudentCacheBean examStudentCacheBean = null;
@@ -178,15 +178,15 @@ public class TEStudentServiceImpl extends ServiceImpl<TEStudentMapper, TEStudent
 
         IPage<TEStudentExamRecordVideoMessageDto> teStudentExamRecordVideoMessageDtoIPage = null;
         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 {
             JSONArray jsonArray = JSONArray.parseArray(tOeExamRecord.getTencentVideoUrl());
             List<TEStudentExamRecordVideoMessageDto> teStudentExamRecordVideoMessageDtoList = new ArrayList<>(jsonArray.size());
             for (int i = 0; i < jsonArray.size(); 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));
-                if (Objects.nonNull(monitorVideoSource)) {
-                    if (MonitorVideoSourceEnum.valueOf(teStudentExamRecordVideoMessageDto.getVideoSource()) == monitorVideoSource) {
+                if (Objects.nonNull(monitorRecord)) {
+                    if (MonitorVideoSourceEnum.valueOf(teStudentExamRecordVideoMessageDto.getVideoSource()) == monitorRecord) {
                         teStudentExamRecordVideoMessageDtoList.add(teStudentExamRecordVideoMessageDto);
                         break;
                     }

+ 2 - 2
themis-business/src/main/resources/mapper/TEStudentMapper.xml

@@ -101,8 +101,8 @@
             <if test="examRecordId != null and examRecordId != ''">
                 and toer.id = #{examRecordId}
             </if>
-            <if test="monitorVideoSource != null and monitorVideoSource != ''">
-                and tmtvm.video_source like concat('%', #{monitorVideoSource})
+            <if test="monitorRecord != null and monitorRecord != ''">
+                and tmtvm.video_source like concat('%', #{monitorRecord})
             </if>
         </where>
     </select>