From 57c8d1dc04cabe2944d1ba2dbb0c42841508e6b8 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, 1 Nov 2025 14:14:06 +0800 Subject: [PATCH] add oled --- admin-client-temperature.iml | 8 ++- .../AdminClientTemperatureApplication.java | 5 +- .../MqttDianDengTechClient.java | 2 +- .../mqttclienttemperature/MqttRSAClient.java | 2 +- .../controller/JdbcDemoController.java | 8 +-- .../controller/TemperatureEspController.java | 2 +- .../impl/TemperatureEspServiceImpl.java | 59 +++++++++---------- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/admin-client-temperature.iml b/admin-client-temperature.iml index 60dcaf7..c10c9f5 100644 --- a/admin-client-temperature.iml +++ b/admin-client-temperature.iml @@ -10,7 +10,10 @@ - + + + + @@ -18,13 +21,12 @@ - + - diff --git a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java index 977633f..03122ea 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java +++ b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java @@ -19,9 +19,8 @@ import javax.annotation.Resource; import java.util.Map; @Slf4j -//@EnableJpaAuditing -//@EnableScheduling -//@EnableAsync +@EnableScheduling +@EnableAsync @SpringBootApplication public class AdminClientTemperatureApplication implements CommandLineRunner, ApplicationContextAware { diff --git a/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java b/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java index 7380905..035efcc 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java +++ b/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java @@ -112,7 +112,7 @@ public class MqttDianDengTechClient { log.info("message RSA:"+strData); if(strData!=null&&strData.length()>=11){ String[] strDataTemperature = strData.split(" "); - //temperatureEspService.saveTemperature(strDataTemperature[0],strDataTemperature[1],s); + temperatureEspService.saveTemperature(strDataTemperature[0],strDataTemperature[1],s); } } diff --git a/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java b/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java index 2a7ffab..798975d 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java +++ b/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java @@ -108,7 +108,7 @@ public class MqttRSAClient { log.info("topic:"+s); log.info("Qos:"+mqttMessage.getQos()); log.info("message RSA:"+strData); - //temperatureService.saveTemperature(strData,s); + temperatureService.saveTemperature(strData,s); } @Override diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java index db3d044..31ae78d 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java @@ -53,7 +53,7 @@ import java.util.concurrent.*; */ @Slf4j -//@RestController +@RestController public class JdbcDemoController { @Resource @@ -91,7 +91,7 @@ public class JdbcDemoController { * * @return */ - @RequestMapping("/api/list") + //@RequestMapping("/api/list") public ResponseDto queryList() { // 自定义一个线程池,内部包含8个线程 ExecutorService customPool = Executors.newFixedThreadPool(2); @@ -154,7 +154,7 @@ public class JdbcDemoController { * * @return */ - @RequestMapping("/api/getResult") + //@RequestMapping("/api/getResult") public String getResult() { // 自定义一个线程池,内部包含4个线程 ExecutorService executorService = Executors.newFixedThreadPool(4); @@ -182,7 +182,7 @@ public class JdbcDemoController { * * @return */ - @RequestMapping("/api/getResult0") + //@RequestMapping("/api/getResult0") public String getResult0() { // 自定义一个线程池,内部包含4个线程 ExecutorService executorService = Executors.newFixedThreadPool(4); diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureEspController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureEspController.java index d1792e0..0575a2a 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureEspController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureEspController.java @@ -38,7 +38,7 @@ public class TemperatureEspController { private String save(@Param("temperature")String temperature, @Param("humidity")String humidity) { log.info(temperature); log.info(humidity); - this.temperatureEspService.saveTemperature(temperature,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 ed2899f..f69e797 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureEspServiceImpl.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureEspServiceImpl.java @@ -1,13 +1,10 @@ package com.rehome.mqttclienttemperature.service.impl; import com.rehome.mqttclienttemperature.dao.TemperatureEspRepository; -import com.rehome.mqttclienttemperature.dao.TemperatureRepository; -import com.rehome.mqttclienttemperature.entity.Temperature; import com.rehome.mqttclienttemperature.entity.TemperatureEsp; import com.rehome.mqttclienttemperature.service.TemperatureEspService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; - import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.Date; @@ -21,89 +18,91 @@ public class TemperatureEspServiceImpl implements TemperatureEspService { @Override public void saveTemperature(String temperatureValue, String humidityValue) { try { - if(temperatureValue!=null&&temperatureValue.length()>0&&humidityValue!=null&&humidityValue.length()>0){ + if (temperatureValue != null && temperatureValue.length() > 0 && humidityValue != null && humidityValue.length() > 0) { Date now = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdfHour = new SimpleDateFormat("yyyy-MM-dd HH"); SimpleDateFormat sdfMinute = new SimpleDateFormat("yyyy-MM-dd HH:mm"); SimpleDateFormat sdfSecond = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String nowDate = sdf.format(now); String nowHour = sdfHour.format(now); String dataMinute = sdfMinute.format(now); - String dataSecond = sdfSecond.format(now); + sdfSecond.format(now); TemperatureEsp temperatureEsp = new TemperatureEsp(); temperatureEsp.setCreateDate(now); temperatureEsp.setDataDate(nowDate); temperatureEsp.setDataHour(nowHour); temperatureEsp.setDataMinute(dataMinute); temperatureEsp.setSource("http"); - String topic = "/device/esp8266/001"; - if(topic!=null){ + if (topic != null) { temperatureEsp.setTopic(topic); - if(topic.equals("/device/esp8266/001")){ + if (topic.equals("/device/esp8266/001")) { temperatureEsp.setLocationDesc("广东省珠海市高新区唐家湾镇南方软件园B2栋4楼珠海瑞洪智能系统工程有限公司"); } - if(topic.equals("WifiSHT/7C87CE9F5CBF/SHT20")){ + + if (topic.equals("WifiSHT/7C87CE9F5CBF/SHT20")) { temperatureEsp.setLocationDesc("广东省珠海市金湾区三灶镇百川路1号1栋1单元1508房"); } - if(topic.equals("WifiSHT/4CEBD686B6AA/SHT20")){ + + if (topic.equals("WifiSHT/4CEBD686B6AA/SHT20")) { temperatureEsp.setLocationDesc("广西壮族自治区崇左市天等县天等镇荣华村弄在屯113号"); } } + temperatureEsp.setHumidity(humidityValue); temperatureEsp.setTemperature(temperatureValue); - - //mysql - this.temperatureEspRepository.save(temperatureEsp); } - }catch (Exception e){ - e.printStackTrace(); + } catch (Exception var14) { + var14.printStackTrace(); } } @Override public void saveTemperature(String temperatureValue, String humidityValue, String topic) { try { - if(temperatureValue!=null&&temperatureValue.length()>0&&humidityValue!=null&&humidityValue.length()>0){ + if (temperatureValue != null && temperatureValue.length() > 0 && humidityValue != null && humidityValue.length() > 0) { Date now = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdfHour = new SimpleDateFormat("yyyy-MM-dd HH"); SimpleDateFormat sdfMinute = new SimpleDateFormat("yyyy-MM-dd HH:mm"); SimpleDateFormat sdfSecond = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String nowDate = sdf.format(now); String nowHour = sdfHour.format(now); String dataMinute = sdfMinute.format(now); - String dataSecond = sdfSecond.format(now); + sdfSecond.format(now); TemperatureEsp temperatureEsp = new TemperatureEsp(); temperatureEsp.setCreateDate(now); temperatureEsp.setDataDate(nowDate); temperatureEsp.setDataHour(nowHour); temperatureEsp.setDataMinute(dataMinute); temperatureEsp.setSource("mqtt"); - - if(topic!=null){ + log.info("topic:{}",topic); + if (topic != null) { temperatureEsp.setTopic(topic); - if(topic.equals("/device/esp8266/001")){ - temperatureEsp.setLocationDesc("广东省珠海市高新区唐家湾镇南方软件园B2栋4楼珠海瑞洪智能系统工程有限公司"); + if (topic.equals("/device/esp8266/001")) { + temperatureEsp.setLocationDesc("广东省珠海市高新区唐家湾镇东岸村水风三街28号501"); } - if(topic.equals("WifiSHT/7C87CE9F5CBF/SHT20")){ + + if (topic.equals("/device/esp8266/002")) { temperatureEsp.setLocationDesc("广东省珠海市金湾区三灶镇百川路1号1栋1单元1508房"); } - if(topic.equals("WifiSHT/4CEBD686B6AA/SHT20")){ - temperatureEsp.setLocationDesc("广西壮族自治区崇左市天等县天等镇荣华村弄在屯113号"); + + if (topic.equals("/device/esp8266/003")) { + temperatureEsp.setLocationDesc("广东省珠海市高新区唐家湾镇南方软件园B2栋4楼珠海瑞洪智能系统工程有限公司"); + } + + if (topic.equals("/device/esp8266/004")) { + temperatureEsp.setLocationDesc("广东省珠海市高新区唐家湾镇东岸村水风三街28号501-01"); } } + temperatureEsp.setHumidity(humidityValue); temperatureEsp.setTemperature(temperatureValue); - - //mysql this.temperatureEspRepository.save(temperatureEsp); } - }catch (Exception e){ - e.printStackTrace(); + } catch (Exception var14) { + var14.printStackTrace(); } }