recordIdPut

themis-business/src/main/java/com/qmth/themis/business/service/impl/CommonServiceImpl.java

@@ -84,8 +84,8 @@ public class CommonServiceImpl implements CommonService {
                 log.info("score is null ,recordId:" + recordId);
                 //算分未完成的 发送10秒延迟消息
                 Map<String, Object> propMap = mqDtoService.buildMqDelayMsg("10s");
-                propMap.put(SystemConstant.RECORD_ID, String.valueOf(recordId));
-                propMap.put(SystemConstant.STUDENT_ID, String.valueOf(studentId));
+                propMap.put(SystemConstant.RECORD_ID, recordId);
+                propMap.put(SystemConstant.STUDENT_ID, studentId);
                 MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.EXAM_RECORD_PERSISTED.name(),
                         propMap, MqTagEnum.EXAM_RECORD_PERSISTED, recordId.toString(), propMap, recordId.toString());
                 mqDtoService.assembleSendAsyncDelayMsg(mqDto);

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamServiceImpl.java

@@ -1283,8 +1283,8 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
             return;
         }
         Map<String, Object> propMap = mqDtoService.buildMqDelayMsg("10s");
-        propMap.put(SystemConstant.RECORD_ID, String.valueOf(recordId));
-        propMap.put(SystemConstant.STUDENT_ID, String.valueOf(studentId));
+        propMap.put(SystemConstant.RECORD_ID, recordId);
+        propMap.put(SystemConstant.STUDENT_ID, studentId);
         MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.EXAM_RECORD_PERSISTED.name(), propMap,
                 MqTagEnum.EXAM_RECORD_PERSISTED, recordId.toString(), propMap, recordId.toString());
         mqDtoService.assembleSendAsyncDelayMsg(mqDto);

themis-exam/src/main/java/com/qmth/themis/exam/api/TEFaceController.java

@@ -79,8 +79,8 @@ public class TEFaceController {
                 param.getFaceCount(),
                 param.getSimilarity(), param.getRealness(), param.getTime(), param.getException());
         Map<String, Object> transMap = new HashMap<String, Object>();
-        transMap.put(SystemConstant.ID, String.valueOf(ret.getId()));
-        transMap.put(SystemConstant.RECORD_ID, String.valueOf(param.getRecordId()));
+        transMap.put(SystemConstant.ID, ret.getId());
+        transMap.put(SystemConstant.RECORD_ID, param.getRecordId());
         transMap.put(SystemConstant.TYPE, param.getType());
         transMap.put("photoUrl", param.getPhotoUrl());
         transMap.put("faceCount", param.getFaceCount());

themis-exam/src/main/java/com/qmth/themis/exam/api/TELivenessController.java

@@ -78,8 +78,8 @@ public class TELivenessController {
                 param.getActions(), param.getRetry(), param.getStartTime(), param.getFinishTime(),
                 param.getException());
         Map<String, Object> transMap = new HashMap<String, Object>();
-        transMap.put(SystemConstant.ID, String.valueOf(ret.getId()));
-        transMap.put(SystemConstant.RECORD_ID, String.valueOf(param.getRecordId()));
+        transMap.put(SystemConstant.ID, ret.getId());
+        transMap.put(SystemConstant.RECORD_ID, param.getRecordId());
         transMap.put(SystemConstant.TYPE, param.getType());
         transMap.put("actions", param.getActions());
         transMap.put("retry", param.getRetry());

themis-exam/src/main/java/com/qmth/themis/exam/listener/service/impl/MqOeLogicServiceImpl.java

@@ -283,6 +283,7 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
                 clientWebsocketId = tOeExamRecord.getClientWebsocketId();
             }
             Map<String, Object> prop = mqDto.getProperties();
