|
@@ -82,7 +82,8 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
|
|
ExamRecordStatusEnum examRecordStatusEnum = ExamRecordCacheUtil.getStatus(recordId);
|
|
ExamRecordStatusEnum examRecordStatusEnum = ExamRecordCacheUtil.getStatus(recordId);
|
|
if ((Objects.nonNull(examRecordStatusEnum)
|
|
if ((Objects.nonNull(examRecordStatusEnum)
|
|
&& !Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
|
|
&& !Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
|
|
- && !Objects.equals(ExamRecordStatusEnum.FINISHED, examRecordStatusEnum))
|
|
|
|
|
|
+ && !Objects.equals(ExamRecordStatusEnum.FINISHED, examRecordStatusEnum)
|
|
|
|
+ && !Objects.equals(ExamRecordStatusEnum.JUNK, examRecordStatusEnum))
|
|
&& Objects.nonNull(webSocketOeServer.getRecordId())
|
|
&& Objects.nonNull(webSocketOeServer.getRecordId())
|
|
&& webSocketOeServer.getRecordId().longValue() == recordId.longValue()) {
|
|
&& webSocketOeServer.getRecordId().longValue() == recordId.longValue()) {
|
|
map.put("form", mqDto.getObjName());
|
|
map.put("form", mqDto.getObjName());
|
|
@@ -123,7 +124,8 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
|
|
ExamRecordStatusEnum examRecordStatusEnum = ExamRecordCacheUtil.getStatus(recordId);
|
|
ExamRecordStatusEnum examRecordStatusEnum = ExamRecordCacheUtil.getStatus(recordId);
|
|
if ((Objects.nonNull(examRecordStatusEnum)
|
|
if ((Objects.nonNull(examRecordStatusEnum)
|
|
&& !Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
|
|
&& !Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
|
|
- && !Objects.equals(ExamRecordStatusEnum.FINISHED, examRecordStatusEnum))
|
|
|
|
|
|
+ && !Objects.equals(ExamRecordStatusEnum.FINISHED, examRecordStatusEnum)
|
|
|
|
+ && !Objects.equals(ExamRecordStatusEnum.JUNK, examRecordStatusEnum))
|
|
&& Objects.nonNull(webSocketOeServer.getRecordId())
|
|
&& Objects.nonNull(webSocketOeServer.getRecordId())
|
|
&& webSocketOeServer.getRecordId().longValue() == recordId.longValue()) {
|
|
&& webSocketOeServer.getRecordId().longValue() == recordId.longValue()) {
|
|
map.put(SystemConstant.WEB_SOCKET_OE_SERVER, webSocketOeServer);
|
|
map.put(SystemConstant.WEB_SOCKET_OE_SERVER, webSocketOeServer);
|
|
@@ -162,7 +164,8 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
|
|
ExamRecordStatusEnum examRecordStatusEnum = ExamRecordCacheUtil.getStatus(recordId);
|
|
ExamRecordStatusEnum examRecordStatusEnum = ExamRecordCacheUtil.getStatus(recordId);
|
|
if ((Objects.nonNull(examRecordStatusEnum)
|
|
if ((Objects.nonNull(examRecordStatusEnum)
|
|
&& !Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
|
|
&& !Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
|
|
- && !Objects.equals(ExamRecordStatusEnum.FINISHED, examRecordStatusEnum))
|
|
|
|
|
|
+ && !Objects.equals(ExamRecordStatusEnum.FINISHED, examRecordStatusEnum)
|
|
|
|
+ && !Objects.equals(ExamRecordStatusEnum.JUNK, examRecordStatusEnum))
|
|
&& Objects.nonNull(webSocketOeServer.getRecordId())
|
|
&& Objects.nonNull(webSocketOeServer.getRecordId())
|
|
&& webSocketOeServer.getRecordId().longValue() == recordId.longValue()) {
|
|
&& webSocketOeServer.getRecordId().longValue() == recordId.longValue()) {
|
|
Map<String, Object> prop = mqDto.getProperties();
|
|
Map<String, Object> prop = mqDto.getProperties();
|
|
@@ -203,7 +206,8 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
|
|
ExamRecordStatusEnum examRecordStatusEnum = ExamRecordCacheUtil.getStatus(recordId);
|
|
ExamRecordStatusEnum examRecordStatusEnum = ExamRecordCacheUtil.getStatus(recordId);
|
|
if ((Objects.nonNull(examRecordStatusEnum)
|
|
if ((Objects.nonNull(examRecordStatusEnum)
|
|
&& !Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
|
|
&& !Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
|
|
- && !Objects.equals(ExamRecordStatusEnum.FINISHED, examRecordStatusEnum))
|
|
|
|
|
|
+ && !Objects.equals(ExamRecordStatusEnum.FINISHED, examRecordStatusEnum)
|
|
|
|
+ && !Objects.equals(ExamRecordStatusEnum.JUNK, examRecordStatusEnum))
|
|
&& Objects.nonNull(webSocketOeServer.getRecordId())
|
|
&& Objects.nonNull(webSocketOeServer.getRecordId())
|
|
&& webSocketOeServer.getRecordId().longValue() == recordId.longValue()) {
|
|
&& webSocketOeServer.getRecordId().longValue() == recordId.longValue()) {
|
|
map.put(SystemConstant.RECORD_ID, recordId);
|
|
map.put(SystemConstant.RECORD_ID, recordId);
|
|
@@ -452,7 +456,8 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
|
|
break;
|
|
break;
|
|
case "EXAM_START":
|
|
case "EXAM_START":
|
|
if (!Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
|
|
if (!Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
|
|
- && !Objects.equals(ExamRecordStatusEnum.FINISHED, 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(), mqDto.getProperties());
|
|
webSocketFirstMobileServer.sendMessage(websocketDto);
|
|
webSocketFirstMobileServer.sendMessage(websocketDto);
|
|
}
|
|
}
|
|
@@ -498,7 +503,8 @@ public class MqOeLogicServiceImpl implements MqOeLogicService {
|
|
break;
|
|
break;
|
|
case "EXAM_START":
|
|
case "EXAM_START":
|
|
if (!Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
|
|
if (!Objects.equals(ExamRecordStatusEnum.PERSISTED, examRecordStatusEnum)
|
|
- && !Objects.equals(ExamRecordStatusEnum.FINISHED, 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(), mqDto.getProperties());
|
|
webSocketSecondMobileServer.sendMessage(websocketDto);
|
|
webSocketSecondMobileServer.sendMessage(websocketDto);
|
|
}
|
|
}
|