From 1c7c41ccdf360ee412868caefd36a49a6f4180d7 Mon Sep 17 00:00:00 2001
From: simon <861719797@qq.com>
Date: Tue, 26 Sep 2023 13:50:46 +0800
Subject: [PATCH] =?UTF-8?q?MQ=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/api/controller/mq/MqController.java    |  6 +++---
 .../qiuguo/iot/user/api/rabbit/MyConsumer.java  | 14 --------------
 .../qiuguo/iot/user/api/rabbit/MyProducer.java  | 17 -----------------
 .../iot/user/api/rabbit/RabbitMQConfig.java     | 14 --------------
 4 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/rabbit/MyConsumer.java
 delete mode 100644 iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/rabbit/MyProducer.java
 delete mode 100644 iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/rabbit/RabbitMQConfig.java

diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/mq/MqController.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/mq/MqController.java
index 82a6b81..8522e8d 100644
--- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/mq/MqController.java
+++ b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/mq/MqController.java
@@ -24,7 +24,7 @@ public class MqController {
    private MqService mqService;
 
    @GetMapping("/sendMsg")
-   public Mono sendMsg() {
+   public Mono<Boolean> sendMsg() {
       UserHomeEntity userHomeEntity = new UserHomeEntity();
       userHomeEntity.setUserId(1L);
       userHomeEntity.setHomeName("小米的家");
@@ -32,10 +32,10 @@ public class MqController {
 
       Mono<Boolean> booleanMono = mqService.sendMessageWithConfirmation(YunxiRabbitConst.EXCHANGE_YUNXI_EVENT, YunxiRabbitConst.ROUTE_KEY_YUNXI, userHomeEntity);
       return booleanMono.flatMap(res -> {
-         if (!res) {
+         if (res.equals(Boolean.FALSE)) {
             return Mono.error(new RuntimeException("消息发送失败"));
          } else {
-            return Mono.just(true);
+            return Mono.just(Boolean.TRUE);
          }
       });
    }
diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/rabbit/MyConsumer.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/rabbit/MyConsumer.java
deleted file mode 100644
index 30d1398..0000000
--- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/rabbit/MyConsumer.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.qiuguo.iot.user.api.rabbit;
-
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.stereotype.Component;
-
-@Component
-public class MyConsumer {
-
-    @RabbitListener(queues = "my-queue")
-    public void receiveMessage(String message) {
-        // 处理接收到的消息
-        System.out.println("Received message: " + message);
-    }
-}
diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/rabbit/MyProducer.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/rabbit/MyProducer.java
deleted file mode 100644
index 5e306a2..0000000
--- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/rabbit/MyProducer.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.qiuguo.iot.user.api.rabbit;
-
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-@Component
-public class MyProducer {
-
-    @Autowired
-    private RabbitTemplate rabbitTemplate;
-
-    public void sendMessage(String message) {
-        //发送消息
-        rabbitTemplate.convertAndSend("my-queue", message);
-    }
-}
diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/rabbit/RabbitMQConfig.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/rabbit/RabbitMQConfig.java
deleted file mode 100644
index 1851652..0000000
--- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/rabbit/RabbitMQConfig.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.qiuguo.iot.user.api.rabbit;
-
-import org.springframework.amqp.core.Queue;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class RabbitMQConfig {
-
-    @Bean
-    public Queue myQueue() {
-        return new Queue("my-queue");
-    }
-}