+            prop.put(SystemConstant.RECORD_ID, recordId);
             if (Objects.nonNull(clientWebsocketId) && Objects.nonNull(webSocketMap.get(clientWebsocketId))) {
                 WebSocketOeServer webSocketOeServer = webSocketMap.get(clientWebsocketId);
                 ExamRecordStatusEnum examRecordStatusEnum = ExamRecordCacheUtil.getStatus(recordId);
@@ -308,9 +309,8 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
                                 websocketDto = new WebsocketDto(WebsocketTypeEnum.EXAM_STOP.name(), prop);
                                 webSocketOeServer.sendMessage(websocketDto);
                                 SystemConstant.clientMonitorStatusStop(recordId);
-                                Map<String, Object> properties = mqDto.getProperties();
-                                if (Objects.nonNull(properties) && properties.size() > 0) {
-                                    Boolean removeWebsocket = (Boolean) properties.get(SystemConstant.REMOVE_WEBSOCKET);
+                                if (Objects.nonNull(prop) && prop.size() > 0) {
+                                    Boolean removeWebsocket = (Boolean) prop.get(SystemConstant.REMOVE_WEBSOCKET);
                                     if (Objects.nonNull(removeWebsocket) && removeWebsocket) {
                                         WebSocketOeServer.close(webSocketOeServer);
                                     }
@@ -433,6 +433,8 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
             tOeExamRecord = Objects.isNull(tOeExamRecord) ? SystemConstant.getExamRecord(recordId) : tOeExamRecord;
             mobileFirstWebsocketId = tOeExamRecord.getMobileFirstWebsocketId();
         }
+        Map<String, Object> prop = mqDto.getProperties();
+        prop.put(SystemConstant.RECORD_ID, recordId);
         if (Objects.nonNull(mobileFirstWebsocketId) && Objects.nonNull(webSocketMap.get(mobileFirstWebsocketId))) {
             WebSocketMobileServer webSocketFirstMobileServer = webSocketMap.get(mobileFirstWebsocketId);
             if (Objects.nonNull(examRecordStatusEnum)
@@ -442,12 +444,11 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
                 switch (tag.toUpperCase()) {
                     case "EXAM_STOP":
                         if (!Objects.equals(ExamRecordStatusEnum.ANSWERING, examRecordStatusEnum)) {
-                            websocketDto = new WebsocketDto(WebsocketTypeEnum.EXAM_STOP.name(), mqDto.getProperties());
+                            websocketDto = new WebsocketDto(WebsocketTypeEnum.EXAM_STOP.name(), prop);
                             webSocketFirstMobileServer.sendMessage(websocketDto);
                             SystemConstant.mobileMonitorStatusStop(studentId, recordId, false);
-                            Map<String, Object> properties = mqDto.getProperties();
-                            if (Objects.nonNull(properties) && properties.size() > 0) {
-                                Boolean removeWebsocket = (Boolean) properties.get(SystemConstant.REMOVE_WEBSOCKET);
+                            if (Objects.nonNull(prop) && prop.size() > 0) {
+                                Boolean removeWebsocket = (Boolean) prop.get(SystemConstant.REMOVE_WEBSOCKET);
                                 if (Objects.nonNull(removeWebsocket) && removeWebsocket) {
                                     WebSocketMobileServer.close(webSocketFirstMobileServer);
                                 }
@@ -458,7 +459,7 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
                         if (!Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
                                 && !Objects.equals(ExamRecordStatusEnum.FINISHED, examRecordStatusEnum)
                                 && !Objects.equals(ExamRecordStatusEnum.JUNK, examRecordStatusEnum)) {
-                            websocketDto = new WebsocketDto(WebsocketTypeEnum.EXAM_START.name(), mqDto.getProperties());
+                            websocketDto = new WebsocketDto(WebsocketTypeEnum.EXAM_START.name(), prop);
                             webSocketFirstMobileServer.sendMessage(websocketDto);
                         }
                         break;
@@ -489,12 +490,11 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
                 switch (tag.toUpperCase()) {
                     case "EXAM_STOP":
                         if (!Objects.equals(ExamRecordStatusEnum.ANSWERING, examRecordStatusEnum)) {
-                            websocketDto = new WebsocketDto(WebsocketTypeEnum.EXAM_STOP.name(), mqDto.getProperties());
+                            websocketDto = new WebsocketDto(WebsocketTypeEnum.EXAM_STOP.name(), prop);
                             webSocketSecondMobileServer.sendMessage(websocketDto);
                             SystemConstant.mobileMonitorStatusStop(studentId, recordId, false);
-                            Map<String, Object> properties = mqDto.getProperties();
-                            if (Objects.nonNull(properties) && properties.size() > 0) {
-                                Boolean mobileRemoveWebsocket = (Boolean) properties.get(SystemConstant.REMOVE_WEBSOCKET);
+                            if (Objects.nonNull(prop) && prop.size() > 0) {
+                                Boolean mobileRemoveWebsocket = (Boolean) prop.get(SystemConstant.REMOVE_WEBSOCKET);
                                 if (Objects.nonNull(mobileRemoveWebsocket) && mobileRemoveWebsocket) {
                                     WebSocketMobileServer.close(webSocketSecondMobileServer);
                                 }
@@ -505,7 +505,7 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
                         if (!Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
                                 && !Objects.equals(ExamRecordStatusEnum.FINISHED, examRecordStatusEnum)
                                 && !Objects.equals(ExamRecordStatusEnum.JUNK, examRecordStatusEnum)) {
-                            websocketDto = new WebsocketDto(WebsocketTypeEnum.EXAM_START.name(), mqDto.getProperties());
+                            websocketDto = new WebsocketDto(WebsocketTypeEnum.EXAM_START.name(), prop);
                             webSocketSecondMobileServer.sendMessage(websocketDto);
                         }
                         break;

themis-exam/src/main/java/com/qmth/themis/exam/websocket/WebSocketOeServer.java

@@ -141,7 +141,7 @@ public class WebSocketOeServer implements Concurrently {
                             //发送延时mq消息start
                             MqDtoService mqDtoService = SpringContextHolder.getBean(MqDtoService.class);
                             tranMap = mqDtoService.buildMqDelayMsg("2m");
-                            tranMap.put(SystemConstant.RECORD_ID, String.valueOf(this.recordId));
+                            tranMap.put(SystemConstant.RECORD_ID, this.recordId);
                             MqUtil mqUtil = SpringContextHolder.getBean(MqUtil.class);
                             MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.OE_UN_NORMAL.name(),
                                     MqTagEnum.OE_UN_NORMAL, MqTagEnum.OE_UN_NORMAL, String.valueOf(this.recordId),