Selaa lähdekoodia

audioPlay加入主机位检测条件

wangliang 2 vuotta sitten
vanhempi
commit
d74752a7c5

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamActivityDto.java

@@ -8,7 +8,6 @@ import com.qmth.themis.business.cache.bean.ExamCacheBean;
 import com.qmth.themis.business.cache.bean.ExamCourseCacheBean;
 import com.qmth.themis.business.cache.bean.ExamStudentCacheBean;
 import com.qmth.themis.business.constant.SystemConstant;
-import com.qmth.themis.business.entity.TEExamActivity;
 import com.qmth.themis.business.enums.EntryAuthenticationPolicyEnum;
 import com.qmth.themis.business.enums.ExamModeEnum;
 import com.qmth.themis.business.enums.HardwareTestEnum;
@@ -262,7 +261,8 @@ public class TEExamActivityDto implements Serializable {
                 }
                 this.hardwareTest.add(HardwareTestEnum.CAMERA.name());
                 //取course缓存
-                if (Objects.nonNull(examCourseCacheBean) && Objects.nonNull(examCourseCacheBean.getHasAudio()) && examCourseCacheBean.getHasAudio() == 1) {
+                if ((Objects.nonNull(examCourseCacheBean) && Objects.nonNull(examCourseCacheBean.getHasAudio()) && examCourseCacheBean.getHasAudio() == 1)
+                        || monitorVideoSource.toUpperCase().contains(MonitorVideoSourceEnum.CLIENT_CAMERA.name())) {
                     this.hardwareTest.add(HardwareTestEnum.AUDIOPLAY.name());
                 }
             }

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

@@ -240,8 +240,9 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
                 //取course缓存
                 ExamCourseCacheBean examCourseCacheBean = teExamCourseService
                         .getExamCourseCacheBean(teExamActivityDto.getExamId(), courseCode);
-                if (Objects.nonNull(examCourseCacheBean) && Objects.nonNull(examCourseCacheBean.getHasAudio())
-                        && examCourseCacheBean.getHasAudio() == 1) {
+                if ((Objects.nonNull(examCourseCacheBean) && Objects.nonNull(examCourseCacheBean.getHasAudio())
+                        && examCourseCacheBean.getHasAudio() == 1)
+                        || teExamActivityDto.getMonitorVideoSourceStr().toUpperCase().contains(MonitorVideoSourceEnum.CLIENT_CAMERA.name())) {
                     hardwareTest.add(HardwareTestEnum.AUDIOPLAY.name());
                 }
                 teExamActivityDto.setHardwareTest(hardwareTest);