监控源修改

themis-business/src/main/java/com/qmth/themis/business/bean/mobile/MobileAuthorizationMonitorBean.java

@@ -25,7 +25,7 @@ public class MobileAuthorizationMonitorBean extends MobileAuthorizationBean {
     @ApiModelProperty("腾讯云SDK APP ID")
     private String monitorAppId;
 
-    @ApiModelProperty("monitorStreamId")
+    @ApiModelProperty("CDN线路id")
     private String monitorStreamId;
 
     public String getMonitorStreamId() {

themis-business/src/main/java/com/qmth/themis/business/dto/response/StreamDto.java → themis-business/src/main/java/com/qmth/themis/business/dto/response/MonitorStreamDto.java

@@ -6,25 +6,25 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 /**
- * @Description: stream dto
+ * @Description: 监控stream dto
  * @Param:
  * @return:
  * @Author: wangliang
  * @Date: 2021/2/19
  */
-public class StreamDto implements Serializable {
+public class MonitorStreamDto implements Serializable {
 
-    @ApiModelProperty(name = "videoSource")
+    @ApiModelProperty(name = "监控源")
     private MonitorVideoSourceEnum name;
 
-    @ApiModelProperty(name = "streamId")
+    @ApiModelProperty(name = "监控源id")
     private String streamId;
 
-    public StreamDto() {
+    public MonitorStreamDto() {
 
     }
 
-    public StreamDto(MonitorVideoSourceEnum name, String streamId) {
+    public MonitorStreamDto(MonitorVideoSourceEnum name, String streamId) {
         this.name = name;
         this.streamId = streamId;
     }

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

@@ -61,7 +61,7 @@ public class TEExamActivityDto implements Serializable {
     private String monitorVideoSourceStr;
 
     @ApiModelProperty(name = "监控源集合")
-    private List<StreamDto> monitorVideoSource;
+    private List<MonitorStreamDto> monitorVideoSource;
 
     @ApiModelProperty(name = "允许开考开放时长，相当于迟到时间")
     private Integer openingSeconds;//允许开考开放时长(分钟)，相当于迟到时间
@@ -196,11 +196,11 @@ public class TEExamActivityDto implements Serializable {
         this.entryAuthenticationPolicy = entryAuthenticationPolicy;
         if (Objects.nonNull(monitorVideoSource) && !Objects.equals(monitorVideoSource.trim().replaceAll(" ", ""), "")) {
             List<String> videoSources = Arrays.asList(monitorVideoSource.trim().toUpperCase().split(","));
-            List<StreamDto> streamDtoList = new ArrayList<>();
+            List<MonitorStreamDto> monitorStreamDtoList = new ArrayList<>();
             videoSources.forEach(s -> {
-                streamDtoList.add(new StreamDto(MonitorVideoSourceEnum.valueOf(s), prefix + "_" + recordId + "_" + MonitorVideoSourceEnum.valueOf(s).name().toLowerCase()));
+                monitorStreamDtoList.add(new MonitorStreamDto(MonitorVideoSourceEnum.valueOf(s), prefix + "_" + recordId + "_" + MonitorVideoSourceEnum.valueOf(s).name().toLowerCase()));
             });
-            this.setMonitorVideoSource(streamDtoList);
+            this.setMonitorVideoSource(monitorStreamDtoList);
             //加入monitorAudioEnable逻辑
             if (monitorVideoSource.toUpperCase().contains(MonitorVideoSourceEnum.CLIENT_SCREEN.name()) || monitorVideoSource.toUpperCase().contains(MonitorVideoSourceEnum.CLIENT_CAMERA.name())) {
                 this.monitorAudioEnable = true;
@@ -403,11 +403,11 @@ public class TEExamActivityDto implements Serializable {
         this.maxFinishTime = maxFinishTime;
     }
 
-    public List<StreamDto> getMonitorVideoSource() {
+    public List<MonitorStreamDto> getMonitorVideoSource() {
         return monitorVideoSource;
     }
 
-    public void setMonitorVideoSource(List<StreamDto> monitorVideoSource) {
+    public void setMonitorVideoSource(List<MonitorStreamDto> monitorVideoSource) {
         this.monitorVideoSource = monitorVideoSource;
     }
 

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

@@ -8,7 +8,7 @@ import com.qmth.themis.business.cache.bean.ExamCourseCacheBean;
 import com.qmth.themis.business.cache.bean.ExamStudentCacheBean;
 import com.qmth.themis.business.dao.TEExamActivityMapper;
 import com.qmth.themis.business.dto.MqDto;
-import com.qmth.themis.business.dto.response.StreamDto;
+import com.qmth.themis.business.dto.response.MonitorStreamDto;
 import com.qmth.themis.business.dto.response.TEExamActivityDto;
 import com.qmth.themis.business.dto.response.TEExamActivityQueryDto;
 import com.qmth.themis.business.dto.response.TEExamActivityWaitDto;
@@ -186,11 +186,11 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
         if (Objects.nonNull(teExamActivityDto.getMonitorVideoSourceStr()) && !Objects
                 .equals(teExamActivityDto.getMonitorVideoSourceStr().toString().trim().replaceAll(" ", ""), "")) {
             List<String> videoSources = Arrays.asList(teExamActivityDto.getMonitorVideoSourceStr().trim().toUpperCase().replaceAll(" ", "").split(","));
-            List<StreamDto> streamDtoList = new ArrayList<>();
+            List<MonitorStreamDto> monitorStreamDtoList = new ArrayList<>();
             videoSources.forEach(s -> {
-                streamDtoList.add(new StreamDto(MonitorVideoSourceEnum.valueOf(s), prefix + "_" + recordId + "_" + MonitorVideoSourceEnum.valueOf(s).name().toLowerCase()));
+                monitorStreamDtoList.add(new MonitorStreamDto(MonitorVideoSourceEnum.valueOf(s), prefix + "_" + recordId + "_" + MonitorVideoSourceEnum.valueOf(s).name().toLowerCase()));
             });
-            teExamActivityDto.setMonitorVideoSource(streamDtoList);
+            teExamActivityDto.setMonitorVideoSource(monitorStreamDtoList);
             teExamActivityDto.setMonitorAudioEnable(examCache.getMonitorAudioEnable());
             //加入hardwareTest逻辑
             if (teExamActivityDto.getMonitorVideoSourceStr().toUpperCase().contains(MonitorVideoSourceEnum.CLIENT_CAMERA.name())