update

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

@@ -812,6 +812,12 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 		}
 		examRoomDao.update(examRoom);
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		PublishMessageDto publishMessageDto = new PublishMessageDto();
+		publishMessageDto.setUserId(sysUser.getId().toString());
+		publishMessageDto.setRoomId(examRoomId.toString());
+		MemberChangedMessage msg = new MemberChangedMessage(5, sysUser.getId().toString(),3);
+		msg.setAppParamJson(examCertificationService.basicNeedCheckingDetail(examRoomId));
+		publishMessageDto.setMemberChangedMessage(msg);
 		//加群退群
 		if(openFlag == 1){
 			String studentIds = examRoomStudentRelationService.getStudentIds(examRoomId);
@@ -825,18 +831,6 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 				stringBuffer.append(",").append(examRoom.getAssistantTeacherUserIdList());
 			}
 			imFeignService.joinGroup(stringBuffer.toString(),examRoomId.toString(),examRoomId.toString());
-			PublishMessageDto publishMessageDto = new PublishMessageDto();
-			publishMessageDto.setUserId(sysUser.getId().toString());
-			publishMessageDto.setRoomId(examRoomId.toString());
-			MemberChangedMessage msg = new MemberChangedMessage(5, sysUser.getId().toString(),3);
-			msg.setAppParamJson(examCertificationService.basicNeedCheckingDetail(examRoomId));
-//			msg.setWaitNum(0);
-//			msg.setClassroomSwitch(0);
-//			msg.setOpenFlag(openFlag);
-//			Map<String,Object> paramMap = new HashMap<>(1);
-//			paramMap.put("studentQueue",examRoomStudentRelationService.queryNeedCheckingList(examRoomId));
-//			msg.setWebParamJson(JSONObject.toJSONString(paramMap));
-			publishMessageDto.setMemberChangedMessage(msg);
 			imFeignService.publishMessage(publishMessageDto);
 			if(StringUtils.isNotEmpty(studentIds)){
 				List<RoomStudentListDto> roomStudentListDtos = examRoomStudentRelationDao.queryStudentList(examRoomId);
@@ -872,6 +866,7 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 			if(i == 0){
 				throw new BizException("操作失败：还有老师没完成评审");
 			}
+			imFeignService.publishMessage(publishMessageDto);
 //			imFeignService.dismissGroup(sysUser.getId().toString(),examRoomId.toString());
 			studentExamResultService.calculateStudentExamAvgScore(examRoomId);
 			imFeignService.destroyRoom(examRoomId,sysUser.getId().toString());