Merge branch 'dev_user_grid_work_2_jinan' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

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;
@@ -222,7 +227,7 @@ public class SystemMessageServiceImpl implements SystemMessageService {
                 topic = TopicConstants.EPMET_HEART;
                 break;
             default:
-                logger.warn("getTopicByMsgType default msgType:{}", msgType);
+                logger.error("getTopicByMsgType msgType:{} is not support for any topic", msgType);
         }
         return topic;
     }

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);
-        //只推送平阴数据
+        //只推送平阴数据 todo 先干掉测试
-        if (!StrConstant.PY_CUSTOMER.equals(msgObj.getCustomerId())) {
+        /*if (!StrConstant.PY_CUSTOMER.equals(msgObj.getCustomerId())) {
             return;
-        }
+        }*/
         if (msgObj == null) {
             log.warn("consumeMessage msg body is blank");
             return;