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.rocketmq.client.exception.MQClientException;
 import org.apache.rocketmq.common.message.Message;
 import org.apache.rocketmq.remoting.common.RemotingHelper;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
@@ -128,6 +129,14 @@ public class SystemMessageServiceImpl implements SystemMessageService {
             meMessage.putUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL, pendingMsgLabel);
             rocketMQTemplate.getProducer().send(meMessage);
             logger.info("【发送MQ系统消息】-发送到MQ成功");
+        } catch (MQClientException e) {
+            String errorStackTrace = ExceptionUtils.getErrorStackTrace(e);
+            logger.error("【发送MQ系统消息】发送系统MQ消息失败，MQ中间件异常请检查:{}", errorStackTrace);
+
+            // 清理阻塞中的消息缓存
+            redisUtils.delete(pendingMsgKey);
+
+            throw new RenException(EpmetErrorCode.SYSTEM_MQ_MSG_SEND_FAIL.getCode(),e.getErrorMessage());
         } catch (Exception e) {
             String errorStackTrace = ExceptionUtils.getErrorStackTrace(e);
             logger.error("【发送MQ系统消息】发送系统MQ消息失败，堆栈信息:{}", errorStackTrace);