hwf453
/
admin-client-temperature
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add oled

Browse Source
master
修改密码漏洞修复完成 1 month ago
parent a52a643c90
commit 57c8d1dc04
7 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File

8
admin-client-temperature.iml
Unescape Escape View File

@ -10,7 +10,10 @@
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping />
<datasource-mapping>
<factory-entry name="admin-client-temperature" />
<factory-entry name="entityManagerFactory" />
</datasource-mapping>
<naming-strategy-map />
</configuration>
</facet>
@ -18,13 +21,12 @@
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<component name="NewModuleRootManager">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />

5
src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java
Unescape Escape View File

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

2
src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java
Unescape Escape View File

@ -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);
}
}

2
src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java
Unescape Escape View File

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

8
src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java
Unescape Escape View File

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

2
src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureEspController.java
Unescape Escape View File

@ -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";
}
}

59
src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureEspServiceImpl.java
Unescape Escape View File

@ -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();
}
}

Write Preview
Loading…
Cancel
Save