From 98fb950e6bf325eb56cc44cbd114116b13cf1445 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 18:47:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=81=94=E8=B0=83=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/listener/OpenDataPatrolChangeEventListener.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java index dd8cf1624b..034e4ac54b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataPatrolChangeEventListener.java @@ -3,7 +3,6 @@ package com.epmet.opendata.mq.listener; import com.alibaba.fastjson.JSON; import com.epmet.commons.rocketmq.constants.MQUserPropertys; import com.epmet.commons.rocketmq.messages.StaffPatrolMQMsg; -import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; @@ -71,10 +70,10 @@ public class OpenDataPatrolChangeEventListener implements MessageListenerConcurr logger.info("【开放数据事件监听器】-巡查记录信息变更-收到消息内容:{}, 操作:{}", msg, tags); StaffPatrolMQMsg msgObj = JSON.parseObject(msg, StaffPatrolMQMsg.class); - //只推送平阴数据 - if (!StrConstant.PY_CUSTOMER.equals(msgObj.getCustomerId())) { + //只推送平阴数据 todo 先干掉测试 + /*if (!StrConstant.PY_CUSTOMER.equals(msgObj.getCustomerId())) { return; - } + }*/ if (msgObj == null) { log.warn("consumeMessage msg body is blank"); return; From 63d17a6073086641f3fe7ff3b688c1b0349cab74 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 24 Dec 2021 18:52:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=B9=E5=8A=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/SystemMessageServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java index a6d2d1d852..a5c07f9ea1 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java @@ -19,6 +19,7 @@ import com.epmet.service.SystemMessageService; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.client.exception.MQClientException; import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.remoting.common.RemotingHelper; @@ -109,6 +110,10 @@ public class SystemMessageServiceImpl implements SystemMessageService { private void sendMQMessage(String messageType, String contentStr, String penddingId) { String topic = getTopicByMsgType(messageType); + if (StringUtils.isBlank(topic)){ + logger.warn("topic is not match,messageType:{}", messageType); + return; + } // 缓存下来，供滞留消息扫描。TTL -1，永不过期 String pendingMsgLabel = null; @@ -207,7 +212,7 @@ public class SystemMessageServiceImpl implements SystemMessageService { topic=TopicConstants.CAL_PARTY_UNIT_SATISFACTION; break; default: - logger.warn("getTopicByMsgType default msgType:{}", msgType); + logger.error("getTopicByMsgType msgType:{} is not support for any topic", msgType); } return topic; }