Преглед изворни кода

mobilePhotoUploadBUG修复

wangliang пре 2 година
родитељ
комит
29c27c5f01

+ 7 - 7
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamActivityServiceImpl.java

@@ -200,6 +200,12 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
                 teExamActivityDto.setInProcessLivenessFixedRange(inProcessLivenessFixedRange);
             }
         }
+        //取course缓存
+        ExamCourseCacheBean examCourseCacheBean = teExamCourseService
+                .getExamCourseCacheBean(teExamActivityDto.getExamId(), courseCode);
+        if (Objects.nonNull(examCourseCacheBean) && Objects.nonNull(examCourseCacheBean.getMobilePhotoUpload())) {
+            teExamActivityDto.setMobilePhotoUpload(examCourseCacheBean.getMobilePhotoUpload());
+        }
         if (Objects.nonNull(teExamActivityDto.getMonitorVideoSourceStr()) && !Objects
                 .equals(teExamActivityDto.getMonitorVideoSourceStr().toString().trim().replaceAll(" ", ""), "")) {
             Map<String, String> monitorRecordMap = null;
@@ -208,7 +214,6 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
                 monitorRecordMap = monitorRecordList.stream()
                         .collect(Collectors.toMap(Function.identity(), s -> s));
             }
-
             List<String> videoSources = Arrays.asList(teExamActivityDto.getMonitorVideoSourceStr().trim().toUpperCase().replaceAll(" ", "").split(","));
             List<MonitorStreamDto> monitorStreamDtoList = new ArrayList<>();
             Map<String, String> finalMonitorRecordMap = monitorRecordMap;
@@ -222,12 +227,7 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
             });
             teExamActivityDto.setMonitorVideoSource(monitorStreamDtoList);
             teExamActivityDto.setMonitorAudioEnable(examCache.getMonitorAudioEnable());
-            //取course缓存
-            ExamCourseCacheBean examCourseCacheBean = teExamCourseService
-                    .getExamCourseCacheBean(teExamActivityDto.getExamId(), courseCode);
-            if (Objects.nonNull(examCourseCacheBean) && Objects.nonNull(examCourseCacheBean.getMobilePhotoUpload())) {
-                teExamActivityDto.setMobilePhotoUpload(examCourseCacheBean.getMobilePhotoUpload());
-            }
+
             //加入hardwareTest逻辑
             if (teExamActivityDto.getMonitorVideoSourceStr().toUpperCase().contains(MonitorVideoSourceEnum.CLIENT_CAMERA.name())
                     || (Objects.nonNull(teExamActivityDto.getEntryAuthenticationPolicy()) && (