diff --git a/admin-client-temperature.iml b/admin-client-temperature.iml index f792840..9133d73 100644 --- a/admin-client-temperature.iml +++ b/admin-client-temperature.iml @@ -89,8 +89,8 @@ - - + + @@ -134,6 +134,12 @@ + + + + + + diff --git a/pom.xml b/pom.xml index c8cbcb2..4d74b12 100644 --- a/pom.xml +++ b/pom.xml @@ -273,7 +273,7 @@ repository - http://47.242.184.139:8081/repository/maven-public/ + https://nexus.cloudservicesystem.com/repository/maven-public/ true @@ -283,7 +283,7 @@ - ${project.artifactId}-pg-26-appserver + ${project.artifactId}-pg org.springframework.boot diff --git a/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java b/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java index 74c96fd..6318f9d 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java +++ b/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java @@ -107,7 +107,7 @@ public class MqttRSAClient { System.out.println("topic:"+s); System.out.println("Qos:"+mqttMessage.getQos()); System.out.println("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 8128ea8..3b21768 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java @@ -126,8 +126,8 @@ public class JdbcDemoController { temperature.setDataHour(dto.getDataHour()); temperature.setDataMinute(dto.getDataMinute()); temperature.setTopic(dto.getTopic()); - temperature.setHumidity(String.valueOf(dto.getHumidity())); - temperature.setTemperature(String.valueOf(dto.getTemperature())); + temperature.setHumidity(dto.getHumidity()); + temperature.setTemperature(dto.getTemperature()); temperature.setLocationDesc(dto.getLocationDesc()); temperatureService.saveTemperature(temperature); } diff --git a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java index 4a2a5a4..3816d9a 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java +++ b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java @@ -37,11 +37,11 @@ public class Temperature implements Serializable { @ApiModelProperty(value = "温度") @Column(length=10) - private String temperature; + private double temperature; @ApiModelProperty(value = "湿度") @Column(length=10) - private String humidity; + private double humidity; @ApiModelProperty(value = "日期") @Column(length=20) 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 bf59e32..6e7dbb2 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java @@ -60,8 +60,8 @@ public class TemperatureServiceImpl implements TemperatureService { temperature.setLocationDesc("广西壮族自治区崇左市天等县天等镇荣华村弄在屯113号"); } } - temperature.setHumidity(strDataTemperature[0]); - temperature.setTemperature(strDataTemperature[1]); + temperature.setHumidity(Double.valueOf(strDataTemperature[0])); + temperature.setTemperature(Double.valueOf(strDataTemperature[1])); this.temperatureRepository.save(temperature); //ResponseDto responseDto = this.oracleTemperatureService.saveTemperature(temperature); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e60a894..f486d4c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8873 + port: 8875 shutdown: graceful #开启优雅关闭 # 日志配置 @@ -22,7 +22,7 @@ spring: #url: jdbc:mysql://192.168.3.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://192.168.1.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://47.242.184.139:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true - url: jdbc:postgresql://192.168.3.26:5432/postgres + url: jdbc:postgresql://192.168.1.69:5432/postgres driverClassName: org.postgresql.Driver #com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver username: postgres password: 452131wW