|
@@ -17,10 +17,9 @@ import java.util.HashMap;
|
|
public class AbstrackBuildSceneListener implements IBuildSceneListener {
|
|
public class AbstrackBuildSceneListener implements IBuildSceneListener {
|
|
@Override
|
|
@Override
|
|
public void preHandle(Channel channel, String queueName, Message message, IBuildSceneService buildSceneService) throws IOException {
|
|
public void preHandle(Channel channel, String queueName, Message message, IBuildSceneService buildSceneService) throws IOException {
|
|
- Object correlation = message.getMessageProperties().getHeader("spring_returned_message_correlation");
|
|
|
|
- String correlationId = (String) correlation;
|
|
|
|
|
|
+ String messageId = message.getMessageProperties().getMessageId();
|
|
String msg = new String(message.getBody(), StandardCharsets.UTF_8);
|
|
String msg = new String(message.getBody(), StandardCharsets.UTF_8);
|
|
- log.info("开始准备场景计算资源,队列名:{},id:{},消息体:{}", queueName, correlationId, msg);
|
|
|
|
|
|
+ log.info("开始准备场景计算资源,队列名:{},id:{},消息体:{}", queueName, messageId, msg);
|
|
BuildSceneCallMessage buildSceneMessage = JSONObject.parseObject(msg, BuildSceneCallMessage.class);
|
|
BuildSceneCallMessage buildSceneMessage = JSONObject.parseObject(msg, BuildSceneCallMessage.class);
|
|
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
|
|
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
|
|
if(ObjectUtils.isEmpty(buildSceneMessage.getBuildContext())){
|
|
if(ObjectUtils.isEmpty(buildSceneMessage.getBuildContext())){
|
|
@@ -30,18 +29,17 @@ public class AbstrackBuildSceneListener implements IBuildSceneListener {
|
|
buildSceneMessage.getBuildContext().put("sceneNum",buildSceneMessage.getSceneNum());
|
|
buildSceneMessage.getBuildContext().put("sceneNum",buildSceneMessage.getSceneNum());
|
|
}
|
|
}
|
|
buildSceneService.buildScenePre(buildSceneMessage);
|
|
buildSceneService.buildScenePre(buildSceneMessage);
|
|
- log.info("准备场景计算资源完成,队列名:{},id:{},消息体:{}", queueName, correlationId, msg);
|
|
|
|
|
|
+ log.info("准备场景计算资源完成,队列名:{},id:{},消息体:{}", queueName, messageId, msg);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public void postHandle(Channel channel, String queueName, Message message, IBuildSceneService buildSceneService) throws Exception {
|
|
public void postHandle(Channel channel, String queueName, Message message, IBuildSceneService buildSceneService) throws Exception {
|
|
- Object correlation = message.getMessageProperties().getHeader("spring_returned_message_correlation");
|
|
|
|
- String correlationId = (String) correlation;
|
|
|
|
|
|
+ String messageId = message.getMessageProperties().getMessageId();
|
|
String msg = new String(message.getBody(), StandardCharsets.UTF_8);
|
|
String msg = new String(message.getBody(), StandardCharsets.UTF_8);
|
|
- log.info("场景计算完成,开始处理场景计算结果,队列名:{},id:{},消息体:{}", queueName, correlationId, msg);
|
|
|
|
|
|
+ log.info("场景计算完成,开始处理场景计算结果,队列名:{},id:{},消息体:{}", queueName, messageId, msg);
|
|
BuildSceneResultMqMessage buildSceneMessage = JSONObject.parseObject(msg, BuildSceneResultMqMessage.class);
|
|
BuildSceneResultMqMessage buildSceneMessage = JSONObject.parseObject(msg, BuildSceneResultMqMessage.class);
|
|
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
|
|
channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
|
|
buildSceneService.buildScenePost(buildSceneMessage);
|
|
buildSceneService.buildScenePost(buildSceneMessage);
|
|
- log.info("场景计算结果处理完成,队列名:{},id:{},消息体:{}", queueName, correlationId, msg);
|
|
|
|
|
|
+ log.info("场景计算结果处理完成,队列名:{},id:{},消息体:{}", queueName, messageId, msg);
|
|
}
|
|
}
|
|
}
|
|
}
|