|
@@ -1,6 +1,5 @@
|
|
|
package com.keao.edu.user.service.impl;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
import com.keao.edu.auth.api.client.SysUserFeignService;
|
|
|
import com.keao.edu.auth.api.entity.SysUser;
|
|
|
import com.keao.edu.common.dal.BaseDAO;
|
|
@@ -648,14 +647,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
//当前用户是呼叫中或者考试中
|
|
|
if(roomStudentListDto.getFinishedExam() == 0 || roomStudentListDto.getFinishedExam() == 1){
|
|
|
- boolean isPush = true;
|
|
|
- if(roomStudentListDtos.size() > 1){
|
|
|
- RoomStudentListDto roomStudentListDto1 = roomStudentListDtos.get(1);
|
|
|
- if(roomStudentListDto1.getFinishedExam() == 2){
|
|
|
- isPush = false;
|
|
|
- }
|
|
|
- }
|
|
|
- currentStudent(roomStudentListDto.getExamRoomStudentRelationId(),isPush,examStatus,sysUser.getId());
|
|
|
+ currentStudent(roomStudentListDto.getExamRoomStudentRelationId(),true,examStatus,sysUser.getId());
|
|
|
//考试中
|
|
|
if(roomStudentListDtos.size() > 1){
|
|
|
RoomStudentListDto roomStudentListDto1 = roomStudentListDtos.get(1);
|
|
@@ -688,13 +680,12 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
|
|
|
private void currentStudent(Long examRoomStudentRelationId,Boolean isPush,Integer examStatus,Integer operator){
|
|
|
ExamRoomStudentRelation examRoomStudentRelation = examRoomStudentRelationDao.get(examRoomStudentRelationId);
|
|
|
//将当前学员退出教室并添加参考状态,如果考试未完成,清除签到时间,重新签到
|
|
|
-//
|
|
|
if(examStatus != null && examStatus == 0){
|
|
|
//未完成
|
|
|
examRoomStudentRelationDao.cleanSignInTime(examRoomStudentRelation.getExamRegistrationId());
|
|
|
examRoomStudentRelation.setSignInTime(null);
|
|
|
studentExamResultDao.updateFinishedExam(examRoomStudentRelation.getExamRegistrationId(),3);
|
|
|
- publishMessage(examRoomStudentRelation,MemberChangedMessage.Not_Finish,isPush,operator);
|
|
|
+ publishMessage(examRoomStudentRelation,MemberChangedMessage.Not_Finish,true,operator);
|
|
|
HashMap<Integer, String> map = new HashMap<>(1);
|
|
|
map.put(examRoomStudentRelation.getStudentId(),examRoomStudentRelation.getStudentId().toString());
|
|
|
ExaminationBasic examinationBasic = examinationBasicDao.get(examRoomStudentRelation.getExaminationBasicId());
|
|
@@ -719,7 +710,6 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
|
|
|
map.put(examRoomStudentRelation.getStudentId(),examRoomStudentRelation.getStudentId().toString());
|
|
|
String url = "3?examRegistrationId=" + examRoomStudentRelation.getExamRegistrationId();
|
|
|
sysMessageService.batchSendMessage(MessageTypeEnum.EXAM_STARTED_PUSH,map,null,0,url,JiguangPushPlugin.PLUGIN_NAME);
|
|
|
-
|
|
|
//状态变更为呼叫中
|
|
|
studentExamResultDao.updateFinishedExam(examRoomStudentRelation.getExamRegistrationId(),1);
|
|
|
publishMessage(examRoomStudentRelation,MemberChangedMessage.Student_Queue,isPush,operator);
|