diff --git a/admin-client-temperature.iml b/admin-client-temperature.iml index 4239187..4313121 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 fdc894a..34e47f1 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java +++ b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java @@ -58,33 +58,33 @@ 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(); +// MqttHuaWeiYunClient client = new MqttHuaWeiYunClient(); // client.start(temperatureService); // }else { // log.info("temperatureService is empty"); // } - if (temperatureService != null) { + if (temperatureEspService != null) { log.info("------------------------"); - log.info("TemperatureController is not empty"); - MqttHuaWeiYunClient client = new MqttHuaWeiYunClient(); - client.start(temperatureService); + log.info("temperatureEspService is not empty"); + MqttDianDengTechClient client = new MqttDianDengTechClient(); + //client.start(temperatureEspService); }else { - log.info("temperatureService is empty"); + log.info("temperatureEspService is empty"); } -// if (temperatureEspService != null) { -// log.info("------------------------"); -// log.info("temperatureEspService is not empty"); -// MqttDianDengTechClient client = new MqttDianDengTechClient(); -// client.start(temperatureEspService); -// }else { -// log.info("temperatureEspService is empty"); -// } - String DeviceAlermInfoPwd = ""; String strPrivateEncode = RSAAndroid.encryptByPrivateKeyForSpiltStr("AnFang@2025",RSAAndroid.privateRsaKeyLocal); System.out.println("---------strPrivateEncode----------"); diff --git a/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java b/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java index 653003f..1513634 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/service/impl/TemperatureEspServiceImpl.java b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureEspServiceImpl.java index f69e797..3305da7 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureEspServiceImpl.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureEspServiceImpl.java @@ -95,6 +95,10 @@ public class TemperatureEspServiceImpl implements TemperatureEspService { if (topic.equals("/device/esp8266/004")) { temperatureEsp.setLocationDesc("广东省珠海市高新区唐家湾镇东岸村水风三街28号501-01"); } + + if (topic.equals("/device/esp8266/005")) { + temperatureEsp.setLocationDesc("广西壮族自治区崇左市天等县天等镇荣华村弄在屯113号"); + } } temperatureEsp.setHumidity(humidityValue); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ce00583..22d163d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -34,7 +34,8 @@ spring: #本地机器 #url: jdbc:mysql://127.0.0.1:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #公司 arm 机器 luban cat - url: jdbc:mysql://192.168.2.210:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true + #url: jdbc:mysql://192.168.2.210:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true + url: jdbc:mysql://10.19.1.29:33062/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true driverClassName: com.mysql.cj.jdbc.Driver #com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver username: root password: Skyinno251,