瀏覽代碼

sendOnyWayOrder消息改成异步发送顺序消息

wangliang 2 年之前
父節點
當前提交
dfa5b23a82

+ 3 - 3
themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamController.java

@@ -178,7 +178,7 @@ public class TEExamController {
                         MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.EXAM_ACTIVITY.name(),
                                 JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY,
                                 String.valueOf(teExam.getId()), prop, tbUser.getName());
-                        mqDtoService.assembleSendOneOrderMsg(mqDto);
+                        mqDtoService.assembleSendAsyncOrderMsg(mqDto);
                         //新增quartz任务,发送mq消息end
                     } else {//否则删除场次定时任务
                         //删除quartz任务,发送mq消息start
@@ -188,7 +188,7 @@ public class TEExamController {
                         MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.EXAM_ACTIVITY.name(),
                                 JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY,
                                 String.valueOf(teExam.getId()), prop, tbUser.getName());
-                        mqDtoService.assembleSendOneOrderMsg(mqDto);
+                        mqDtoService.assembleSendAsyncOrderMsg(mqDto);
                         //删除quartz任务,发送mq消息end
                     }
                 }
@@ -402,7 +402,7 @@ public class TEExamController {
                     MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.EXAM_ACTIVITY.name(),
                             JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY,
                             String.valueOf(teExam.getId()), prop, tbUser.getName());
-                    mqDtoService.assembleSendOneOrderMsg(mqDto);
+                    mqDtoService.assembleSendAsyncOrderMsg(mqDto);
                     //新增quartz任务,发送mq消息end
                 }
             }

+ 1 - 1
themis-admin/src/main/java/com/qmth/themis/admin/api/TENotifyController.java

@@ -338,6 +338,6 @@ public class TENotifyController {
         mqMap.put(SystemConstant.RECORD_ID, recordId);
         mqMap.put(Constants.HEADER_SOURCE, source);
         MqDto mqDtoStart = new MqDto(mqUtil.getTopic(), mqTagEnum.name(), recordId, mqTagEnum, String.valueOf(recordId), mqMap, String.valueOf(recordId), eventTime);
-        mqDtoService.assembleSendOneOrderMsg(mqDtoStart);
+        mqDtoService.assembleSendAsyncOrderMsg(mqDtoStart);
     }
 }

+ 2 - 2
themis-admin/src/main/java/com/qmth/themis/admin/api/TIeInvigilateController.java

@@ -407,7 +407,7 @@ public class TIeInvigilateController {
 //            }
             if (Objects.nonNull(mqTagEnum)) {
                 MqDto mqDto = new MqDto(mqUtil.getTopic(), mqTagEnum.name(), JacksonUtil.parseJson(recordIdList), mqTagEnum, String.valueOf(tbUser.getId()), mapParameter, tbUser.getName());
-                mqDtoService.assembleSendOneOrderMsg(mqDto);
+                mqDtoService.assembleSendAsyncOrderMsg(mqDto);
             }
             //发送mq给客户端强制收卷end
         }
@@ -554,7 +554,7 @@ public class TIeInvigilateController {
         //发送mq给客户端监考消息start
         mapParameter.put(SystemConstant.FORM_USER_ID, tbUser.getId());
         MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.OE_IM_CLUSTERING.name(), recordId, MqTagEnum.OE_IM_CLUSTERING, String.valueOf(recordId), mapParameter, tbUser.getName());
-        mqDtoService.assembleSendOneOrderMsg(mqDto);
+        mqDtoService.assembleSendAsyncOrderMsg(mqDto);
         //发送mq给客户端监考消息end
 
 //        //发送mq给客户端监考强制活体验证start

+ 2 - 2
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamActivityServiceImpl.java

@@ -393,7 +393,7 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
                                     MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.EXAM_ACTIVITY.name(),
                                             JacksonUtil.parseJson(Arrays.asList(s)), MqTagEnum.EXAM_ACTIVITY,
                                             String.valueOf(teExam.getId()), prop, tbUser.getName());
