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 @@ - + + + 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")){