耳标平台

huimv-eartag2-eartag/src/main/java/com/huimv/eartag2/eartag/config/TopicRabbitMQConfig.java

@@ -58,7 +58,7 @@ public class TopicRabbitMQConfig {
 //    }
 
 
-    // ============================= 计算小时运动量 ============================= //
+  /*  // ============================= 计算小时运动量 ============================= //
     @Bean
     public Queue syncCountActHourQueue() {
         return new Queue(Const.QUEUE_COUNT_ACT_HOUR);
@@ -201,7 +201,7 @@ public class TopicRabbitMQConfig {
     }
 
 
-
+*/
 
 
 }

huimv-eartag2-input/src/main/java/com/huimv/eartag2/controller/DeviceCountRabbitMQInitializer.java

@@ -21,13 +21,13 @@ public class DeviceCountRabbitMQInitializer implements ApplicationRunner {
     public void run(ApplicationArguments args)   {
         // 声明交换机
         // 创建交换机
-        rabbitMQService.createExchange(Const.EXCHANGE_ASK_EARTAG);
+        rabbitMQService.createExchange(Const.EXCHANGE_DEVICE_COUNT);
         //
         for (Integer integer = 0; integer < queues; integer++) {
             // 声明队列
-            rabbitMQService.createQueue(Const.QUEUE_ASK_EARTAG+integer);
+            rabbitMQService.createQueue(Const.QUEUE_DEVICE_COUNT+integer);
             // 创建绑定
-            rabbitMQService.createBinding(Const.QUEUE_ASK_EARTAG+integer, Const.EXCHANGE_ASK_EARTAG,Const.ROUTING_KEY_ASK_EARTAG+integer  );
+            rabbitMQService.createBinding(Const.QUEUE_DEVICE_COUNT+integer, Const.EXCHANGE_DEVICE_COUNT,Const.ROUTING_KEY_DEVICE_COUNT+integer  );
         }
     }
 

huimv-eartag2-input/src/main/java/com/huimv/eartag2/controller/DeviceRegistMQInitializer.java

@@ -21,13 +21,13 @@ public class DeviceRegistMQInitializer implements ApplicationRunner {
     public void run(ApplicationArguments args)   {
         // 声明交换机
         // 创建交换机
-        rabbitMQService.createExchange(Const.EXCHANGE_EARTAG_COUNT);
+        rabbitMQService.createExchange(Const.EXCHANGE_DEVICE_REGIST);
         //
         for (Integer integer = 0; integer < queues; integer++) {
             // 声明队列
-            rabbitMQService.createQueue(Const.QUEUE_EARTAG_COUNT+integer);
+            rabbitMQService.createQueue(Const.QUEUE_DEVICE_REGIST+integer);
             // 创建绑定
-            rabbitMQService.createBinding(Const.QUEUE_EARTAG_COUNT+integer, Const.EXCHANGE_EARTAG_COUNT,Const.ROUTING_KEY_EARTAG_COUNT+integer  );
+            rabbitMQService.createBinding(Const.QUEUE_DEVICE_REGIST+integer, Const.EXCHANGE_DEVICE_REGIST,Const.ROUTING_KEY_DEVICE_REGIST+integer  );
         }
     }
 

huimv-eartag2-input/src/main/java/com/huimv/eartag2/controller/EartagCountRabbitMQInitializer.java

@@ -21,13 +21,13 @@ public class EartagCountRabbitMQInitializer implements ApplicationRunner {
     public void run(ApplicationArguments args)   {
         // 声明交换机
         // 创建交换机
-        rabbitMQService.createExchange(Const.EXCHANGE_ASK_EARTAG);
+        rabbitMQService.createExchange(Const.EXCHANGE_EARTAG_COUNT);
         //
         for (Integer integer = 0; integer < queues; integer++) {
             // 声明队列
-            rabbitMQService.createQueue(Const.QUEUE_ASK_EARTAG+integer);
+            rabbitMQService.createQueue(Const.QUEUE_EARTAG_COUNT+integer);
             // 创建绑定
-            rabbitMQService.createBinding(Const.QUEUE_ASK_EARTAG+integer, Const.EXCHANGE_ASK_EARTAG,Const.ROUTING_KEY_ASK_EARTAG+integer  );
+            rabbitMQService.createBinding(Const.QUEUE_EARTAG_COUNT+integer, Const.EXCHANGE_EARTAG_COUNT,Const.ROUTING_KEY_EARTAG_COUNT+integer  );
         }
     }
 

huimv-eartag2-input/src/main/java/com/huimv/eartag2/controller/EartagRegistRabbitMQInitializer.java

@@ -21,13 +21,13 @@ public class EartagRegistRabbitMQInitializer implements ApplicationRunner {
     public void run(ApplicationArguments args)   {
         // 声明交换机
         // 创建交换机
-        rabbitMQService.createExchange(Const.EXCHANGE_SYNC_EARTAG_REGISTER);
+        rabbitMQService.createExchange(Const.EXCHANGE_EARTAG_REGIST);
         //
         for (Integer integer = 0; integer < queues; integer++) {
             // 声明队列
-            rabbitMQService.createQueue(Const.QUEUE_SYNC_EARTAG_REGISTER+integer);
+            rabbitMQService.createQueue(Const.QUEUE_EARTAG_REGIST+integer);
             // 创建绑定
-            rabbitMQService.createBinding(Const.QUEUE_SYNC_EARTAG_REGISTER+integer, Const.EXCHANGE_SYNC_EARTAG_REGISTER,Const.ROUTING_KEY_SYNC_EARTAG_REGISTER+integer  );
+            rabbitMQService.createBinding(Const.QUEUE_EARTAG_REGIST+integer, Const.EXCHANGE_EARTAG_REGIST,Const.ROUTING_KEY_EARTAG_REGIST+integer  );
         }
     }
 

huimv-eartag2-input/src/main/java/com/huimv/eartag2/service/impl/DataServiceImpl.java

@@ -317,15 +317,15 @@ public class DataServiceImpl implements IDataService {
 
             rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_EARTAG, Const.ROUTING_KEY_ASK_EARTAG+i, dataJo);
 
-            rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_EARTAG, Const.ROUTING_KEY_COUNT_ACT_HOUR+i, dataJo);
-            rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_EARTAG, Const.ROUTING_KEY_DEVICE_REGIST+i, dataJo);
-            rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_EARTAG, Const.ROUTING_KEY_EARTAG_REGIST+i, dataJo);
-            rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_EARTAG, Const.ROUTING_KEY_DEVICE_COUNT+i, dataJo);
-            rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_EARTAG, Const.ROUTING_KEY_EARTAG_COUNT+i, dataJo);
-            rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_EARTAG, Const.ROUTING_KEY_EARTAG_LIVE+i, dataJo);
-            rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_EARTAG, Const.ROUTING_KEY_EARTAG_DEVICE_ONLINE+i, dataJo);
-            rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_EARTAG, Const.ROUTING_KEY_ABNORMAL+i, dataJo);
-            rabbitTemplate.convertAndSend(Const.EXCHANGE_ASK_EARTAG, Const.ROUTING_KEY_AllSTATUS+i, dataJo);
+            rabbitTemplate.convertAndSend(Const.EXCHANGE_COUNT_ACT_HOUR, Const.ROUTING_KEY_COUNT_ACT_HOUR+i, dataJo);
+            rabbitTemplate.convertAndSend(Const.EXCHANGE_DEVICE_REGIST, Const.ROUTING_KEY_DEVICE_REGIST+i, dataJo);
+            rabbitTemplate.convertAndSend(Const.EXCHANGE_EARTAG_REGIST, Const.ROUTING_KEY_EARTAG_REGIST+i, dataJo);
+            rabbitTemplate.convertAndSend(Const.EXCHANGE_DEVICE_COUNT, Const.ROUTING_KEY_DEVICE_COUNT+i, dataJo);
+            rabbitTemplate.convertAndSend(Const.EXCHANGE_EARTAG_COUNT, Const.ROUTING_KEY_EARTAG_COUNT+i, dataJo);
+            rabbitTemplate.convertAndSend(Const.EXCHANGE_EARTAG_LIVE, Const.ROUTING_KEY_EARTAG_LIVE+i, dataJo);
+            rabbitTemplate.convertAndSend(Const.EXCHANGE_EARTAG_DEVICE_ONLINE, Const.ROUTING_KEY_EARTAG_DEVICE_ONLINE+i, dataJo);
+            rabbitTemplate.convertAndSend(Const.EXCHANGE_ABNORMAL, Const.ROUTING_KEY_ABNORMAL+i, dataJo);
+            rabbitTemplate.convertAndSend(Const.EXCHANGE_AllSTATUS, Const.ROUTING_KEY_AllSTATUS+i, dataJo);
         }
         log.error("耳标数据有误------>"+dataJo);