Merge remote-tracking branch 'origin/master'

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/ExamRoomStudentRelationController.java

@@ -57,6 +57,13 @@ public class ExamRoomStudentRelationController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation("开始考试")
+    @PostMapping(value = "/actionExam")
+    public HttpResponseResult actionExam(Long examRoomStudentRelationId) {
+        examRoomStudentRelationService.actionExam(examRoomStudentRelationId);
+        return succeed();
+    }
+
     @ApiOperation("监考端指定学员去录播")
     @PostMapping(value = "/webRecorded")
     public HttpResponseResult webRecorded(Long nextExamRoomStudentRelationId,Long examRoomStudentRelationId,Long roomId) {

edu-user/edu-user-server/src/main/java/com/keao/edu/user/enums/ExamStatusEnum.java

@@ -14,8 +14,8 @@ public enum ExamStatusEnum implements BaseEnum<String, ExamStatusEnum> {
     EXAM_ING("EXAM_ING", "考试中", 5),
     EXAM_END("EXAM_END", "考试结束", 6),
     RESULT_CONFIRM("RESULT_CONFIRM", "确认考试结果", 7),
-    CLOSE("CLOSE", "关闭", 7),
-    DELETE("DELETE", "删除", 7);
+    CLOSE("CLOSE", "关闭", 8),
+    DELETE("DELETE", "删除", 9);
 
     private String code;
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/ExamRoomStudentRelationService.java

@@ -147,4 +147,10 @@ public interface ExamRoomStudentRelationService extends BaseService<Long, ExamRo
      * @param videoUrl
      */
     void stuEndRecord(Long examRegistrationId, String videoUrl);
+
+    /**
+     * 开始考试
+     * @param examRoomStudentRelationId
+     */
+    void actionExam(Long examRoomStudentRelationId);
 }

edu-user/edu-user-server/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -381,6 +381,16 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void actionExam(Long examRoomStudentRelationId) {
+		ExamRoomStudentRelation examRoomStudentRelation = examRoomStudentRelationDao.get(examRoomStudentRelationId);
+		examRoomStudentRelation.setClassroomSwitch(1);
+		examRoomStudentRelationDao.update(examRoomStudentRelation);
+		publishMessage(examRoomStudentRelation,MemberChangedMessage.Student_Queue,true);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void nextBit(Long nextExamRoomStudentRelationId, Long currentExamRoomStudentRelationId, Integer examStatus,Long examRoomId) {
 		Boolean isPush = true;
 		if(currentExamRoomStudentRelationId != null){