From aa67f3033d110ed14e4f1f9616606437a2d58c32 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Sun, 7 Apr 2024 08:50:14 +0800 Subject: [PATCH] bugfix --- .../coal/dataCollector/listener/PmsListener.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/dataCollector/listener/PmsListener.java b/src/main/java/cn/lihongjie/coal/dataCollector/listener/PmsListener.java index 4b1128c3..abe4da6c 100644 --- a/src/main/java/cn/lihongjie/coal/dataCollector/listener/PmsListener.java +++ b/src/main/java/cn/lihongjie/coal/dataCollector/listener/PmsListener.java @@ -25,13 +25,12 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.HmacAlgorithms; import org.apache.commons.codec.digest.HmacUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.Exchange; import org.springframework.amqp.rabbit.annotation.QueueBinding; import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.amqp.support.AmqpHeaders; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.jpa.domain.Specification; -import org.springframework.messaging.handler.annotation.Headers; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -73,8 +72,14 @@ public class PmsListener { key = "pms.*") }) @Transactional - public void handlePmsMessage(String body, @Headers Map headers) { + public void handlePmsMessage(Message message) { + var body = new String(message.getBody(), StandardCharsets.UTF_8); + + Map headers = message.getMessageProperties().getHeaders(); + + + Object key = headers.get("appKey"); if (key == null) { @@ -120,8 +125,8 @@ public class PmsListener { logEntity.setOrganizationId(dataCollector.getOrganizationId()); logEntity.setDataCollector(dataCollector); - Object rk = headers.get(AmqpHeaders.RECEIVED_ROUTING_KEY); - + Object rk =message.getMessageProperties().getReceivedRoutingKey(); + logEntity.setLogTime(LocalDateTime.now()); logEntity.setType(rk.toString());