修改实例化关系

yzg-util-mq/src/main/java/com/yanzuoguang/mq/base/MqConfigurable.java

@@ -63,11 +63,7 @@ public class MqConfigurable implements RabbitTemplate.ConfirmCallback, RabbitTem
         try {
             if (ack && correlationData != null
                     && !StringHelper.isEmpty(correlationData.getId())) {
-                String toId = getId(correlationData.getId());
-                // 不是临时数据
-                if (toId.equals(correlationData.getId())) {
-                    messageSendService.onSuccess(toId);
-                }
+                messageSendService.onSuccess(correlationData.getId());
             } else if (!ack) {
                 System.out.println("丢失消息:" + ack + " msg:" + cause);
             }
@@ -94,15 +90,10 @@ public class MqConfigurable implements RabbitTemplate.ConfirmCallback, RabbitTem
             String content = new String(message.getBody(), charset);
             // 组成消息
             MessageVo messageVo = new MessageVo(exchange, routingKey, content);
-            messageVo.setMessageId(getId(messageProperties.getMessageId()));
             // 写入数据库
             messageSendService.onError(messageVo);
         } catch (Exception ex) {
             Log.error(MqConfigurable.class, ex);
         }
     }
-
-    private String getId(String from) {
-        return from.replace("temp:", "");
-    }
 }

yzg-util-mq/src/main/java/com/yanzuoguang/mq/service/impl/MessageSendServiceImpl.java

@@ -32,6 +32,8 @@ import java.util.List;
 @Component
 public class MessageSendServiceImpl implements MessageSendService {
 
+    public static final String TEMP_ID = "temp";
+
     @Autowired
     private MyRabbitTemplate rabbitTemplate;
 
@@ -78,7 +80,7 @@ public class MessageSendServiceImpl implements MessageSendService {
     public String send(MessageVo req) {
         req.check();
         // 获取消息临时Id,消息Id为空时标识为第一次发送，并设置默认消息Id
-        String finalMessageId = StringHelper.getFirst(req.getMessageId(), StringHelper.getId("temp", StringHelper.getNewID()));
+        String finalMessageId = StringHelper.getFirst(req.getMessageId(), StringHelper.getId(TEMP_ID, StringHelper.getNewID()));
         // 设置编号
         CorrelationData correlationData = new CorrelationData();
         correlationData.setId(finalMessageId);
@@ -90,7 +92,7 @@ public class MessageSendServiceImpl implements MessageSendService {
                 // 设置持久化
                 properties.setDeliveryMode(MessageDeliveryMode.PERSISTENT);
                 // 设置消息编号
-                properties.setMessageId(StringHelper.getIdShort(finalMessageId, "temp"));
+                properties.setMessageId(StringHelper.getIdShort(finalMessageId, TEMP_ID));
                 if (req.getDedTime() > 0) {
                     properties.setExpiration(req.getDedTime() + "");
                 }
@@ -107,10 +109,13 @@ public class MessageSendServiceImpl implements MessageSendService {
      */
     @Override
     public String onSuccess(String messageId) {
-        if (!StringHelper.isEmpty(messageId)) {
-            messageDao.remove(messageId);
+        String toId = StringHelper.getIdShort(messageId, TEMP_ID);
+        // 不是临时数据
+        if (!toId.equals(messageId) || StringHelper.isEmpty(toId)) {
+            return StringHelper.EMPTY;
         }
-        return messageId;
+        messageDao.remove(toId);
+        return toId;
     }
 
     /**
@@ -120,6 +125,7 @@ public class MessageSendServiceImpl implements MessageSendService {
      */
     @Override
     public String onError(MessageVo messageVo) {
+        messageVo.setMessageId(StringHelper.getIdShort(messageVo.getMessageId(), TEMP_ID));
         messageVo.check();
         // 设置处理次数
         messageVo.setHandleCount(messageVo.getHandleCount() + 1);

yzg-util-mq/src/main/java/com/yanzuoguang/mq/service/impl/MqServiceImpl.java

@@ -71,10 +71,10 @@ public class MqServiceImpl implements MqService {
         // 设置默认消息Id
         String defaultId = StringHelper.getFirst(req.getMessageId(), StringHelper.getNewID());
         // 将Id去掉temp:
-        String simpleId = StringHelper.getIdShort(defaultId, "temp");
+        String simpleId = StringHelper.getId(MessageSendServiceImpl.TEMP_ID, StringHelper.getIdShort(defaultId, MessageSendServiceImpl.TEMP_ID));
         // 增加temp标识第一次发送
-        req.setMessageId(StringHelper.getId("temp", simpleId));
-        
+        req.setMessageId(simpleId);
+
         return yzgMqProcedure.send(req, now);
     }