yq 3 éve
szülő
commit
949acb6eb5
38 módosított fájl, 294 hozzáadás és 1440 törlés
  1. 12 0
      src/main/java/com/usky/dxtop/controller/web/business/DeptController.java
  2. 5 4
      src/main/java/com/usky/dxtop/controller/web/business/StaffController.java
  3. 2 0
      src/main/java/com/usky/dxtop/service/DeptService.java
  4. 1 1
      src/main/java/com/usky/dxtop/service/StaffRadioService.java
  5. 12 1
      src/main/java/com/usky/dxtop/service/config/rabbitmq/ChargeTransConfig.java
  6. 0 74
      src/main/java/com/usky/dxtop/service/config/rabbitmq/DishTransConfig.java
  7. 83 0
      src/main/java/com/usky/dxtop/service/config/rabbitmq/RabbitmqFactoryAware.java
  8. 20 0
      src/main/java/com/usky/dxtop/service/config/rabbitmq/RabbitmqUtils.java
  9. 0 76
      src/main/java/com/usky/dxtop/service/config/rabbitmq/cardreturn/ReturnConsumeConfig.java
  10. 0 75
      src/main/java/com/usky/dxtop/service/config/rabbitmq/cardreturn/ReturnProduceConfig.java
  11. 0 76
      src/main/java/com/usky/dxtop/service/config/rabbitmq/cartget/CartGetConsumeConfig.java
  12. 0 75
      src/main/java/com/usky/dxtop/service/config/rabbitmq/cartget/CartGetProduceConfig.java
  13. 0 76
      src/main/java/com/usky/dxtop/service/config/rabbitmq/charge/ChargeConsumeConfig.java
  14. 0 75
      src/main/java/com/usky/dxtop/service/config/rabbitmq/charge/ChargeProduceConfig.java
  15. 0 75
      src/main/java/com/usky/dxtop/service/config/rabbitmq/face/FaceConsumeConfig.java
  16. 0 74
      src/main/java/com/usky/dxtop/service/config/rabbitmq/face/FaceProduceConfig.java
  17. 0 75
      src/main/java/com/usky/dxtop/service/config/rabbitmq/group/GroupConsumeConfig.java
  18. 0 75
      src/main/java/com/usky/dxtop/service/config/rabbitmq/group/GroupProduceConfig.java
  19. 0 76
      src/main/java/com/usky/dxtop/service/config/rabbitmq/loss/LossConsumeConfig.java
  20. 0 74
      src/main/java/com/usky/dxtop/service/config/rabbitmq/loss/LossProduceConfig.java
  21. 0 75
      src/main/java/com/usky/dxtop/service/config/rabbitmq/profile/ProfileConsumeConfig.java
  22. 0 75
      src/main/java/com/usky/dxtop/service/config/rabbitmq/profile/ProfileProduceConfig.java
  23. 0 76
      src/main/java/com/usky/dxtop/service/config/rabbitmq/schedule/ScheduleConsumerConfig.java
  24. 0 70
      src/main/java/com/usky/dxtop/service/config/rabbitmq/schedule/ScheduleProduceConfig.java
  25. 0 76
      src/main/java/com/usky/dxtop/service/config/rabbitmq/uncharge/UnChargeConsumeConfig.java
  26. 75 0
      src/main/java/com/usky/dxtop/service/emun/RabbitmqBeenCode.java
  27. 14 10
      src/main/java/com/usky/dxtop/service/impl/DeptServiceImpl.java
  28. 5 18
      src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java
  29. 5 21
      src/main/java/com/usky/dxtop/service/impl/StaffRadioServiceImpl.java
  30. 8 25
      src/main/java/com/usky/dxtop/service/impl/StaffServiceImpl.java
  31. 7 2
      src/main/java/com/usky/dxtop/service/listener/CartGetMqListener.java
  32. 6 2
      src/main/java/com/usky/dxtop/service/listener/ChargeMqListener.java
  33. 2 0
      src/main/java/com/usky/dxtop/service/listener/ChargeTransMqListener.java
  34. 5 2
      src/main/java/com/usky/dxtop/service/listener/DishTransMqListener.java
  35. 6 2
      src/main/java/com/usky/dxtop/service/listener/FaceMqListener.java
  36. 5 2
      src/main/java/com/usky/dxtop/service/listener/GroupMqListener.java
  37. 5 2
      src/main/java/com/usky/dxtop/service/listener/PersonMqListener.java
  38. 16 0
      src/test/java/com/usky/dxtop/SmApiTest.java

+ 12 - 0
src/main/java/com/usky/dxtop/controller/web/business/DeptController.java

@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 部门
  * @author yq
@@ -33,5 +35,15 @@ public class DeptController {
     public ApiResult<CommonPage<Dept>> page(@RequestBody StaffRequest staffRequest){
         return ApiResult.success(deptService.page(staffRequest));
     }
+
+    /**
+     * 全部记录
+     * @param staffRequest
+     * @return
+     */
+    @PostMapping("list")
+    public ApiResult<List<Dept>> list(@RequestBody StaffRequest staffRequest){
+        return ApiResult.success(deptService.list(staffRequest));
+    }
 }
 

+ 5 - 4
src/main/java/com/usky/dxtop/controller/web/business/StaffController.java

