Merge remote-tracking branch 'origin/master'

edu-im/edu-im-api/src/main/java/com/keao/edu/im/api/entity/MemberChangedMessage.java

@@ -14,7 +14,8 @@ public class MemberChangedMessage extends BaseMessage{
     private String userId;
     private String userName;
     private String roomId;
-    private String appParamJson;
+//    private String appParamJson;
+    private Integer waitNum;
     private String webParamJson;
     private boolean camera;
     private boolean microphone;
@@ -26,14 +27,22 @@ public class MemberChangedMessage extends BaseMessage{
     public MemberChangedMessage() {
     }
 
-    public String getAppParamJson() {
-        return appParamJson;
+    public Integer getWaitNum() {
+        return waitNum;
     }
 
-    public void setAppParamJson(String appParamJson) {
-        this.appParamJson = appParamJson;
+    public void setWaitNum(Integer waitNum) {
+        this.waitNum = waitNum;
     }
 
+//    public String getAppParamJson() {
+//        return appParamJson;
+//    }
+
+//    public void setAppParamJson(String appParamJson) {
+//        this.appParamJson = appParamJson;
+//    }
+
     public String getWebParamJson() {
         return webParamJson;
     }

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

@@ -364,8 +364,10 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		publishMessageDto.setUserId(userId);
 		publishMessageDto.setRoomId(examRoomStudentRelation.getExamRoomId().toString());
 		MemberChangedMessage msg = new MemberChangedMessage(action, userId,3);
-		String jsonString = JSONObject.toJSONString(examCertificationService.needCheckingDetail(examRoomStudentRelation.getExamRegistrationId()));
-		msg.setAppParamJson(jsonString);
+//		String jsonString = JSONObject.toJSONString(examCertificationService.needCheckingDetail(examRoomStudentRelation.getExamRegistrationId()));
+		NeedCheckingDetailDto needCheckingDetailDto = examCertificationService.needCheckingDetail(examRoomStudentRelation.getExamRegistrationId());
+		msg.setWaitNum(needCheckingDetailDto.getWaitNum());
+//		msg.setAppParamJson(jsonString);
 		Map<String,Object> paramMap = new HashMap<>(2);
 		this.queryNeedCheckingList(examRoomStudentRelation.getExamRoomId());
 		paramMap.put("studentQueue",this.queryNeedCheckingList(examRoomStudentRelation.getExamRoomId()));
@@ -382,8 +384,10 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		publishMessageDto.setUserId(userId);
 		publishMessageDto.setRoomId(examRoomStudentRelation.getExamRoomId().toString());
 		MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Student_Queue, userId,3);
-		String jsonString = JSONObject.toJSONString(examCertificationService.needCheckingDetail(examRoomStudentRelation.getExamRegistrationId()));
-		msg.setAppParamJson(jsonString);
+//		String jsonString = JSONObject.toJSONString(examCertificationService.needCheckingDetail(examRoomStudentRelation.getExamRegistrationId()));
+//		msg.setAppParamJson(jsonString);
+		NeedCheckingDetailDto needCheckingDetailDto = examCertificationService.needCheckingDetail(examRoomStudentRelation.getExamRegistrationId());
+		msg.setWaitNum(needCheckingDetailDto.getWaitNum());
 		Map<String,Object> paramMap = new HashMap<>(2);
 		this.queryNeedCheckingList(examRoomStudentRelation.getExamRoomId());
 		paramMap.put("studentQueue",this.queryNeedCheckingList(examRoomStudentRelation.getExamRoomId()));
@@ -424,8 +428,10 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		publishMessageDto.setUserId(userId);
 		publishMessageDto.setRoomId(studentExamRoom.getExamRoomId().toString());
 		MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Student_Queue, userId,3);
-		String jsonString = JSONObject.toJSONString(examCertificationService.needCheckingDetail(examRegistrationId));
-		msg.setAppParamJson(jsonString);
+//		String jsonString = JSONObject.toJSONString(examCertificationService.needCheckingDetail(examRegistrationId));
+		NeedCheckingDetailDto needCheckingDetailDto = examCertificationService.needCheckingDetail(examRegistrationId);
+//		msg.setAppParamJson(needCheckingDetailDto.getWaitNum());
+		msg.setWaitNum(needCheckingDetailDto.getWaitNum());
 		publishMessageDto.setMemberChangedMessage(msg);
 		imFeignService.publishMessage(publishMessageDto);
 	}