-                                    mqDtoService.assembleSendOneOrderMsg(mqDto);
+                                    mqDtoService.assembleSendAsyncOrderMsg(mqDto);
                                     //删除再新增quartz任务,发送mq消息end
                                 }
                             }
@@ -428,7 +428,7 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
                 MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.EXAM_ACTIVITY.name(),
                         JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY,
                         String.valueOf(teExam.getId()), prop, tbUser.getName());
-                mqDtoService.assembleSendOneOrderMsg(mqDto);
+                mqDtoService.assembleSendAsyncOrderMsg(mqDto);
                 //新增quartz任务,发送mq消息end
             }
         } catch (Exception e) {

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

@@ -1243,11 +1243,11 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
         MqDto clientMqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.OE_WEBSOCKET_EXAM_STOP.name(),
                 recordId, MqTagEnum.OE_WEBSOCKET_EXAM_STOP, String.valueOf(recordId), properties,
                 String.valueOf(recordId));
-        mqDtoService.assembleSendOneOrderMsg(clientMqDto);
+        mqDtoService.assembleSendAsyncOrderMsg(clientMqDto);
 
         MqDto mobileMqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.EXAM_STOP.name(), recordId,
                 MqTagEnum.EXAM_STOP, String.valueOf(recordId), properties, String.valueOf(recordId));
-        mqDtoService.assembleSendOneOrderMsg(mobileMqDto);
+        mqDtoService.assembleSendAsyncOrderMsg(mobileMqDto);
 
         //异步持久化
         checkToPersisted(recordId, studentId);

+ 2 - 2
themis-exam/src/main/java/com/qmth/themis/exam/api/TEMobileController.java

@@ -133,7 +133,7 @@ public class TEMobileController {
             mapParameter.put("subIndex", param.getSubIndex());
         }
         MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.OE_WEBSOCKET_MOBILE_ANSWER_READY.name(), param.getRecordId(), MqTagEnum.OE_WEBSOCKET_MOBILE_ANSWER_READY, String.valueOf(param.getRecordId()), mapParameter, teStudent.getName());
-        mqDtoService.assembleSendOneOrderMsg(mqDto);
+        mqDtoService.assembleSendAsyncOrderMsg(mqDto);
         ExamStudentCacheBean es = examStudentService.getExamStudentCacheBean(esId);
         AnswerReadyResponseBean ret = new AnswerReadyResponseBean();
         ret.setCourseName(es.getCourseName());
@@ -183,7 +183,7 @@ public class TEMobileController {
         mapParameter.put("urls", param.getUrls());
 
         MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.OE_WEBSOCKET_MOBILE_ANSWER_UPLOAD.name(), param.getRecordId(), MqTagEnum.OE_WEBSOCKET_MOBILE_ANSWER_READY, String.valueOf(param.getRecordId()), mapParameter, teStudent.getName());
-        mqDtoService.assembleSendOneOrderMsg(mqDto);
+        mqDtoService.assembleSendAsyncOrderMsg(mqDto);
         return ResultUtil.ok(ret);
     }
 

+ 3 - 3
themis-exam/src/main/java/com/qmth/themis/exam/config/ExamConstant.java

@@ -45,7 +45,7 @@ public class ExamConstant {
         //客户端考试结束
         if (clientStop) {
             MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.OE_WEBSOCKET_EXAM_STOP.name(), recordId, MqTagEnum.OE_WEBSOCKET_EXAM_STOP, String.valueOf(recordId), mapParameter, String.valueOf(recordId));
-            mqDtoService.assembleSendOneOrderMsg(mqDto);
+            mqDtoService.assembleSendAsyncOrderMsg(mqDto);
         }
 //        else {//结束推流状态
 ////            SystemConstant.clientMonitorStatusStop(recordId);
