From c2aa0169bf34681d46214f77adc884c50377c587 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, 19 Jul 2025 11:48:56 +0800 Subject: [PATCH] log change --- maven_install.sh | 2 + pom.xml | 25 +++--- .../service/impl/TemperatureServiceImpl.java | 81 ++++++++++--------- src/main/resources/application.yml | 2 + ...ClientAppmqttserverYfApplicationTests.java | 13 --- 5 files changed, 61 insertions(+), 62 deletions(-) delete mode 100644 src/test/java/com/rehome/mqttclienttemperature/AdminClientAppmqttserverYfApplicationTests.java diff --git a/maven_install.sh b/maven_install.sh index e02c663..a91b7cf 100644 --- a/maven_install.sh +++ b/maven_install.sh @@ -9,3 +9,5 @@ mvn install:install-file -Dfile=/Users/admin/ojdbc6.jar -DgroupId=com.oracle -Da mvn install:install-file -Dfile=C:\Users\Administrator\ojdbc6.jar -DgroupId=com.oracle -DartifactId=ojdbc6 -Dversion=11.2.0.1.0 -Dpackaging=jar +maven查看依赖树命令 +mvn dependency:tree \ No newline at end of file diff --git a/pom.xml b/pom.xml index 434d39a..a4a552b 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,16 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-logging + + + + + org.springframework.boot + spring-boot-starter org.mybatis.spring.boot @@ -47,11 +57,6 @@ 1.2.24 - - org.springframework.boot - spring-boot-starter-test - test - org.eclipse.paho org.eclipse.paho.client.mqttv3 @@ -145,11 +150,11 @@ hutool-crypto 5.8.37 - - org.springframework.boot - spring-boot-starter-log4j2 - 2.1.6.RELEASE - + + + + + diff --git a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java index 112e06a..4076444 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java @@ -40,53 +40,56 @@ public class TemperatureServiceImpl implements TemperatureService { @Override public void saveTemperature(String temperatureAndHumidityData,String topic) { - if(temperatureAndHumidityData!=null&&temperatureAndHumidityData.length()>0){ - String[] strDataTemperature = temperatureAndHumidityData.split(" "); - 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); - Temperature temperature = new Temperature(); - temperature.setCreateDate(now); - temperature.setDataDate(nowDate); - temperature.setDataHour(nowHour); - temperature.setDataMinute(dataMinute); - if(topic!=null){ - temperature.setTopic(topic); - if(topic.equals("WifiSHT/7C87CE9CA4E6/SHT20")){ - temperature.setLocationDesc("广东省珠海市高新区唐家湾镇东岸村水风三街28号501"); + try { + if(temperatureAndHumidityData!=null&&temperatureAndHumidityData.length()>0){ + String[] strDataTemperature = temperatureAndHumidityData.split(" "); + 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); + Temperature temperature = new Temperature(); + temperature.setCreateDate(now); + temperature.setDataDate(nowDate); + temperature.setDataHour(nowHour); + temperature.setDataMinute(dataMinute); + if(topic!=null){ + temperature.setTopic(topic); + if(topic.equals("WifiSHT/7C87CE9CA4E6/SHT20")){ + temperature.setLocationDesc("广东省珠海市高新区唐家湾镇东岸村水风三街28号501"); + } + if(topic.equals("WifiSHT/7C87CE9F5CBF/SHT20")){ + temperature.setLocationDesc("广东省珠海市金湾区三灶镇百川路1号1栋1单元1508房"); + } + if(topic.equals("WifiSHT/4CEBD686B6AA/SHT20")){ + temperature.setLocationDesc("广西壮族自治区崇左市天等县天等镇荣华村弄在屯113号"); + } } - if(topic.equals("WifiSHT/7C87CE9F5CBF/SHT20")){ - temperature.setLocationDesc("广东省珠海市金湾区三灶镇百川路1号1栋1单元1508房"); - } - if(topic.equals("WifiSHT/4CEBD686B6AA/SHT20")){ - temperature.setLocationDesc("广西壮族自治区崇左市天等县天等镇荣华村弄在屯113号"); - } - } - temperature.setHumidity(strDataTemperature[0]); - temperature.setTemperature(strDataTemperature[1]); + temperature.setHumidity(strDataTemperature[0]); + temperature.setTemperature(strDataTemperature[1]); - this.temperatureRepository.save(temperature); - mysqlTemperatureService.saveTemperature(temperature); + this.temperatureRepository.save(temperature); + mysqlTemperatureService.saveTemperature(temperature); - ResponseDto responseDtoOracle = this.oracleTemperatureService.saveTemperature(temperature); - log.info(new Gson().toJson(responseDtoOracle)); + ResponseDto responseDtoOracle = this.oracleTemperatureService.saveTemperature(temperature); + log.info(new Gson().toJson(responseDtoOracle)); - ResponseDto responseDtoSqlserver = this.sqlServerTemperatureService.saveTemperature(temperature); - log.info(new Gson().toJson(responseDtoSqlserver)); + ResponseDto responseDtoSqlserver = this.sqlServerTemperatureService.saveTemperature(temperature); + log.info(new Gson().toJson(responseDtoSqlserver)); // ResponseDto responseDtoKingBase = this.kingbaseTemperatureService.saveTemperature(temperature); // log.info(new Gson().toJson(responseDtoKingBase)); - ResponseDto responseDtoSPg = this.postgresSqlTemperatureService.saveTemperature(temperature); - log.info(new Gson().toJson(responseDtoSPg)); - + ResponseDto responseDtoSPg = this.postgresSqlTemperatureService.saveTemperature(temperature); + log.info(new Gson().toJson(responseDtoSPg)); + } + }catch (Exception e){ + e.printStackTrace(); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 12da741..2a017fc 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,6 +6,8 @@ server: logging: level: root: INFO + file: + path: /root/temperature spring: datasource: diff --git a/src/test/java/com/rehome/mqttclienttemperature/AdminClientAppmqttserverYfApplicationTests.java b/src/test/java/com/rehome/mqttclienttemperature/AdminClientAppmqttserverYfApplicationTests.java deleted file mode 100644 index c4abe66..0000000 --- a/src/test/java/com/rehome/mqttclienttemperature/AdminClientAppmqttserverYfApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.rehome.mqttclienttemperature; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class AdminClientAppmqttserverYfApplicationTests { - - @Test - void contextLoads() { - } - -}