From eaddd51d9f6ca26cf1557996098291ef74e7f919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E6=BC=8F=E6=B4=9E?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=88=90?= <>
Date: Sat, 9 Aug 2025 18:14:13 +0800
Subject: [PATCH] =?UTF-8?q?esp8266=E5=92=8Cdht11=E6=B8=A9=E6=B9=BF?=
 =?UTF-8?q?=E5=BA=A6=E4=BC=A0=E6=84=9F=E5=99=A8=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=87=E9=9B=86mqtt=E5=85=A5=E5=BA=93=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-client-temperature.iml                     |  4 +++-
 .../AdminClientTemperatureApplication.java       | 16 ++++++++--------
 .../controller/TemperatureEspController.java     |  6 +++---
 .../service/impl/TemperatureEspServiceImpl.java  |  4 ++--
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/admin-client-temperature.iml b/admin-client-temperature.iml
index 60dcaf7..881a08a 100644
--- a/admin-client-temperature.iml
+++ b/admin-client-temperature.iml
@@ -10,7 +10,9 @@
       <configuration>
         <setting name="validation-enabled" value="true" />
         <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="entityManagerFactory" />
+        </datasource-mapping>
         <naming-strategy-map />
       </configuration>
     </facet>
diff --git a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
index efe5713..2c5ef5d 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
@@ -59,14 +59,14 @@ public class AdminClientTemperatureApplication implements CommandLineRunner, App
             log.info(entry.getKey());//demo1Controller
         }
         try {
-//            if (temperatureService != null) {
-//                log.info("------------------------");
-//                log.info("TemperatureController is not empty");
-//                MqttRSAClient client = new MqttRSAClient();
-//                client.start(temperatureService);
-//            }else {
-//                log.info("temperatureService is empty");
-//            }
+            if (temperatureService != null) {
+                log.info("------------------------");
+                log.info("TemperatureController is not empty");
+                MqttRSAClient client = new MqttRSAClient();
+                client.start(temperatureService);
+            }else {
+                log.info("temperatureService is empty");
+            }
             if (temperatureEspService != null) {
                 log.info("------------------------");
                 log.info("temperatureEspService is not empty");
diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureEspController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureEspController.java
index 00b4279..d1792e0 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureEspController.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureEspController.java
@@ -36,9 +36,9 @@ public class TemperatureEspController {
      */
     @GetMapping("/saveEspTemperature")
     private String save(@Param("temperature")String temperature, @Param("humidity")String humidity) {
-//        log.info(temperature);
-//        log.info(humidity);
-//        this.temperatureEspService.saveTemperature(temperature,humidity);
+        log.info(temperature);
+        log.info(humidity);
+        this.temperatureEspService.saveTemperature(temperature,humidity);
         return "success";
     }
 }
diff --git a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureEspServiceImpl.java b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureEspServiceImpl.java
index f64ac18..ed2899f 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureEspServiceImpl.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureEspServiceImpl.java
@@ -39,10 +39,10 @@ public class TemperatureEspServiceImpl implements TemperatureEspService {
                 temperatureEsp.setDataMinute(dataMinute);
                 temperatureEsp.setSource("http");
 
-                String topic = "BF9D7939ND2N";
+                String topic = "/device/esp8266/001";
                 if(topic!=null){
                     temperatureEsp.setTopic(topic);
-                    if(topic.equals("BF9D7939ND2N")){
+                    if(topic.equals("/device/esp8266/001")){
                         temperatureEsp.setLocationDesc("广东省珠海市高新区唐家湾镇南方软件园B2栋4楼珠海瑞洪智能系统工程有限公司");
                     }
                     if(topic.equals("WifiSHT/7C87CE9F5CBF/SHT20")){