|
@@ -97,20 +97,19 @@ public class RabbitMqListener {
|
|
|
String msg = new String(message.getBody(), StandardCharsets.UTF_8);
|
|
|
BuildSceneCallMessage buildSceneMessage = JSONObject.parseObject(msg, BuildSceneCallMessage.class);
|
|
|
|
|
|
- Object correlation = message.getMessageProperties().getHeader("spring_returned_message_correlation");
|
|
|
- String correlationId = (String) correlation;
|
|
|
+ String messageId = message.getMessageProperties().getMessageId();
|
|
|
if(Objects.isNull(buildSceneMessage) || StrUtil.isBlank(buildSceneMessage.getSceneNum())){
|
|
|
- log.error("消息内容错误,id:{},消息体:{}", correlationId, msg);
|
|
|
+ log.error("消息内容错误,id:{},消息体:{}", messageId, msg);
|
|
|
return;
|
|
|
}
|
|
|
// 提前确认消息,以免执行超时重发
|
|
|
channel.basicAck(deliveryTag, false);
|
|
|
BuildLog buildLog = new BuildLog();
|
|
|
- log.info("场景计算开始,队列名:{},id:{},deliveryTag:{},消息体:{}", queueModelingCall, correlationId,deliveryTag,msg);
|
|
|
- buildLog.setMessageId(correlationId);
|
|
|
+ log.info("场景计算开始,队列名:{},id:{},deliveryTag:{},消息体:{}", queueModelingCall, messageId,deliveryTag,msg);
|
|
|
+ buildLog.setMessageId(messageId);
|
|
|
|
|
|
this.process(buildSceneMessage,buildLog);
|
|
|
- log.info("场景计算结束,队列名:{},id:{}", queueModelingCall, correlationId);
|
|
|
+ log.info("场景计算结束,队列名:{},id:{}", queueModelingCall, messageId);
|
|
|
|
|
|
//计算完毕,将当前系统构建状态改为false
|
|
|
SysConstants.SYSTEM_BUILDING = false;
|