@@ -63,7 +63,7 @@ public class ExamConstant {
 //            ExamStudentCacheBean examStudentCacheBean = teExamStudentService.getExamStudentCacheBean(examStudentId);
 //            Optional.ofNullable(examStudentCacheBean).orElseThrow(() -> new BusinessException("考生数据为空"));
             MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.EXAM_STOP.name(), recordId, MqTagEnum.EXAM_STOP, String.valueOf(recordId), mapParameter, String.valueOf(recordId));
-            mqDtoService.assembleSendOneOrderMsg(mqDto);
+            mqDtoService.assembleSendAsyncOrderMsg(mqDto);
 //            SystemConstant.mobileMonitorStatusStop(examStudentCacheBean.getStudentId(), recordId, false);
         }
     }
@@ -79,6 +79,6 @@ public class ExamConstant {
         Map mapParameter = new HashMap<>();
         mapParameter.put(SystemConstant.RECORD_ID, recordId);
         MqDto mqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.EXAM_START.name(), recordId, MqTagEnum.EXAM_START, String.valueOf(recordId), mapParameter, String.valueOf(recordId));
-        mqDtoService.assembleSendOneOrderMsg(mqDto);
+        mqDtoService.assembleSendAsyncOrderMsg(mqDto);
     }
 }

+ 2 - 2
themis-exam/src/main/java/com/qmth/themis/exam/websocket/WebSocketMobileServer.java

@@ -142,7 +142,7 @@ public class WebSocketMobileServer implements Concurrently {
                     MqDto mqDtoStop = new MqDto(mqUtil.getTopic(), MqTagEnum.MONITOR_STOP.name(),
                             recordId, MqTagEnum.MONITOR_STOP, String.valueOf(recordId), mqMap,
                             String.valueOf(recordId));
-                    mqDtoService.assembleSendOneOrderMsg(mqDtoStop);
+                    mqDtoService.assembleSendAsyncOrderMsg(mqDtoStop);
                 }
             } finally {
                 redisUtil.releaseLock(lockKey);
@@ -189,7 +189,7 @@ public class WebSocketMobileServer implements Concurrently {
                         MqDto mobileMqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.EXAM_STOP.name(),
                                 recordId, MqTagEnum.EXAM_STOP, String.valueOf(recordId), properties,
                                 String.valueOf(recordId));
-                        mqDtoService.assembleSendOneOrderMsg(mobileMqDto);
+                        mqDtoService.assembleSendAsyncOrderMsg(mobileMqDto);
                     }
                     WebsocketTypeEnum websocketTypeEnum = WebsocketTypeEnum
                             .valueOf(websocketDto.getType().toUpperCase());

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

@@ -107,7 +107,7 @@ public class WebSocketOeServer implements Concurrently {
                 MqTagEnum.OE_WEBSOCKET_MOBILE_MONITOR_STATUS.name(), recordId,
                 MqTagEnum.OE_WEBSOCKET_MOBILE_MONITOR_STATUS, String.valueOf(recordId), mqMap,
                 String.valueOf(recordId));
-        mqDtoService.assembleSendOneOrderMsg(mqDto);
+        mqDtoService.assembleSendAsyncOrderMsg(mqDto);
     }
 
     /**
@@ -200,7 +200,7 @@ public class WebSocketOeServer implements Concurrently {
                         MqDto clientMqDto = new MqDto(mqUtil.getTopic(), MqTagEnum.OE_WEBSOCKET_EXAM_STOP.name(),
                                 recordId, MqTagEnum.OE_WEBSOCKET_EXAM_STOP, String.valueOf(recordId), properties,
                                 String.valueOf(recordId));
-                        mqDtoService.assembleSendOneOrderMsg(clientMqDto);
+                        mqDtoService.assembleSendAsyncOrderMsg(clientMqDto);
                     }
                     WebsocketTypeEnum websocketTypeEnum = WebsocketTypeEnum
                             .valueOf(websocketDto.getType().toUpperCase());