Merge branch 'MQ' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mq/EnquiryReceiver.java

@@ -18,9 +18,7 @@ import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.handler.annotation.Header;
 
-import java.io.IOException;
 import java.util.List;
-import java.util.concurrent.TimeoutException;
 
 /**
  * Rabbit MQ - 询盘消息接收
@@ -31,11 +29,9 @@ import java.util.concurrent.TimeoutException;
 @RabbitComponent(value = "enquiryReceiver")
 public class EnquiryReceiver extends BaseRabbiMqHandler<EnquiryDTO> {
 
-    @Autowired
-    private IAdwebSiteService adwebSiteService;
+    @Autowired private IAdwebSiteService adwebSiteService;
 
-    @Autowired
-    private IAdwebEnquiryService adwebEnquiryService;
+    @Autowired private IAdwebEnquiryService adwebEnquiryService;
 
     @RabbitHandler
     // ackMode需要设置为MANUAL - BaseRabbiMqHandler.onMessage()有channel.basicAck()操作
@@ -43,7 +39,7 @@ public class EnquiryReceiver extends BaseRabbiMqHandler<EnquiryDTO> {
     public void onMessage(
             EnquiryDTO enquiryDTO,
             Channel channel,
-            @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) throws IOException, TimeoutException {
+            @Header(AmqpHeaders.DELIVERY_TAG) long deliveryTag) {
         super.onMessage(
                 enquiryDTO,
                 deliveryTag,
@@ -55,20 +51,22 @@ public class EnquiryReceiver extends BaseRabbiMqHandler<EnquiryDTO> {
                         log.info("收到MQ消息 {}", enquiry);
 
                         // 查看发布当前消息的站点是否是 adweb3 平台中绑定的是否是有效站点, 如果不是则直接确认消息，不做业务处理
-                        List<AdwebSite> adwebSites = adwebSiteService.list(new LambdaQueryWrapper<AdwebSite>()
-                                .like(AdwebSite::getDomain, enquiry.getSiteHost())
-                                .ne(AdwebSite::getStatus, 0));
+                        List<AdwebSite> adwebSites =
+                                adwebSiteService.list(
+                                        new LambdaQueryWrapper<AdwebSite>()
+                                                .like(AdwebSite::getDomain, enquiry.getSiteHost())
+                                                .ne(AdwebSite::getStatus, 0));
 
                         if (adwebSites.isEmpty()) {
-                            try {
-                                channel.basicAck(deliveryTag, false);
-                            } catch (IOException e) {
-                                log.error(String.format("站点：%s 不是adweb3的有效绑定站点,MQ消息确认失败: %s", enquiry.getSiteHost(), e.getMessage()), e);
-                            }
+                            log.error(
+                                    "站点：{} 不是adweb3的有效绑定站点,MQ消息确认失败: {}",
+                                    enquiry.getSiteHost());
+                            return;
                         }
-                        // 询盘入库
-                        adwebEnquiryService.addEnquiry(enquiry, enquiry.getPluginName(), adwebSites);
 
+                        // 询盘入库
+                        adwebEnquiryService.addEnquiry(
+                                enquiry, enquiry.getPluginName(), adwebSites);
                     }
                 });
     }