|
@@ -138,11 +138,20 @@ public class WebSocketMobileServer implements Concurrently {
|
|
Map mqMap = new HashMap<>();
|
|
Map mqMap = new HashMap<>();
|
|
mqMap.put(SystemConstant.RECORD_ID, this.recordId);
|
|
mqMap.put(SystemConstant.RECORD_ID, this.recordId);
|
|
mqMap.put(Constants.HEADER_SOURCE, this.source.name());
|
|
mqMap.put(Constants.HEADER_SOURCE, this.source.name());
|
|
- //监控结束
|
|
|
|
- MqDto mqDtoStop = new MqDto(mqUtil.getTopic(), MqTagEnum.MONITOR_STOP.name(),
|
|
|
|
- recordId, MqTagEnum.MONITOR_STOP, String.valueOf(recordId), mqMap,
|
|
|
|
- String.valueOf(recordId));
|
|
|
|
- mqDtoService.assembleSendOneOrderMsg(mqDtoStop);
|
|
|
|
|
|
+
|
|
|
|
+ ExamRecordStatusEnum statusEnum = ExamRecordCacheUtil.getStatus(this.recordId);
|
|
|
|
+ if (Objects.isNull(statusEnum)) {
|
|
|
|
+ TOeExamRecord tOeExamRecord = tOeExamRecordService.getById(this.recordId);
|
|
|
|
+ statusEnum = tOeExamRecord.getStatus();
|
|
|
|
+ }
|
|
|
|
+ if (Objects.nonNull(statusEnum) && (statusEnum != ExamRecordStatusEnum.FINISHED
|
|
|
|
+ && statusEnum != ExamRecordStatusEnum.PERSISTED && statusEnum != ExamRecordStatusEnum.JUNK)) {
|
|
|
|
+ //监控结束
|
|
|
|
+ MqDto mqDtoStop = new MqDto(mqUtil.getTopic(), MqTagEnum.MONITOR_STOP.name(),
|
|
|
|
+ recordId, MqTagEnum.MONITOR_STOP, String.valueOf(recordId), mqMap,
|
|
|
|
+ String.valueOf(recordId));
|
|
|
|
+ mqDtoService.assembleSendOneOrderMsg(mqDtoStop);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
} finally {
|
|
} finally {
|
|
redisUtil.releaseLock(lockKey);
|
|
redisUtil.releaseLock(lockKey);
|