修改队列配置

src/main/java/com/usky/dxtop/service/config/rabbitmq/cardreturn/ReturnConsumeConfig.java

@@ -14,6 +14,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
+ * 离职退卡
  * @author yq
  * @date 2021/9/15 10:39
  */

src/main/java/com/usky/dxtop/service/config/rabbitmq/subsidy/SubsidyConsumeConfig.java → src/main/java/com/usky/dxtop/service/config/rabbitmq/cartget/CartGetConsumeConfig.java

@@ -1,4 +1,4 @@
-package com.usky.dxtop.service.config.rabbitmq.subsidy;
+package com.usky.dxtop.service.config.rabbitmq.cartget;
 
 import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
 import lombok.Data;
@@ -19,12 +19,12 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 @Data
-public class SubsidyConsumeConfig {
+public class CartGetConsumeConfig {
 
     @Autowired
     private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_subsidy_consume";
-    private final static String MODULE_NAME = "subsidyC";
+    public static final String NAME = "card_get_consume";
+    private final static String MODULE_NAME = "cardgetC";
 
     private final static String CONNECTION = MODULE_NAME+RabbitmqConfig.CONNECTION;
     private final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;

src/main/java/com/usky/dxtop/service/config/rabbitmq/subsidy/SubsidyProduceConfig.java → src/main/java/com/usky/dxtop/service/config/rabbitmq/cartget/CartGetProduceConfig.java

@@ -1,4 +1,4 @@
-package com.usky.dxtop.service.config.rabbitmq.subsidy;
+package com.usky.dxtop.service.config.rabbitmq.cartget;
 
 import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
 import lombok.Data;
@@ -19,12 +19,12 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 @Data
-public class SubsidyProduceConfig {
+public class CartGetProduceConfig {
 
     @Autowired
     private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_subsidy_produce";
-    private final static String MODULE_NAME = "subsidyP";
+    public static final String NAME = "card_get_produce";
+    private final static String MODULE_NAME = "cardgetP";
 
     private final static String CONNECTION = MODULE_NAME+ RabbitmqConfig.CONNECTION;
     private final static String TEMPLATE = MODULE_NAME+RabbitmqConfig.TEMPLATE;

src/main/java/com/usky/dxtop/service/config/rabbitmq/charge/ChargeConsumeConfig.java

@@ -14,7 +14,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
- *
+ * 充值
  * @author yq
  * @date 2021/9/15 11:06
  */

src/main/java/com/usky/dxtop/service/config/rabbitmq/face/FaceConsumeConfig.java

@@ -14,6 +14,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
+ * 人脸信息
  * @author yq
  * @date 2021/9/15 10:37
  */

src/main/java/com/usky/dxtop/service/config/rabbitmq/group/GroupConsumeConfig.java

@@ -14,6 +14,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
+ * 部门信息
  * @author yq
  * @date 2021/9/15 10:38
  */

src/main/java/com/usky/dxtop/service/config/rabbitmq/loss/LossConsumeConfig.java

@@ -14,6 +14,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
+ * 卡挂失/解挂同步
  * @author yq
  * @date 2021/9/15 10:42
  */

src/main/java/com/usky/dxtop/service/config/rabbitmq/profile/ProfileConsumeConfig.java

@@ -14,6 +14,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
+ * 人员信息同步
  * @author yq
  * @date 2021/9/15 10:36
  */

src/main/java/com/usky/dxtop/service/config/rabbitmq/reissue/ReissueProduceConfig.java

@@ -1,70 +0,0 @@
-package com.usky.dxtop.service.config.rabbitmq.reissue;
-
-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:18
- */
-public class ReissueProduceConfig {
-    @Autowired
-    private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_reissue_produce";
-    private final static String MODULE_NAME = "reissueP";
-
-    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;
-    }
-}

src/main/java/com/usky/dxtop/service/config/rabbitmq/repair/RepairConsumerConfig.java → src/main/java/com/usky/dxtop/service/config/rabbitmq/schedule/ScheduleConsumerConfig.java

@@ -1,4 +1,4 @@
-package com.usky.dxtop.service.config.rabbitmq.repair;
+package com.usky.dxtop.service.config.rabbitmq.schedule;
 
 import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
 import lombok.Data;
@@ -14,17 +14,18 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
+ * 排菜计划获取
  * @author yq
  * @date 2021/9/15 11:08
  */
 @Configuration
 @Data
-public class RepairConsumerConfig {
+public class ScheduleConsumerConfig {
 
     @Autowired
     private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_repair_consume";
-    private final static String MODULE_NAME = "repairC";
+    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;

src/main/java/com/usky/dxtop/service/config/rabbitmq/repair/RepairProduceConfig.java → src/main/java/com/usky/dxtop/service/config/rabbitmq/schedule/ScheduleProduceConfig.java

@@ -1,4 +1,4 @@
-package com.usky.dxtop.service.config.rabbitmq.repair;
+package com.usky.dxtop.service.config.rabbitmq.schedule;
 
 import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
 import org.springframework.amqp.core.*;
@@ -15,11 +15,11 @@ import org.springframework.context.annotation.Bean;
  * @author yq
  * @date 2021/9/15 13:20
  */
-public class RepairProduceConfig {
+public class ScheduleProduceConfig {
     @Autowired
     private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_repair_produce";
-    private final static String MODULE_NAME = "repairP";
+    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;

src/main/java/com/usky/dxtop/service/config/rabbitmq/reissue/ReissueConsumeConfig.java → src/main/java/com/usky/dxtop/service/config/rabbitmq/uncharge/UnChargeConsumeConfig.java

@@ -1,4 +1,4 @@
-package com.usky.dxtop.service.config.rabbitmq.reissue;
+package com.usky.dxtop.service.config.rabbitmq.uncharge;
 
 import com.usky.dxtop.service.config.rabbitmq.RabbitmqConfig;
 import lombok.Data;
@@ -14,17 +14,18 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
+ * 充值撤单
  * @author yq
  * @date 2021/9/15 10:43
  */
 @Configuration
 @Data
-public class ReissueConsumeConfig {
+public class UnChargeConsumeConfig {
 
     @Autowired
     private RabbitmqConfig rabbitmqConfig;
-    public static final String NAME = "card_reissue_consumer";
-    private final static String MODULE_NAME = "reissueC";
+    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;

src/main/java/com/usky/dxtop/service/job/OrderJob.java

@@ -22,6 +22,7 @@ public class OrderJob {
     @Autowired
     private OrderService orderService;
 
+    //TODO 注解需要打开
 //    @Scheduled(cron = "0 */1 * * * ?")
     public void execute(){
         LambdaQueryWrapper<Order> queryWrapper = Wrappers.lambdaQuery();