Browse Source

http请求方式修改

wangliang 4 years ago
parent
commit
cde1a4ccd7

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

@@ -17,6 +17,11 @@ public class TEExamActivityDto implements Serializable {
     private Long examStudentId;//考生id
     private String courseCode;//科目代码
     private String courseName;//科目名称
+    private Long prepareTime;
+    private Long minStartTime;
+    private Long maxStartTime;
+    private Long maxFinishTime;
+    private String monitorVideoSource;
     private Long openingSeconds;//允许开考开放时长(分钟),相当于迟到时间
     private Long activityOpeningSeconds;//允许开考开放时长(分钟),相当于迟到时间
     private Long prepareSeconds;//提前多长时间开始候考(分钟)
@@ -41,6 +46,46 @@ public class TEExamActivityDto implements Serializable {
     private Date startTime;//考场开始时间
     private Date finishTime;//考场结束时间
 
+    public Long getPrepareTime() {
+        return prepareTime;
+    }
+
+    public void setPrepareTime(Long prepareTime) {
+        this.prepareTime = prepareTime;
+    }
+
+    public Long getMinStartTime() {
+        return minStartTime;
+    }
+
+    public void setMinStartTime(Long minStartTime) {
+        this.minStartTime = minStartTime;
+    }
+
+    public Long getMaxStartTime() {
+        return maxStartTime;
+    }
+
+    public void setMaxStartTime(Long maxStartTime) {
+        this.maxStartTime = maxStartTime;
+    }
+
+    public Long getMaxFinishTime() {
+        return maxFinishTime;
+    }
+
+    public void setMaxFinishTime(Long maxFinishTime) {
+        this.maxFinishTime = maxFinishTime;
+    }
+
+    public String getMonitorVideoSource() {
+        return monitorVideoSource;
+    }
+
+    public void setMonitorVideoSource(String monitorVideoSource) {
+        this.monitorVideoSource = monitorVideoSource;
+    }
+
     public Long getId() {
         return id;
     }

+ 5 - 0
themis-business/src/main/resources/mapper/TEExamActivityMapper.xml

@@ -87,6 +87,11 @@
             teec.course_name as courseName,
             tee.opening_seconds as openingSeconds,
             teea.opening_seconds as activityOpeningSeconds,
+            UNIX_TIMESTAMP(date_sub(teea.start_time, interval IFNULL(teea.prepare_seconds, tee.prepare_seconds) second)) * 1000 as prepareTime,
+            UNIX_TIMESTAMP(date_add(teea.start_time, interval tee.min_duration_seconds second)) * 1000 as minStartTime,
+            UNIX_TIMESTAMP(date_add(teea.start_time, interval IFNULL(teea.max_duration_seconds, tee.max_duration_seconds) second)) * 1000 as maxStartTime,
+            UNIX_TIMESTAMP(IFNULL(teea.finish_time , tee.end_time)) * 1000 as maxFinishTime,
+            tee.monitor_video_source as monitorVideoSource,
             tee.prepare_seconds as prepareSeconds,
             teea.prepare_seconds as activityPrepareSeconds,
             tee.min_duration_seconds as minDurationSeconds,