log change

master
修改密码漏洞修复完成 5 months ago
parent c6bf63ebb2
commit c2aa0169bf

@ -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 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

@ -25,6 +25,16 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mybatis.spring.boot</groupId> <groupId>org.mybatis.spring.boot</groupId>
@ -47,11 +57,6 @@
<version>1.2.24</version> <version>1.2.24</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.paho</groupId> <groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId> <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
@ -145,11 +150,11 @@
<artifactId>hutool-crypto</artifactId> <artifactId>hutool-crypto</artifactId>
<version>5.8.37</version> <version>5.8.37</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.springframework.boot</groupId> <!-- <groupId>org.springframework.boot</groupId>-->
<artifactId>spring-boot-starter-log4j2</artifactId> <!-- <artifactId>spring-boot-starter-log4j2</artifactId>-->
<version>2.1.6.RELEASE</version> <!-- <version>2.1.6.RELEASE</version>-->
</dependency> <!-- </dependency>-->
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>commons-net</groupId>--> <!-- <groupId>commons-net</groupId>-->
<!-- <artifactId>commons-net</artifactId>--> <!-- <artifactId>commons-net</artifactId>-->

@ -40,53 +40,56 @@ public class TemperatureServiceImpl implements TemperatureService {
@Override @Override
public void saveTemperature(String temperatureAndHumidityData,String topic) { public void saveTemperature(String temperatureAndHumidityData,String topic) {
if(temperatureAndHumidityData!=null&&temperatureAndHumidityData.length()>0){ try {
String[] strDataTemperature = temperatureAndHumidityData.split(" "); if(temperatureAndHumidityData!=null&&temperatureAndHumidityData.length()>0){
Date now = new Date(); String[] strDataTemperature = temperatureAndHumidityData.split(" ");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Date now = new Date();
SimpleDateFormat sdfHour = new SimpleDateFormat("yyyy-MM-dd HH"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdfMinute = new SimpleDateFormat("yyyy-MM-dd HH:mm"); SimpleDateFormat sdfHour = new SimpleDateFormat("yyyy-MM-dd HH");
SimpleDateFormat sdfSecond = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 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 nowDate = sdf.format(now);
String dataMinute = sdfMinute.format(now); String nowHour = sdfHour.format(now);
String dataSecond = sdfSecond.format(now); String dataMinute = sdfMinute.format(now);
Temperature temperature = new Temperature(); String dataSecond = sdfSecond.format(now);
temperature.setCreateDate(now); Temperature temperature = new Temperature();
temperature.setDataDate(nowDate); temperature.setCreateDate(now);
temperature.setDataHour(nowHour); temperature.setDataDate(nowDate);
temperature.setDataMinute(dataMinute); temperature.setDataHour(nowHour);
if(topic!=null){ temperature.setDataMinute(dataMinute);
temperature.setTopic(topic); if(topic!=null){
if(topic.equals("WifiSHT/7C87CE9CA4E6/SHT20")){ temperature.setTopic(topic);
temperature.setLocationDesc("广东省珠海市高新区唐家湾镇东岸村水风三街28号501"); 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.setHumidity(strDataTemperature[0]);
temperature.setLocationDesc("广东省珠海市金湾区三灶镇百川路1号1栋1单元1508房"); temperature.setTemperature(strDataTemperature[1]);
}
if(topic.equals("WifiSHT/4CEBD686B6AA/SHT20")){
temperature.setLocationDesc("广西壮族自治区崇左市天等县天等镇荣华村弄在屯113号");
}
}
temperature.setHumidity(strDataTemperature[0]);
temperature.setTemperature(strDataTemperature[1]);
this.temperatureRepository.save(temperature); this.temperatureRepository.save(temperature);
mysqlTemperatureService.saveTemperature(temperature); mysqlTemperatureService.saveTemperature(temperature);
ResponseDto responseDtoOracle = this.oracleTemperatureService.saveTemperature(temperature); ResponseDto responseDtoOracle = this.oracleTemperatureService.saveTemperature(temperature);
log.info(new Gson().toJson(responseDtoOracle)); log.info(new Gson().toJson(responseDtoOracle));
ResponseDto responseDtoSqlserver = this.sqlServerTemperatureService.saveTemperature(temperature); ResponseDto responseDtoSqlserver = this.sqlServerTemperatureService.saveTemperature(temperature);
log.info(new Gson().toJson(responseDtoSqlserver)); log.info(new Gson().toJson(responseDtoSqlserver));
// ResponseDto responseDtoKingBase = this.kingbaseTemperatureService.saveTemperature(temperature); // ResponseDto responseDtoKingBase = this.kingbaseTemperatureService.saveTemperature(temperature);
// log.info(new Gson().toJson(responseDtoKingBase)); // log.info(new Gson().toJson(responseDtoKingBase));
ResponseDto responseDtoSPg = this.postgresSqlTemperatureService.saveTemperature(temperature); ResponseDto responseDtoSPg = this.postgresSqlTemperatureService.saveTemperature(temperature);
log.info(new Gson().toJson(responseDtoSPg)); log.info(new Gson().toJson(responseDtoSPg));
}
}catch (Exception e){
e.printStackTrace();
} }
} }

@ -6,6 +6,8 @@ server:
logging: logging:
level: level:
root: INFO root: INFO
file:
path: /root/temperature
spring: spring:
datasource: datasource:

@ -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() {
}
}
Loading…
Cancel
Save