代码重构

examcloud-core-oe-student-api/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/request/GetQrCodeReq.java

@@ -13,6 +13,8 @@ public class GetQrCodeReq extends BaseRequest {
 
 	private Long examStudentId;
 	private String questionId;
+	//获取token的key
+	private String tokenKey;
 
 	public Long getExamRecordDataId() {
 		return examRecordDataId;
@@ -38,4 +40,12 @@ public class GetQrCodeReq extends BaseRequest {
 		this.questionId = questionId;
 	}
 
+	public String getTokenKey() {
+		return tokenKey;
+	}
+
+	public void setTokenKey(String tokenKey) {
+		this.tokenKey = tokenKey;
+	}
+
 }

examcloud-core-oe-websocket-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/websocket/api/client/AudioAnswerWebsocketCloudServiceClient.java

@@ -4,6 +4,7 @@ import org.springframework.stereotype.Service;
 
 import cn.com.qmth.examcloud.core.oe.websocket.api.AudioAnswerWebsocketCloudService;
 import cn.com.qmth.examcloud.core.oe.websocket.api.request.SendAudioAnswerMessageReq;
+import cn.com.qmth.examcloud.core.oe.websocket.api.request.SendScanQrCodeMessageReq;
 
 
 @Service("audioAnswerWebsocketCloudService")
@@ -15,8 +16,15 @@ public class AudioAnswerWebsocketCloudServiceClient extends AbstractCloudClientS
 	private static final long serialVersionUID = -183204183805080432L;
 
 	@Override
-	public void sendMessage(SendAudioAnswerMessageReq sendMessageReq) throws Exception {
-		post("audioAnswerWebsocket/sendMessage",sendMessageReq);
+	public void sendAudioAnswerMessage(SendAudioAnswerMessageReq sendMessageReq) throws Exception {
+		post("audioAnswerWebsocket/sendAudioAnswerMessage",sendMessageReq);
 	}
 
+	@Override
+	public void sendScanQrCodeMessage(SendScanQrCodeMessageReq sendScanQrCodeMessageReq) {
+		post("audioAnswerWebsocket/sendScanQrCodeMessage",sendScanQrCodeMessageReq);
+		
+	}
+
+
 }

examcloud-core-oe-websocket-api/src/main/java/cn/com/qmth/examcloud/core/oe/websocket/api/AudioAnswerWebsocketCloudService.java

@@ -1,11 +1,22 @@
 package cn.com.qmth.examcloud.core.oe.websocket.api;
-
 import cn.com.qmth.examcloud.api.commons.CloudService;
 import cn.com.qmth.examcloud.core.oe.websocket.api.request.SendAudioAnswerMessageReq;
+import cn.com.qmth.examcloud.core.oe.websocket.api.request.SendScanQrCodeMessageReq;
 
 
 public interface AudioAnswerWebsocketCloudService extends CloudService{
 
-	public void sendMessage(SendAudioAnswerMessageReq sendMessageReq) throws Exception;
-	
+	/**
+	 * 发送音频答案
+	 * @param sendMessageReq
+	 * @throws Exception
+	 */
+	public void sendAudioAnswerMessage(SendAudioAnswerMessageReq sendAudioAnswerMessageReq) throws Exception;
+	/**
+	 * 发送微信扫码状态信息
+	 * @param eventType
+	 * @param examRecordDataId
+	 * @param questionId
+	 */
+	public void sendScanQrCodeMessage(SendScanQrCodeMessageReq sendScanQrCodeMessageReq);
 }

examcloud-core-oe-websocket-api/src/main/java/cn/com/qmth/examcloud/core/oe/websocket/api/request/SendAudioAnswerMessageReq.java

@@ -1,10 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.websocket.api.request;
 
-import java.util.Map;
-
-import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
-
-public class SendAudioAnswerMessageReq extends BaseRequest{
+public class SendAudioAnswerMessageReq extends SendMessageBaseReq{
 
 	/**
 	 * 
@@ -13,43 +9,19 @@ public class SendAudioAnswerMessageReq extends BaseRequest{
 
 	//事件类型
 	private String eventType;
-	//数据对象
-	private Map<String,Object> data;
 	//考试记录id
 	private Long examRecordDataId;
-//	//题目id
-//	private Long questionId;
-//	//音频文件地址
-//	private String audioFileUrl;
 	public Long getExamRecordDataId() {
 		return examRecordDataId;
 	}
 	public void setExamRecordDataId(Long examRecordDataId) {
 		this.examRecordDataId = examRecordDataId;
 	}
-//	public Long getQuestionId() {
-//		return questionId;
-//	}
-//	public void setQuestionId(Long questionId) {
-//		this.questionId = questionId;
-//	}
-//	public String getAudioFileUrl() {
-//		return audioFileUrl;
-//	}
-//	public void setAudioFileUrl(String audioFileUrl) {
-//		this.audioFileUrl = audioFileUrl;
-//	}
 	public String getEventType() {
 		return eventType;
 	}
 	public void setEventType(String eventType) {
 		this.eventType = eventType;
 	}
-	public Map<String, Object> getData() {
-		return data;
-	}
-	public void setData(Map<String, Object> data) {
-		this.data = data;
-	}
 
 }

examcloud-core-oe-websocket-api/src/main/java/cn/com/qmth/examcloud/core/oe/websocket/api/request/SendMessageBaseReq.java

@@ -0,0 +1,37 @@
+package cn.com.qmth.examcloud.core.oe.websocket.api.request;
+
+import java.util.Map;
+
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+
+public class SendMessageBaseReq  extends BaseRequest {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2830007443650198359L;
+	//成功或失败
+	private Boolean isSuccess;
+	//数据对象
+	private Map<String,Object> data;
+	//错误消息
+	private String errorMessage;
+	public Boolean getIsSuccess() {
+		return isSuccess;
+	}
+	public void setIsSuccess(Boolean isSuccess) {
+		this.isSuccess = isSuccess;
+	}
+	public Map<String, Object> getData() {
+		return data;
+	}
+	public void setData(Map<String, Object> data) {
+		this.data = data;
+	}
+	public String getErrorMessage() {
+		return errorMessage;
+	}
+	public void setErrorMessage(String errorMessage) {
+		this.errorMessage = errorMessage;
+	}
+	
+}

examcloud-core-oe-websocket-api/src/main/java/cn/com/qmth/examcloud/core/oe/websocket/api/request/SendScanQrCodeMessageReq.java

@@ -0,0 +1,28 @@
+package cn.com.qmth.examcloud.core.oe.websocket.api.request;
+
+public class SendScanQrCodeMessageReq extends SendMessageBaseReq{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3147167204808636817L;
+
+	//事件类型
+	private String eventType;
+	
+	//考试记录id
+	private Long examRecordDataId;
+	
+	public String getEventType() {
+		return eventType;
+	}
+	public void setEventType(String eventType) {
+		this.eventType = eventType;
+	}
+	public Long getExamRecordDataId() {
+		return examRecordDataId;
+	}
+	public void setExamRecordDataId(Long examRecordDataId) {
+		this.examRecordDataId = examRecordDataId;
+	}
+}