Merge remote-tracking branch 'origin/master'

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

@@ -738,10 +738,17 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 	}
 
 	public PublishMessageDto getPublishMessage(Long examRegistrationId){
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
+
 		ExamRoomStudentRelation examRoomStudentRelation = examRoomStudentRelationDao.getStudentExamRoom(examRegistrationId);
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		String userId;
+		if(sysUser == null || sysUser.getId() == null){
+			ExamRoom examRoom = examRoomDao.get(examRoomStudentRelation.getExamRoomId());
+			userId = examRoom.getMainTeacherUserId().toString();
+		}else {
+			userId = sysUser.getId().toString();
+		}
 		PublishMessageDto publishMessageDto = new PublishMessageDto();
-		String userId = sysUser.getId().toString();
 		publishMessageDto.setUserId(userId);
 		publishMessageDto.setRoomId(examRoomStudentRelation.getExamRoomId().toString());
 		MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Student_Queue, examRoomStudentRelation.getStudentId().toString(),3);

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

@@ -280,7 +280,7 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 					}
 					studentExamResult.setVideoUrl(videoUrl);
 					studentExamResultDao.update(studentExamResult);
-//					imFeignService.publishMessage(examRoomStudentRelationService.getPublishMessage(registrationId));
+					imFeignService.publishMessage(examRoomStudentRelationService.getPublishMessage(registrationId));
 				}
 			}
 		}