Преглед на файлове

feat(消息队列): 去掉post-grpc相关依赖

hejq преди 6 години
родител
ревизия
d189c2b84f

+ 0 - 6
pom.xml

@@ -378,12 +378,6 @@
             <artifactId>spring-core</artifactId>
             <version>4.1.6.RELEASE</version>
         </dependency>
-
-        <dependency>
-            <groupId>com.usoft.b2b</groupId>
-            <artifactId>usoft-b2b-post-grpc-dal</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
     <build>
         <finalName>platform-b2b</finalName>

+ 2 - 4
src/main/java/com/uas/platform/b2b/service/impl/PurchaseApCheckServiceImpl.java

@@ -43,6 +43,7 @@ import com.uas.platform.b2b.support.DecimalUtils;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.UsageBufferedLogger;
 import com.uas.platform.b2b.support.mq.RabbitSendService;
+import com.uas.platform.b2b.support.mq.config.RabbitMqConfig;
 import com.uas.platform.b2b.task.ApCheckTask;
 import com.uas.platform.core.exception.IllegalOperatorException;
 import com.uas.platform.core.logging.BufferedLoggerManager;
@@ -53,11 +54,8 @@ import com.uas.platform.core.model.Status;
 import com.uas.platform.core.persistence.criteria.PredicateUtils;
 import com.uas.ps.core.util.StringUtils;
 import com.uas.search.b2b.model.SPage;
-import com.usoft.b2b.post.grpc.dal.constants.ConstantBizType;
-import com.usoft.b2b.post.grpc.dal.constants.ConstantQueueName;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.domain.Page;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
@@ -339,7 +337,7 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
         apChecks.add(purchaseApCheck);
         saveUserOrders(apChecks);
         // 生成消息
-        rabbitSendService.sendMessage(ConstantQueueName.QUEUE_SAAS_PURCHASE_APCHECK_NAME, ConstantBizType.POST_SALE_APCHECK, apCheck.getId());
+        rabbitSendService.sendMessage(RabbitMqConfig.QUEUE_SAAS_PURCHASE_APCHECK_NAME, RabbitMqConfig.POST_SALE_APCHECK, apCheck.getId());
         return purchaseApCheck;
 	}
 

+ 0 - 2
src/main/java/com/uas/platform/b2b/support/mq/RabbitSendService.java

@@ -1,7 +1,6 @@
 package com.uas.platform.b2b.support.mq;
 
 import com.alibaba.fastjson.JSON;
-import com.uas.platform.b2b.core.util.StringUtil;
 import com.uas.platform.b2b.support.mq.config.RabbitMqConfig;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -68,7 +67,6 @@ public class RabbitSendService implements RabbitTemplate.ConfirmCallback, Rabbit
 		return sendMessage(queueName, RabbitMqConfig.RABBIT_USER_ID, RabbitMqConfig.RABBIT_APP_ID, bizType, String.valueOf(bizId));
 	}
 
-
 	/**
 	 * 发送消息
 	 *

+ 15 - 0
src/main/java/com/uas/platform/b2b/support/mq/config/RabbitMqConfig.java

@@ -18,6 +18,21 @@ public class RabbitMqConfig {
     public static final String QUEUE_SAAS_SALE_DOWN_NAME = "saas_sale_order";
     public static final String QUEUE_SAAS_PURCHASE_APCHECK_NAME = "saas_purchase_apcheck";
 
+    /**
+     * 上传销售订单
+     */
+    public static final String POST_SALE_ORDER = "POST_SALE_ORDER";
+
+    /**
+     * 上传销售订单结案状态
+     */
+    public static final String POST_SALE_ORDER_END = "POST_SALE_ORDER_END";
+
+    /**
+     * 上传对账单
+     */
+    public static final String POST_SALE_APCHECK = "POST_SALE_APCHECK";
+
     @Bean(name = QUEUE_SAAS_SALE_DOWN_NAME)
     public Queue getSassSaleDown() {
         return new Queue(QUEUE_SAAS_SALE_DOWN_NAME, true);

+ 3 - 3
src/test/java/com/uas/platform/b2b/mq/RabbitServiceTest.java

@@ -1,7 +1,7 @@
 package com.uas.platform.b2b.mq;
 
 import com.uas.platform.b2b.BaseJunitTest;
-import com.uas.platform.b2b.support.mq.service.RabbitService;
+import com.uas.platform.b2b.support.mq.RabbitSendService;
 import org.junit.Test;
 
 import javax.annotation.Resource;
@@ -15,11 +15,11 @@ import javax.annotation.Resource;
 public class RabbitServiceTest extends BaseJunitTest {
 
     @Resource
-    private RabbitService rabbitService;
+    private RabbitSendService rabbitSendService;
 
     @Test
     public void testSendApCheck() {
-        String msgId = rabbitService.sendMessage("b2b_purchase_apcheck", "POST_SALE_APCHECK", 4643L);
+        String msgId = rabbitSendService.sendMessage("b2b_purchase_apcheck", "POST_SALE_APCHECK", 4643L);
         System.out.println(msgId);
     }
 }