Merge remote-tracking branch 'origin/master'

edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/IMHelper.java

@@ -245,7 +245,7 @@ public class IMHelper {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("mode",3);
         jsonObject.put("videoFormat","mp4");
-        jsonObject.put("audioFormat","mp3");
+        jsonObject.put("audioFormat","aac");
         jsonObject.put("videoResolution","640x480");
         jsonObject.put("mixLayout",2);
         jsonObject.put("sliceMin",30);
@@ -387,7 +387,7 @@ public class IMHelper {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("mode",3);
         jsonObject.put("videoFormat","mp4");
-        jsonObject.put("audioFormat","mp3");
+        jsonObject.put("audioFormat","aac");
         jsonObject.put("videoResolution","640x480");
         jsonObject.put("mixLayout",2);
         jsonObject.put("sliceMin",30);

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -492,7 +492,7 @@ public class RoomServiceImpl implements RoomService {
 //        this.publishMessage(eduUserFeignService.getPublishMessage(registrationId));
         if(registrationId != null){
             eduUserFeignService.upsetStudentAttendance(registrationId,1);
-//            imHelper.stopRecord(roomId);
+            imHelper.stopRecord(userId,roomId);
         }else {
             eduUserFeignService.upsetTeacherAttendance(Long.parseLong(roomId),Integer.parseInt(userId),1);
         }
@@ -692,7 +692,7 @@ public class RoomServiceImpl implements RoomService {
                 }
                 roomMemberDao.deleteUserByRidAndUid(e.getRid(), e.getUid());
                 userDao.deleteByUid(e.getUid());
-                if("3".equals(e.getRid())){
+                if("3".equals(e.getRole())){
                     try {
                         eduUserFeignService.upsetStudentAttendance(e.getExamRegistrationId(),1);
                         imHelper.stopRecord(e.getUid(),e.getRid());

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamRoomServiceImpl.java

@@ -884,6 +884,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			throw new BizException("考场不存在");
 		}
 		examRoom.setOpenFlag(0);
+		examRoom.setExamFlag(0);
 //		imFeignService.dismissGroup(examRoom.getMainTeacherUserId().toString(),examRoomId.toString());
 		imFeignService.destroyRoom(examRoomId,examRoom.getMainTeacherUserId().toString());
 		examRoomDao.update(examRoom);

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

@@ -424,7 +424,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 					HashMap<Integer, String> map = new HashMap<>();
 					map.put(studentListDto.getStudentId(),studentListDto.getStudentId().toString());
 					String url = "3?examRegistrationId=" + studentListDto.getExamRegistrationId();
-					sysMessageService.batchSendMessage(MessageTypeEnum.EXAM_WILL_START_PUSH,map,null,null,url, JiguangPushPlugin.PLUGIN_NAME);
+					sysMessageService.batchSendMessage(MessageTypeEnum.EXAM_WILL_START_PUSH,map,null,null,url, JiguangPushPlugin.PLUGIN_NAME,actionExamPush);
 				}
 			}
 			//将当前学员退踢出教室
@@ -578,7 +578,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 					HashMap<Integer, String> map = new HashMap<>();
 					map.put(studentListDto.getStudentId(),studentListDto.getStudentId().toString());
 					String url = "3?examRegistrationId=" + studentListDto.getExamRegistrationId();
-					sysMessageService.batchSendMessage(MessageTypeEnum.EXAM_WILL_START_PUSH,map,null,null,url, JiguangPushPlugin.PLUGIN_NAME);
+					sysMessageService.batchSendMessage(MessageTypeEnum.EXAM_WILL_START_PUSH,map,null,null,url, JiguangPushPlugin.PLUGIN_NAME,actionExamPush);
 				}
 			}
 		}

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamReviewMapper.xml

@@ -234,9 +234,9 @@
     <select id="getCloseFlag" resultType="java.lang.Integer">
 		SELECT
 		IF(((SELECT COUNT(id) FROM rongyun_room_member WHERE role != 3 AND rid = #{examRoomId}) *
-		(SELECT COUNT(id_) FROM student_exam_result ser WHERE exam_room_id_ = #{examRoomId} AND ser.is_finished_exam_ = 5)) &lt; COUNT(DISTINCT er.id_),0,1) closeFlag
+		(SELECT COUNT(id_) FROM student_exam_result ser WHERE exam_room_id_ = #{examRoomId} AND ser.is_finished_exam_ = 5)) > COUNT(DISTINCT er.id_),0,1) closeFlag
 		FROM rongyun_room_member rrm
 		LEFT JOIN exam_review er ON er.exam_room_id_ = rrm.rid
-		WHERE rrm.uid = er.teacher_id_ AND rrm.role != 3 AND rrm.rid = #{examRoomId};
+		WHERE rrm.uid = er.teacher_id_ AND rrm.role != 3 AND rrm.rid = #{examRoomId}
 	</select>
 </mapper>