@@ -55,15 +55,16 @@ public class StaffController {
 
     /**
      * 根据部门批量新增
-     * @param deptId 部门编号
+     * @param deptIds 部门编号
      * @param isBinding 是否绑定
      * @param radioId 比例id
-     * @param isRe 是否绑定子部门
      * @return
      */
     @PutMapping("/addListByDept")
-    public ApiResult addListByDept(@RequestParam Long deptId,@RequestParam Boolean isBinding,@RequestParam Long radioId,@RequestParam Boolean isRe){
-        staffRadioService.addListByDept(deptId,isBinding,radioId,isRe);
+    public ApiResult addListByDept(@RequestParam("deptIds[]") List<Long> deptIds,
+                                   @RequestParam("isBinding") Boolean isBinding,
+                                   @RequestParam("radioId") Long radioId){
+        staffRadioService.addListByDept(deptIds,isBinding,radioId);
         return ApiResult.success();
     }
 

+ 2 - 0
src/main/java/com/usky/dxtop/service/DeptService.java

@@ -26,6 +26,8 @@ public interface DeptService extends IService<Dept> {
     CommonPage<Dept> page(StaffRequest staffRequest);
 
 
+    List<Dept> list(StaffRequest staffRequest);
+
     /**
      * 构建前端所需要树结构
      *

+ 1 - 1
src/main/java/com/usky/dxtop/service/StaffRadioService.java

@@ -25,7 +25,7 @@ public interface StaffRadioService extends IService<StaffRadio> {
     void addList(List<StaffRadio> list);
 
 
-    boolean addListByDept(Long deptId,Boolean isBinding,Long radioId,Boolean isRe);
+    boolean addListByDept(List<Long> deptIds,Boolean isBinding,Long radioId);
 
     /**
      * 人员比例

+ 12 - 1
src/main/java/com/usky/dxtop/service/config/rabbitmq/ChargeTransConfig.java

@@ -57,7 +57,9 @@ public class ChargeTransConfig {
     @Bean(ADMIN)
     @Primary
     AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
+        RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory);
+        rabbitAdmin.setAutoStartup(true);
+        return rabbitAdmin;
     }
 
     @Bean(EXCHANGE)
@@ -80,4 +82,13 @@ public class ChargeTransConfig {
         return binding;
     }
 
+    //创建交换机和对列
+    @Bean
+    public String createExchangeQueue (@Qualifier(CONNECTION) ConnectionFactory connectionFactory){
+        AmqpAdmin amqpAdmin = amqpAdmin(connectionFactory);
+        amqpAdmin.declareExchange(exchange(amqpAdmin));
+        amqpAdmin.declareQueue(queue(amqpAdmin));
+        amqpAdmin.declareBinding(bindingPersonDirect(amqpAdmin));
+        return "";
+    }
 }

+ 0 - 74
src/main/java/com/usky/dxtop/service/config/rabbitmq/DishTransConfig.java

@@ -1,74 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq;
-
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author yq
- * @date 2021/9/15 9:32
- */
-@Configuration
-@Data
-public class DishTransConfig {
-
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "dish_trade_produce";
-    private final static String MODULE_NAME = "dishT";
-
-    public final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    public final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    public final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    public final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    public final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    public final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    public final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 83 - 0
src/main/java/com/usky/dxtop/service/config/rabbitmq/RabbitmqFactoryAware.java

@@ -0,0 +1,83 @@
+package com.usky.dxtop.service.config.rabbitmq;
+
+import com.usky.dxtop.service.emun.RabbitmqBeenCode;
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.DirectExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.RabbitAdmin;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author yq
+ * @date 2022/6/9 10:56
+ */
+@Component
+public class RabbitmqFactoryAware implements BeanFactoryAware {
+
+    @Autowired
+    private RabbitmqConfig rabbitmqConfig;
+
+    @Autowired
+    private SimpleRabbitListenerContainerFactoryConfigurer simpleRabbitListenerContainerFactoryConfigurer;
+    @Override
+    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+        DefaultListableBeanFactory listableBeanFactory = (DefaultListableBeanFactory)beanFactory;
+        for (RabbitmqBeenCode rabbitmqBeenCode:RabbitmqBeenCode.values()) {
+            //创建连接工厂
+            ConnectionFactory connectionFactory = rabbitmqConfig.connectionFactory(rabbitmqBeenCode.getName());
+            registerSingleton(listableBeanFactory,
+                    rabbitmqBeenCode.getModelName() + RabbitmqConfig.CONNECTION,
+                    connectionFactory);
+            //创建Template
+            registerSingleton(listableBeanFactory,
+                    rabbitmqBeenCode.getModelName() + RabbitmqConfig.TEMPLATE,
+                    rabbitmqConfig.rabbitTemplate(connectionFactory));
+            //创建listenerFactory
+            registerSingleton(listableBeanFactory,
+                    rabbitmqBeenCode.getModelName() + RabbitmqConfig.LISTENER,
+                    rabbitmqConfig.listenerFactory(simpleRabbitListenerContainerFactoryConfigurer,connectionFactory));
+
+            //创建admin
+            RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory);
+            rabbitAdmin.setAutoStartup(true);
+            registerSingleton(listableBeanFactory,
+                    rabbitmqBeenCode.getModelName() + RabbitmqConfig.ADMIN,
+                    rabbitAdmin);
+
+            //创建exchange
+            DirectExchange exchange = rabbitmqConfig.exchange(rabbitmqBeenCode.getName(), rabbitAdmin);
+            registerSingleton(listableBeanFactory,
+                    rabbitmqBeenCode.getModelName() + RabbitmqConfig.EXCHANGE,
+                    exchange);
+
+            //创建queue
+            Queue queue = rabbitmqConfig.queue(rabbitmqBeenCode.getName(), rabbitAdmin);
+            registerSingleton(listableBeanFactory,
+                    rabbitmqBeenCode.getModelName() + RabbitmqConfig.QUEUE,
+                    queue);
+
+            //创建绑定
+            Binding binding = BindingBuilder.bind(queue).to(exchange).with(rabbitmqBeenCode.getName());
+            binding.setAdminsThatShouldDeclare(rabbitAdmin);
+            registerSingleton(listableBeanFactory,
+                    rabbitmqBeenCode.getModelName() + RabbitmqConfig.BINDING,
+                    binding);
+
+            rabbitAdmin.declareExchange(exchange);
+            rabbitAdmin.declareQueue(queue);
+            rabbitAdmin.declareBinding(binding);
+        }
+    }
+
+    public void registerSingleton(DefaultListableBeanFactory listableBeanFactory,String name,Object been){
+        listableBeanFactory.registerSingleton(name,been);
+    }
+}

+ 20 - 0
src/main/java/com/usky/dxtop/service/config/rabbitmq/RabbitmqUtils.java

@@ -0,0 +1,20 @@
+package com.usky.dxtop.service.config.rabbitmq;
+
+import com.usky.dxtop.common.utils.spring.SpringUtils;
+import com.usky.dxtop.service.emun.RabbitmqBeenCode;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author yq
+ * @date 2022/6/9 11:24
+ */
+@Configuration
+public class RabbitmqUtils {
+    public final static String CONTAINER_NAME = RabbitmqBeenCode.CART_GET_PRODUCT.getModelName()+ RabbitmqConfig.LISTENER;
+
+
+    public static RabbitTemplate getRabbitmqTemplate(RabbitmqBeenCode rabbitmqBeenCode){
+        return SpringUtils.getBean(rabbitmqBeenCode.getModelName() + RabbitmqConfig.TEMPLATE);
+    }
+}

+ 0 - 76
src/main/java/com/usky/dxtop/service/config/rabbitmq/cardreturn/ReturnConsumeConfig.java

@@ -1,76 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.cardreturn;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 离职退卡
- * @author yq
- * @date 2021/9/15 10:39
- */
-@Configuration
-@Data
-public class ReturnConsumeConfig {
-
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_return_consume";
-    private final static String MODULE_NAME = "returnC";
-
-    private final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    private final static String TEMPLATE = MODULE_NAME+ RabbitmqConfig.TEMPLATE;
-    private final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    private final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    private final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    private final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    private final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 75
src/main/java/com/usky/dxtop/service/config/rabbitmq/cardreturn/ReturnProduceConfig.java

@@ -1,75 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.cardreturn;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author yq
- * @date 2021/9/15 13:14
- */
-@Configuration
-@Data
-public class ReturnProduceConfig {
-
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_return_produce";
-    private final static String MODULE_NAME = "returnP";
-
-    private final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    private final static String TEMPLATE = MODULE_NAME+ RabbitmqConfig.TEMPLATE;
-    private final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    private final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    private final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    private final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    private final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 76
src/main/java/com/usky/dxtop/service/config/rabbitmq/cartget/CartGetConsumeConfig.java

@@ -1,76 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.cartget;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 获取金额
- * @author yq
- * @date 2021/9/15 10:41
- */
-@Configuration
-@Data
-public class CartGetConsumeConfig {
-
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "balance_get_consume";
-    public final static String MODULE_NAME = "cardgetC";
-
-    public final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    public final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    public final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    public final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    public final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    public final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    public final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 75
src/main/java/com/usky/dxtop/service/config/rabbitmq/cartget/CartGetProduceConfig.java

@@ -1,75 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.cartget;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author yq
- * @date 2021/9/15 13:15
- */
-@Configuration
-@Data
-public class CartGetProduceConfig {
-
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "balance_get_produce";
-    public final static String MODULE_NAME = "cardgetP";
-
-    public final static String CONNECTION = MODULE_NAME+ RabbitmqConfig.CONNECTION;
-    public final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    public final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    public final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    public final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    public final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    public final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 76
src/main/java/com/usky/dxtop/service/config/rabbitmq/charge/ChargeConsumeConfig.java

@@ -1,76 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.charge;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 充值
- * @author yq
- * @date 2021/9/15 11:06
- */
-@Configuration
-@Data
-public class ChargeConsumeConfig {
-
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_charge_consume";
-    private final static String MODULE_NAME = "chargeC";
-
-    public final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    public final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    public final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    public final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    public final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    public final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    public final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-            return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 75
src/main/java/com/usky/dxtop/service/config/rabbitmq/charge/ChargeProduceConfig.java

@@ -1,75 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.charge;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author yq
- * @date 2021/9/15 13:18
- */
-@Configuration
-@Data
-public class ChargeProduceConfig {
-
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_charge_produce";
-    private final static String MODULE_NAME = "chargeP";
-
-    public final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    public final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    public final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    public final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    public final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    public final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    public final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 75
src/main/java/com/usky/dxtop/service/config/rabbitmq/face/FaceConsumeConfig.java

@@ -1,75 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.face;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 人脸信息
- * @author yq
- * @date 2021/9/15 10:37
- */
-@Configuration
-@Data
-public class FaceConsumeConfig {
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "profile_face_consume";
-    private final static String MODULE_NAME = "faceC";
-
-    public final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    public final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    public final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    public final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    public final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    public final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    public final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 74
src/main/java/com/usky/dxtop/service/config/rabbitmq/face/FaceProduceConfig.java

@@ -1,74 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.face;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author yq
- * @date 2021/9/15 13:12
- */
-@Configuration
-@Data
-public class FaceProduceConfig {
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "profile_face_produce";
-    private final static String MODULE_NAME = "faceP";
-
-    public final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    public final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    public final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    public final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    public final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    public final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    public final static String BINDING = MODULE_NAME+ RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 75
src/main/java/com/usky/dxtop/service/config/rabbitmq/group/GroupConsumeConfig.java

@@ -1,75 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.group;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 部门信息
- * @author yq
- * @date 2021/9/15 10:38
- */
-@Configuration
-@Data
-public class GroupConsumeConfig {
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "group_consume";
-    private final static String MODULE_NAME = "groupC";
-
-    public final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    public final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    public final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    public final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    public final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    public final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    public final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 75
src/main/java/com/usky/dxtop/service/config/rabbitmq/group/GroupProduceConfig.java

@@ -1,75 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.group;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author yq
- * @date 2021/9/15 13:16
- */
-@Configuration
-@Data
-public class GroupProduceConfig {
-
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "group_produce";
-    private final static String MODULE_NAME = "groupP";
-
-    public final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    public final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    public final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    public final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    public final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    public final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    public final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 76
src/main/java/com/usky/dxtop/service/config/rabbitmq/loss/LossConsumeConfig.java

@@ -1,76 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.loss;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 卡挂失/解挂同步
- * @author yq
- * @date 2021/9/15 10:42
- */
-@Configuration
-@Data
-public class LossConsumeConfig {
-
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_loss_consume";
-    private final static String MODULE_NAME = "lossC";
-
-    private final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    private final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    private final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    private final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    private final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    private final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    private final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 74
src/main/java/com/usky/dxtop/service/config/rabbitmq/loss/LossProduceConfig.java

@@ -1,74 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.loss;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author yq
- * @date 2021/9/15 13:17
- */
-@Configuration
-@Data
-public class LossProduceConfig {
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_loss_produce";
-    private final static String MODULE_NAME = "lossP";
-
-    private final static String CONNECTION = MODULE_NAME+ RabbitmqConfig.CONNECTION;
-    private final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    private final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    private final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    private final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    private final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    private final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 75
src/main/java/com/usky/dxtop/service/config/rabbitmq/profile/ProfileConsumeConfig.java

@@ -1,75 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.profile;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 人员信息同步
- * @author yq
- * @date 2021/9/15 10:36
- */
-@Configuration
-@Data
-public class ProfileConsumeConfig {
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "profile_consume";
-    private final static String MODULE_NAME = "profileC";
-
-    public final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    public final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    public final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    public final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    public final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    public final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    public final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 75
src/main/java/com/usky/dxtop/service/config/rabbitmq/profile/ProfileProduceConfig.java

@@ -1,75 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.profile;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author yq
- * @date 2021/9/15 13:12
- */
-@Configuration
-@Data
-public class ProfileProduceConfig {
-
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "profile_produce";
-    private final static String MODULE_NAME = "profileP";
-
-    public final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    public final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    public final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    public final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    public final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    public final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    public final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 76
src/main/java/com/usky/dxtop/service/config/rabbitmq/schedule/ScheduleConsumerConfig.java

@@ -1,76 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.schedule;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 排菜计划获取
- * @author yq
- * @date 2021/9/15 11:08
- */
-@Configuration
-@Data
-public class ScheduleConsumerConfig {
-
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "schedule_consume";
-    private final static String MODULE_NAME = "scheduleC";
-
-    private final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    private final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    private final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    private final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    private final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    private final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    private final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 70
src/main/java/com/usky/dxtop/service/config/rabbitmq/schedule/ScheduleProduceConfig.java

@@ -1,70 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.schedule;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-
-/**
- * @author yq
- * @date 2021/9/15 13:20
- */
-public class ScheduleProduceConfig {
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "schedule_produce";
-    private final static String MODULE_NAME = "scheduleP";
-
-    private final static String CONNECTION = MODULE_NAME+ RabbitmqConfig.CONNECTION;
-    private final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    private final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    private final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    private final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    private final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    private final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 0 - 76
src/main/java/com/usky/dxtop/service/config/rabbitmq/uncharge/UnChargeConsumeConfig.java

@@ -1,76 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.uncharge;
-
-import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
-import lombok.Data;
-import org.springframework.amqp.core.*;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 充值撤单
- * @author yq
- * @date 2021/9/15 10:43
- */
-@Configuration
-@Data
-public class UnChargeConsumeConfig {
-
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_uncharge_consume";
-    private final static String MODULE_NAME = "unChargeC";
-
-    private final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
-    private final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;
-    private final static String LISTENER = MODULE_NAME+RabbitmqConfig.LISTENER;
-    private final static String ADMIN = MODULE_NAME+RabbitmqConfig.ADMIN;
-    private final static String EXCHANGE = MODULE_NAME+RabbitmqConfig.EXCHANGE;
-    private final static String QUEUE = MODULE_NAME+RabbitmqConfig.QUEUE;
-    private final static String BINDING = MODULE_NAME+RabbitmqConfig.BINDING;
-
-    @Bean(name = CONNECTION)
-    public ConnectionFactory connectionFactory(){
-        return rabbitmqConfig.connectionFactory(NAME);
-    }
-
-    @Bean(name = TEMPLATE)
-    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION) ConnectionFactory connectionFactory ) {
-        return rabbitmqConfig.rabbitTemplate(connectionFactory);
-    }
-
-    @Bean(name = LISTENER)
-    public SimpleRabbitListenerContainerFactory listenerFactory(
-            SimpleRabbitListenerContainerFactoryConfigurer configurer,
-            @Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return rabbitmqConfig.listenerFactory(configurer,connectionFactory);
-    }
-
-    @Bean(ADMIN)
-    AmqpAdmin amqpAdmin(@Qualifier(CONNECTION) ConnectionFactory connectionFactory) {
-        return new RabbitAdmin(connectionFactory);
-    }
-
-    @Bean(EXCHANGE)
-    public DirectExchange exchange(@Qualifier(ADMIN) AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.exchange(NAME,amqpAdmin);
-    }
-
-    @Bean(QUEUE)
-    Queue queue(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        return rabbitmqConfig.queue(NAME,amqpAdmin);
-    }
-
-    @Bean(BINDING)
-    Binding bindingPersonDirect(@Qualifier(ADMIN)AmqpAdmin amqpAdmin) {
-        Binding binding = BindingBuilder.bind(queue(amqpAdmin)).to(exchange(amqpAdmin)).with(NAME);
-        binding.setAdminsThatShouldDeclare(amqpAdmin);
-        return binding;
-    }
-}

+ 75 - 0
src/main/java/com/usky/dxtop/service/emun/RabbitmqBeenCode.java

@@ -0,0 +1,75 @@
+package com.usky.dxtop.service.emun;
+
+/**
+ * @author yq
+ * @date 2022/6/9 10:30
+ */
+public enum  RabbitmqBeenCode {
+
+    CART_RETURN_CONSUMER("card_return_consume","returnC","离职退卡消费者"),
+    CART_RETURN_PRODUCT("card_return_produce","returnP","离职退卡生产者"),
+
+    CART_GET_CONSUMER("balance_get_consume","cardgetC","获取余额消费者"),
+    CART_GET_PRODUCT("balance_get_produce","cardgetP","获取余额消费者"),
+
+    CART_CHARGE_CONSUMER("card_charge_consume","chargeC","卡充值消费者"),
+    CART_cHARGE_PRODUCT("card_charge_produce","chargeP","卡充值生产者"),
+
+    PROFILE_FACE_CONSUMER("profile_face_consume","faceC","人脸同步消费者"),
+    PROFILE_FACE_PRODUCT("profile_face_produce","faceP","人脸同步生产者"),
+
+
+    PROFILE_DEPT_CONSUMER("group_consume","groupC","部门同步消费者"),
+    PROFILE_DEPT_PRODUCT("group_produce","groupP","部门同步生产者"),
+
+    CART_LOSS_CONSUMER("card_loss_consume","lossC","卡挂失消费者"),
+    CART_LOSS_PRODUCT("card_loss_produce","lossP","卡挂失生产者"),
+
+    PROFILE_CONSUMER("profile_consume","profileC","人员同步消费者"),
+    PROFILE_PRODUCT("profile_produce","profileP","人员同步生产者"),
+
+
+
+    SCHEDULE_CONSUMER("schedule_consume","scheduleC","排菜计划消费者"),
+    SCHEDULE_PRODUCT("schedule_produce","scheduleP","排菜计划生产者"),
+
+
+    CARD_UNCHARGE_CONSUMER("card_uncharge_consume","unChargeC","充值撤单消费者"),
+
+//    CHARGE_TRANS_PRODUCT("charge_trans_produce","chargeT","充值记录"),
+
+    DISH_TRANS_PRODUCT("dish_trade_produce","dishT","消费记录");
+
+
+    private String name;
+
+    private String modelName;
+
+    private String describe;
+
+    RabbitmqBeenCode(String name,String modelName,String describe){
+        this.name = name;
+        this.modelName = modelName;
+        this.describe = describe;
+    }
+
+    public static RabbitmqBeenCode parse(String name){
+        RabbitmqBeenCode rabbitmqBeenCode = null;
+        for (RabbitmqBeenCode o:RabbitmqBeenCode.values()) {
+            if (o.getName().equals(name)){
+                rabbitmqBeenCode = o;
+                break;
+            }
+        }
+        return rabbitmqBeenCode;
+    }
+
+
+    public String getModelName(){
+        return modelName;
+    }
+
+    public String getName(){
+        return name;
+    }
+}

+ 14 - 10
src/main/java/com/usky/dxtop/service/impl/DeptServiceImpl.java

@@ -14,13 +14,12 @@ import com.usky.dxtop.model.Dept;
 import com.usky.dxtop.model.MsgLog;
 import com.usky.dxtop.service.DeptService;
 import com.usky.dxtop.service.MsgLogService;
-import com.usky.dxtop.service.config.rabbitmq.group.GroupConsumeConfig;
+import com.usky.dxtop.service.config.rabbitmq.RabbitmqUtils;
 import com.usky.dxtop.service.constant.MsgLogBusinessCode;
+import com.usky.dxtop.service.emun.RabbitmqBeenCode;
 import com.usky.dxtop.service.vo.StaffRequest;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -43,10 +42,6 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
     @Autowired
     private MsgLogService msgLogService;
 
-    @Autowired
-    @Qualifier(GroupConsumeConfig.TEMPLATE)
-    private RabbitTemplate groupRabbitTemplate;
-
     @Override
     public CommonPage<Dept> page(StaffRequest staffRequest) {
         IPage<Dept> page = new Page<>(staffRequest.getCurrent(), staffRequest.getSize());
@@ -58,6 +53,15 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
     }
 
+    @Override
+    public List<Dept> list(StaffRequest staffRequest) {
+        LambdaQueryWrapper<Dept> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(StringUtils.isNotBlank(staffRequest.getName()),Dept::getName,staffRequest.getName())
+                .between(null != staffRequest.getStartTime() && null != staffRequest.getEndTime(),Dept::getCreateTime,
+                        staffRequest.getStartTime(),staffRequest.getEndTime());
+        return this.list(queryWrapper);
+    }
+
     @Override
     public List<Dept> buildDeptTree(List<Dept> depts) {
         List<Dept> returnList = new ArrayList<>();
@@ -145,12 +149,12 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
         map.put("name",dept.getName());
         MsgLog msgLog = new MsgLog();
         msgLog.setBusinessId(String.format("%s%s", MsgLogBusinessCode.DEPT,dept.getDId()));
-        msgLog.setExchange(GroupConsumeConfig.NAME);
-        msgLog.setRoutingKey(GroupConsumeConfig.NAME);
+        msgLog.setExchange(RabbitmqBeenCode.PROFILE_DEPT_CONSUMER.getName());
+        msgLog.setRoutingKey(RabbitmqBeenCode.PROFILE_DEPT_CONSUMER.getName());
         msgLog.setMsg(JSON.toJSONString(map));
         msgLogService.addOrUpdate(msgLog);
         map.put("seq",msgLog.getId());
         CorrelationData correlationData = new CorrelationData(msgLog.getId().toString());
-        groupRabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), map,correlationData);
+        RabbitmqUtils.getRabbitmqTemplate(RabbitmqBeenCode.PROFILE_DEPT_CONSUMER).convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), map,correlationData);
     }
 }

+ 5 - 18
src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import com.usky.dxtop.common.core.domain.model.LoginUser;
 import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.common.exception.CustomException;
@@ -20,12 +19,9 @@ import com.usky.dxtop.mapper.OrderMapper;
 import com.usky.dxtop.model.*;
 import com.usky.dxtop.service.*;
 import com.usky.dxtop.service.api.TopApiConfiger;
-import com.usky.dxtop.service.config.rabbitmq.charge.ChargeConsumeConfig;
+import com.usky.dxtop.service.config.rabbitmq.RabbitmqUtils;
 import com.usky.dxtop.service.constant.MsgLogBusinessCode;
-import com.usky.dxtop.service.emun.AsyncResultType;
-import com.usky.dxtop.service.emun.OrderPayType;
-import com.usky.dxtop.service.emun.OrderSceneCode;
-import com.usky.dxtop.service.emun.OrderStatus;
+import com.usky.dxtop.service.emun.*;
 import com.usky.dxtop.service.vo.ChargeVO;
 import com.usky.dxtop.service.vo.OrderExport;
 import com.usky.dxtop.service.vo.OrderReport;
@@ -36,13 +32,10 @@ import ma.glasnost.orika.MapperFactory;
 import ma.glasnost.orika.impl.DefaultMapperFactory;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -50,8 +43,6 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
 import java.util.stream.Collectors;
 
 /**
@@ -76,10 +67,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private CallApiLogService callApiLogService;
 
-    @Autowired
-    @Qualifier(ChargeConsumeConfig.TEMPLATE)
-    private RabbitTemplate rabbitTemplate;
-
     @Autowired
     private StaffRadioService staffRadioService;
     @Autowired
@@ -205,15 +192,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             chargeVo.setCard(order.getCard());
             MsgLog msgLog = new MsgLog();
             msgLog.setBusinessId(String.format("%s%s",MsgLogBusinessCode.ORDER,order.getId()));
-            msgLog.setExchange(ChargeConsumeConfig.NAME);
-            msgLog.setRoutingKey(ChargeConsumeConfig.NAME);
+            msgLog.setExchange(RabbitmqBeenCode.CART_CHARGE_CONSUMER.getName());
+            msgLog.setRoutingKey(RabbitmqBeenCode.CART_CHARGE_CONSUMER.getName());
             msgLog.setMsg(JSON.toJSONString(chargeVo));
             msgLog.setId(System.currentTimeMillis());
             msgLog.setCreateTime(new Date());
             msgLogService.save(msgLog);
             chargeVo.setSeq(msgLog.getId());
             CorrelationData correlationData = new CorrelationData(msgLog.getId().toString());
-            rabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), chargeVo,correlationData);
+            RabbitmqUtils.getRabbitmqTemplate(RabbitmqBeenCode.CART_CHARGE_CONSUMER).convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), chargeVo,correlationData);
         }catch (Exception e){
             b = false;
             log.error("---order---卡充值消息发送异常"+ e.getMessage());

+ 5 - 21
src/main/java/com/usky/dxtop/service/impl/StaffRadioServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.mapper.StaffRadioMapper;
-import com.usky.dxtop.model.Dept;
 import com.usky.dxtop.model.Staff;
 import com.usky.dxtop.model.StaffRadio;
 import com.usky.dxtop.service.DeptService;
@@ -15,7 +14,6 @@ import com.usky.dxtop.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -62,25 +60,11 @@ public class StaffRadioServiceImpl extends ServiceImpl<StaffRadioMapper, StaffRa
     }
 
     @Override
-    public boolean addListByDept(Long deptId, Boolean isBinding,Long radioId,Boolean isRe) {
-        List<Long> list;
-        if (isRe){
-            List<Long> deptIdList = new ArrayList<>();
-            List<Dept> depts = deptService.list();
-            Dept dept = deptService.getById(deptId);
-            deptIdList.add(dept.getDId());
-            deptService.getChildListByDept(depts,dept,deptIdList);
-            LambdaQueryWrapper<Staff> queryWrapper = Wrappers.lambdaQuery();
-            queryWrapper.select(Staff::getSId)
-                    .in(Staff::getDeptId,deptIdList);
-            list = staffService.list(queryWrapper).stream().map(Staff::getSId).collect(Collectors.toList());
-        }else {
-            LambdaQueryWrapper<Staff> staffLambdaQueryWrapper = Wrappers.lambdaQuery();
-            staffLambdaQueryWrapper
-                    .select(Staff::getSId)
-                    .eq(Staff::getDeptId,deptId);
-            list = staffService.list(staffLambdaQueryWrapper).stream().map(Staff::getSId).collect(Collectors.toList());
-        }
+    public boolean addListByDept(List<Long> deptIds, Boolean isBinding,Long radioId) {
+        LambdaQueryWrapper<Staff> staffLambdaQueryWrapper = Wrappers.lambdaQuery();
+        staffLambdaQueryWrapper.select(Staff::getSId)
+                .in(Staff::getDeptId,deptIds);
+        List<Long> list = staffService.list(staffLambdaQueryWrapper).stream().map(Staff::getSId).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(list)){
             LambdaQueryWrapper<StaffRadio> queryWrapper = Wrappers.lambdaQuery();
             queryWrapper.in(StaffRadio::getStaffId,list);

+ 8 - 25
src/main/java/com/usky/dxtop/service/impl/StaffServiceImpl.java

@@ -15,15 +15,12 @@ import com.usky.dxtop.model.MsgLog;
 import com.usky.dxtop.model.Staff;
 import com.usky.dxtop.service.MsgLogService;
 import com.usky.dxtop.service.StaffService;
-import com.usky.dxtop.service.config.rabbitmq.cartget.CartGetConsumeConfig;
-import com.usky.dxtop.service.config.rabbitmq.face.FaceConsumeConfig;
-import com.usky.dxtop.service.config.rabbitmq.profile.ProfileConsumeConfig;
+import com.usky.dxtop.service.config.rabbitmq.RabbitmqUtils;
 import com.usky.dxtop.service.constant.MsgLogBusinessCode;
+import com.usky.dxtop.service.emun.RabbitmqBeenCode;
 import com.usky.dxtop.service.vo.StaffRequest;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -42,24 +39,10 @@ import java.util.Optional;
 @Service
 public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements StaffService {
 
-    @Autowired
-    @Qualifier(CartGetConsumeConfig.TEMPLATE)
-    private RabbitTemplate rabbitTemplate;
-
     @Autowired
     private MsgLogService msgLogService;
 
 
-    @Autowired
-    @Qualifier(ProfileConsumeConfig.TEMPLATE)
-    private RabbitTemplate profileRabbitTemplate;
-
-
-    @Autowired
-    @Qualifier(FaceConsumeConfig.TEMPLATE)
-    private RabbitTemplate faceRabbitTemplate;
-
-
     @Override
     public CommonPage<Staff> page(StaffRequest staffRequest) {
         IPage<Staff> page = new Page<>(staffRequest.getCurrent(), staffRequest.getSize());
@@ -105,13 +88,13 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
         map.put("level_name","员工卡");
         MsgLog msgLog = new MsgLog();
         msgLog.setBusinessId(String.format("%s%s", MsgLogBusinessCode.STAFF,staff.getSId()));
-        msgLog.setExchange(ProfileConsumeConfig.NAME);
-        msgLog.setRoutingKey(ProfileConsumeConfig.NAME);
+        msgLog.setExchange(RabbitmqBeenCode.PROFILE_CONSUMER.getName());
+        msgLog.setRoutingKey(RabbitmqBeenCode.PROFILE_CONSUMER.getName());
         msgLog.setMsg(JSON.toJSONString(map));
         msgLogService.addOrUpdate(msgLog);
         map.put("seq",msgLog.getId());
         CorrelationData correlationData = new CorrelationData(msgLog.getId().toString());
-        profileRabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), map,correlationData);
+        RabbitmqUtils.getRabbitmqTemplate(RabbitmqBeenCode.PROFILE_CONSUMER).convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), map,correlationData);
     }
 
 
@@ -126,14 +109,14 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
         map.put("mob",staff.getSId());
         MsgLog msgLog = new MsgLog();
         msgLog.setBusinessId(String.format("%s%s", MsgLogBusinessCode.FACE,staff.getSId()));
-        msgLog.setExchange(FaceConsumeConfig.NAME);
-        msgLog.setRoutingKey(FaceConsumeConfig.NAME);
+        msgLog.setExchange(RabbitmqBeenCode.PROFILE_FACE_CONSUMER.getName());
+        msgLog.setRoutingKey(RabbitmqBeenCode.PROFILE_FACE_CONSUMER.getName());
         map.put("img",staff.getFaceId());
         msgLog.setMsg(JSON.toJSONString(map));
         msgLogService.addOrUpdate(msgLog);
         map.put("seq",msgLog.getId());
         map.put("img",encode);
         CorrelationData correlationData = new CorrelationData(msgLog.getId().toString());
-        faceRabbitTemplate.convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), map,correlationData);
+        RabbitmqUtils.getRabbitmqTemplate(RabbitmqBeenCode.PROFILE_FACE_CONSUMER).convertAndSend(msgLog.getExchange(), msgLog.getRoutingKey(), map,correlationData);
     }
 }

+ 7 - 2
src/main/java/com/usky/dxtop/service/listener/CartGetMqListener.java

@@ -2,7 +2,6 @@ package com.usky.dxtop.service.listener;
 
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.service.MsgLogService;
-import com.usky.dxtop.service.config.rabbitmq.cartget.CartGetProduceConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -21,10 +20,16 @@ import java.nio.charset.StandardCharsets;
 @Component
 public class CartGetMqListener {
 
+
+    private final static String QUEUE_NAME = "balance_get_produce";
+
+    private final static String LISTENER_NAME = "cardgetPListenerFactory";
+
     @Autowired
     private MsgLogService msgLogService;
+
     @Transactional(rollbackFor = Exception.class)
-    @RabbitListener(queues = CartGetProduceConfig.NAME, containerFactory = CartGetProduceConfig.LISTENER)
+    @RabbitListener(queues = QUEUE_NAME, containerFactory = LISTENER_NAME)
     public void dealDeclareMessage(Message message) {
         try {
             //消息类型

+ 6 - 2
src/main/java/com/usky/dxtop/service/listener/ChargeMqListener.java

@@ -5,7 +5,6 @@ import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.model.Order;
 import com.usky.dxtop.service.MsgLogService;
 import com.usky.dxtop.service.OrderService;
-import com.usky.dxtop.service.config.rabbitmq.charge.ChargeProduceConfig;
 import com.usky.dxtop.service.constant.MsgLogBusinessCode;
 import com.usky.dxtop.service.emun.OrderStatus;
 import lombok.extern.slf4j.Slf4j;
@@ -25,12 +24,17 @@ import java.nio.charset.StandardCharsets;
 @Component
 public class ChargeMqListener {
 
+    private final static String QUEUE_NAME = "card_charge_produce";
+
+    private final static String LISTENER_NAME = "chargePListenerFactory";
+
     @Autowired
     private OrderService orderService;
     @Autowired
     private MsgLogService msgLogService;
     @Transactional(rollbackFor = Exception.class)
-    @RabbitListener(queues = ChargeProduceConfig.NAME, containerFactory = ChargeProduceConfig.LISTENER)
+
+    @RabbitListener(queues = QUEUE_NAME, containerFactory = LISTENER_NAME)
     public void dealDeclareMessage(Message message) {
         try {
             String s = new String(message.getBody(), StandardCharsets.UTF_8);

+ 2 - 0
src/main/java/com/usky/dxtop/service/listener/ChargeTransMqListener.java

@@ -28,6 +28,7 @@ import java.util.Map;
 @Component
 public class ChargeTransMqListener {
 
+
     private static final String URL = "https://smartpark.caih.com/vuepay/#/record?id=1";
 
     @Autowired
@@ -38,6 +39,7 @@ public class ChargeTransMqListener {
 
     @Autowired
     private WxApi wxApi;
+
     @RabbitListener(queues = ChargeTransConfig.NAME, containerFactory = ChargeTransConfig.LISTENER)
     public void dealDeclareMessage(Message message) {
         try {

+ 5 - 2
src/main/java/com/usky/dxtop/service/listener/DishTransMqListener.java

@@ -9,7 +9,6 @@ import com.usky.dxtop.model.Staff;
 import com.usky.dxtop.service.DishService;
 import com.usky.dxtop.service.StaffService;
 import com.usky.dxtop.service.api.WxApi;
-import com.usky.dxtop.service.config.rabbitmq.DishTransConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -28,6 +27,9 @@ import java.util.Map;
 @Component
 public class DishTransMqListener {
 
+    private final static String QUEUE_NAME = "dish_trade_produce";
+
+    private final static String LISTENER_NAME = "dishTListenerFactory";
 
     private static final String URL = "https://smartpark.caih.com/vuepay/#/record?id=2";
     @Autowired
@@ -36,7 +38,8 @@ public class DishTransMqListener {
     private StaffService staffService;
     @Autowired
     private WxApi wxApi;
-    @RabbitListener(queues = DishTransConfig.NAME, containerFactory = DishTransConfig.LISTENER)
+
+    @RabbitListener(queues = QUEUE_NAME, containerFactory = LISTENER_NAME)
     public void dealDeclareMessage(Message message) {
         try {
             //消息类型

+ 6 - 2
src/main/java/com/usky/dxtop/service/listener/FaceMqListener.java

@@ -4,7 +4,6 @@ import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.model.Staff;
 import com.usky.dxtop.service.MsgLogService;
 import com.usky.dxtop.service.StaffService;
-import com.usky.dxtop.service.config.rabbitmq.face.FaceProduceConfig;
 import com.usky.dxtop.service.constant.MsgLogBusinessCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -22,11 +21,16 @@ import java.nio.charset.StandardCharsets;
 @Component
 public class FaceMqListener {
 
+    private final static String QUEUE_NAME = "profile_face_produce";
+
+    private final static String LISTENER_NAME = "facePListenerFactory";
+
     @Autowired
     private MsgLogService msgLogService;
     @Autowired
     private StaffService staffService;
-    @RabbitListener(queues = FaceProduceConfig.NAME, containerFactory = FaceProduceConfig.LISTENER)
+
+    @RabbitListener(queues = QUEUE_NAME, containerFactory = LISTENER_NAME)
     public void dealDeclareMessage(Message message) {
         try {
             String s = new String(message.getBody(), StandardCharsets.UTF_8);

+ 5 - 2
src/main/java/com/usky/dxtop/service/listener/GroupMqListener.java

@@ -4,7 +4,6 @@ import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.model.Dept;
 import com.usky.dxtop.service.DeptService;
 import com.usky.dxtop.service.MsgLogService;
-import com.usky.dxtop.service.config.rabbitmq.group.GroupProduceConfig;
 import com.usky.dxtop.service.constant.MsgLogBusinessCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -21,12 +20,16 @@ import java.nio.charset.StandardCharsets;
 @Slf4j
 @Component
 public class GroupMqListener {
+    private final static String QUEUE_NAME = "group_produce";
+
+    private final static String LISTENER_NAME = "groupPListenerFactory";
 
     @Autowired
     private MsgLogService msgLogService;
     @Autowired
     private DeptService deptService;
-    @RabbitListener(queues = GroupProduceConfig.NAME, containerFactory = GroupProduceConfig.LISTENER)
+
+    @RabbitListener(queues = QUEUE_NAME, containerFactory = LISTENER_NAME)
     public void dealDeclareMessage(Message message) {
         try {
             String s = new String(message.getBody(), StandardCharsets.UTF_8);

+ 5 - 2
src/main/java/com/usky/dxtop/service/listener/PersonMqListener.java

@@ -4,7 +4,6 @@ import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.model.Staff;
 import com.usky.dxtop.service.MsgLogService;
 import com.usky.dxtop.service.StaffService;
-import com.usky.dxtop.service.config.rabbitmq.profile.ProfileProduceConfig;
 import com.usky.dxtop.service.constant.MsgLogBusinessCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -21,11 +20,15 @@ import java.nio.charset.StandardCharsets;
 @Slf4j
 @Component
 public class PersonMqListener {
+    private final static String QUEUE_NAME = "profile_produce";
+
+    private final static String LISTENER_NAME = "profilePListenerFactory";
+
     @Autowired
     private MsgLogService msgLogService;
     @Autowired
     private StaffService staffService;
-    @RabbitListener(queues = ProfileProduceConfig.NAME, containerFactory = ProfileProduceConfig.LISTENER)
+    @RabbitListener(queues = QUEUE_NAME, containerFactory = LISTENER_NAME)
     public void dealDeclareMessage(Message message) {
         try {
             String s = new String(message.getBody(), StandardCharsets.UTF_8);

+ 16 - 0
src/test/java/com/usky/dxtop/SmApiTest.java

@@ -73,5 +73,21 @@ public class SmApiTest {
 
 
 
+//    @Qualifier("dd1")
+//    private Test1 test1;
+//
+//    @Qualifier("dd2")
+//    private Test1 test2;
+//
+//    @Test
+//    public void test5(){
+//        Test1 test1 = SpringUtils.getBean("dd1");
+//        Test1 test2 = SpringUtils.getBean("dd2");
+//        test1.send();
+//        test2.send();
+//    }
+
+
+
 
 }