wangliang 4 yıl önce
ebeveyn
işleme
47b7d5c24d

+ 4 - 1
themis-backend/src/main/java/com/qmth/themis/backend/api/TIeInvigilateController.java

@@ -194,6 +194,7 @@ public class TIeInvigilateController {
         }
         //获取考试记录缓存
         Map<String, Object> objectMap = redisUtil.getHashEntries(RedisKeyHelper.examRecordCacheKey(examRecordId));
+        String examName = String.valueOf(objectMap.get("name"));
         Long examId = Long.parseLong(String.valueOf(objectMap.get("examId")));
         Long examStudentId = Long.parseLong(String.valueOf(objectMap.get("examStudentId")));
         Long examActivityId = Long.parseLong(String.valueOf(objectMap.get("examActivityId")));
@@ -206,7 +207,9 @@ public class TIeInvigilateController {
         String roomCode = examStudentCacheBean.getRoomCode();
         String roomName = examStudentCacheBean.getRoomName();
         Long studentId = examStudentCacheBean.getStudentId();
-        InvigilateListDetailBean invigilateListDetailBean = new InvigilateListDetailBean(examId, examActivityId, examStudentId, examRecordId, identity, examStudentName, courseNameCode, status, roomCode, roomName, breachStatus);
+        ExamActivityCacheBean examActivityCacheBean = teExamActivityService.getExamActivityCacheBean(examActivityId);
+
+        InvigilateListDetailBean invigilateListDetailBean = new InvigilateListDetailBean(examName, examActivityCacheBean.getCode(), examId, examActivityId, examStudentId, examRecordId, identity, examStudentName, courseNameCode, status, roomCode, roomName, breachStatus);
 
         //预警、异常、人脸
         //预警

+ 23 - 1
themis-business/src/main/java/com/qmth/themis/business/bean/backend/InvigilateListBean.java

@@ -13,7 +13,13 @@ import java.util.Date;
 @ApiModel("实时监控台返回对象")
 public class InvigilateListBean implements Serializable {
 
-    @ApiModelProperty(name = "考试id")
+    @ApiModelProperty(name = "考试批次名称")
+    private String examName;
+
+    @ApiModelProperty(name = "场次code")
+    private String examActivityCode;
+
+    @ApiModelProperty(name = "考试批次id")
     private Long examId;
 
     @ApiModelProperty(name = "场次id")
@@ -79,6 +85,22 @@ public class InvigilateListBean implements Serializable {
     @ApiModelProperty(name = "新增预警")
     private Integer warningNew;
 
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public String getExamActivityCode() {
+        return examActivityCode;
+    }
+
+    public void setExamActivityCode(String examActivityCode) {
+        this.examActivityCode = examActivityCode;
+    }
+
     public Integer getWarningNew() {
         return warningNew;
     }

+ 25 - 1
themis-business/src/main/java/com/qmth/themis/business/bean/backend/InvigilateListDetailBean.java

@@ -20,6 +20,12 @@ import java.util.List;
 @ApiModel("实时监控台明细返回对象")
 public class InvigilateListDetailBean implements Serializable {
 
+    @ApiModelProperty(name = "考试批次名称")
+    private String examName;
+
+    @ApiModelProperty(name = "场次code")
+    private String examActivityCode;
+
     @ApiModelProperty(name = "考试id")
     private Long examId;
 
@@ -78,7 +84,9 @@ public class InvigilateListDetailBean implements Serializable {
 
     }
 
-    public InvigilateListDetailBean(Long examId, Long examActivityId, Long examStudentId, Long examRecordId, String identity, String examStudentName, String courseNameCode, ExamRecordStatusEnum statusCode, String roomCode, String roomName, Integer breachStatus) {
+    public InvigilateListDetailBean(String examName, String examActivityCode, Long examId, Long examActivityId, Long examStudentId, Long examRecordId, String identity, String examStudentName, String courseNameCode, ExamRecordStatusEnum statusCode, String roomCode, String roomName, Integer breachStatus) {
+        this.examName = examName;
+        this.examActivityCode = examActivityCode;
         this.examId = examId;
         this.examActivityId = examActivityId;
         this.examStudentId = examStudentId;
@@ -92,6 +100,22 @@ public class InvigilateListDetailBean implements Serializable {
         this.breachStatus = breachStatus;
     }
 
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public String getExamActivityCode() {
+        return examActivityCode;
+    }
+
+    public void setExamActivityCode(String examActivityCode) {
+        this.examActivityCode = examActivityCode;
+    }
+
     public String getRoomName() {
         return roomName;
     }

+ 22 - 0
themis-business/src/main/java/com/qmth/themis/business/bean/backend/InvigilateListHistoryBean.java

@@ -18,6 +18,12 @@ import java.util.Date;
 @ApiModel("监考明细管理列表返回对象")
 public class InvigilateListHistoryBean implements Serializable {
 
+    @ApiModelProperty(name = "考试批次名称")
+    private String examName;
+
+    @ApiModelProperty(name = "场次code")
+    private String examActivityCode;
+
     @ApiModelProperty(name = "考试id")
     private Long examId;
 
@@ -66,6 +72,22 @@ public class InvigilateListHistoryBean implements Serializable {
     @ApiModelProperty(name = "更新时间")
     private Date updateTime;
 
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public String getExamActivityCode() {
+        return examActivityCode;
+    }
+
+    public void setExamActivityCode(String examActivityCode) {
+        this.examActivityCode = examActivityCode;
+    }
+
     public FinishTypeEnum getFinishType() {
         return finishType;
     }

+ 22 - 0
themis-business/src/main/java/com/qmth/themis/business/bean/backend/InvigilateListPatrolBean.java

@@ -17,6 +17,12 @@ import java.util.Date;
 @ApiModel("在线巡考返回对象")
 public class InvigilateListPatrolBean implements Serializable {
 
+    @ApiModelProperty(name = "考试批次名称")
+    private String examName;
+
+    @ApiModelProperty(name = "场次code")
+    private String examActivityCode;
+
     @ApiModelProperty(name = "考试id")
     private Long examId;
 
@@ -62,6 +68,22 @@ public class InvigilateListPatrolBean implements Serializable {
     @ApiModelProperty(name = "虚拟考场名称")
     private String roomName;
 
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public String getExamActivityCode() {
+        return examActivityCode;
+    }
+
+    public void setExamActivityCode(String examActivityCode) {
+        this.examActivityCode = examActivityCode;
+    }
+
     public String getRoomName() {
         return roomName;
     }

+ 22 - 0
themis-business/src/main/java/com/qmth/themis/business/bean/backend/InvigilateListVideoBean.java

@@ -19,6 +19,12 @@ import java.util.Date;
 @ApiModel("实时监控台视频返回对象")
 public class InvigilateListVideoBean implements Serializable {
 
+    @ApiModelProperty(name = "考试批次名称")
+    private String examName;
+
+    @ApiModelProperty(name = "场次code")
+    private String examActivityCode;
+
     @ApiModelProperty(name = "考试id")
     private Long examId;
 
@@ -61,6 +67,22 @@ public class InvigilateListVideoBean implements Serializable {
     @ApiModelProperty(name = "更新时间")
     private Date updateTime;
 
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public String getExamActivityCode() {
+        return examActivityCode;
+    }
+
+    public void setExamActivityCode(String examActivityCode) {
+        this.examActivityCode = examActivityCode;
+    }
+
     public String getRoomName() {
         return roomName;
     }

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

@@ -83,7 +83,9 @@
     <sql id="invigilatePageHead">
         select
             t.exam_id examId,
+            t.name as examName,
             t.exam_activity_id examActivityId,
+            teea.code as examActivityCode,
             t.exam_student_id examStudentId,
             t.id examRecordId,
             s.identity identity,