diff --git a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java index 7f5731d..a2fb72e 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java +++ b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java @@ -2,6 +2,7 @@ package com.rehome.mqttclienttemperature; import com.rehome.mqttclienttemperature.service.TemperatureService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; @@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import javax.annotation.Resource; import java.util.Map; +@Slf4j @EnableJpaAuditing @EnableScheduling @EnableAsync @@ -45,17 +47,17 @@ public class AdminClientTemperatureApplication implements CommandLineRunner, App //在这里可以调用applicationContext了 Map controllers = applicationContext.getBeansWithAnnotation(RequestMapping.class); for (Map.Entry entry : controllers.entrySet()) { - System.out.println("------------------------"); - System.out.println(entry.getKey());//demo1Controller + log.info("------------------------"); + log.info(entry.getKey());//demo1Controller } try { if (temperatureService != null) { - System.out.println("------------------------"); - System.out.println("TemperatureController is not empty"); + log.info("------------------------"); + log.info("TemperatureController is not empty"); MqttRSAClient client = new MqttRSAClient(); client.start(temperatureService); }else { - System.out.println("temperatureService is empty"); + log.info("temperatureService is empty"); } } catch (Exception ex) { ex.printStackTrace(); diff --git a/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java b/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java index 6318f9d..798975d 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java +++ b/src/main/java/com/rehome/mqttclienttemperature/MqttRSAClient.java @@ -4,9 +4,9 @@ package com.rehome.mqttclienttemperature; import com.rehome.mqttclienttemperature.service.TemperatureService; import com.rehome.mqttclienttemperature.utils.MqttSSLSocketFactory; import com.rehome.mqttclienttemperature.utils.UUIDUtil; +import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.*; import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; - import javax.net.ssl.SSLSocketFactory; import java.io.InputStream; import java.text.SimpleDateFormat; @@ -14,7 +14,8 @@ import java.util.Date; import java.util.Timer; import java.util.TimerTask; -// Xiaomi_8B2C + +@Slf4j public class MqttRSAClient { /** * 代理服务器ip地址 @@ -93,7 +94,7 @@ public class MqttRSAClient { @Override public void connectionLost(Throwable throwable) { - System.out.println("connectionLost"); + log.info("connectionLost"); try { mqttClient.reconnect(); } catch (MqttException e) { @@ -104,15 +105,15 @@ public class MqttRSAClient { @Override public void messageArrived(String s, MqttMessage mqttMessage) { String strData = new String(mqttMessage.getPayload()); - System.out.println("topic:"+s); - System.out.println("Qos:"+mqttMessage.getQos()); - System.out.println("message RSA:"+strData); + log.info("topic:"+s); + log.info("Qos:"+mqttMessage.getQos()); + log.info("message RSA:"+strData); temperatureService.saveTemperature(strData,s); } @Override public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) { - System.out.println("deliveryComplete---------"+ iMqttDeliveryToken.isComplete()); + log.info("deliveryComplete---------"+ iMqttDeliveryToken.isComplete()); } @Override @@ -128,17 +129,17 @@ public class MqttRSAClient { timer = new Timer(); timer.schedule(new TimerTask() { public void run() { - System.out.println("-------设定要指定任务--------"); + log.info("-------设定要指定任务--------"); try { //判断拦截状态，这里注意一下，如果没有这个判断，是非常坑的 if (!mqttClient.isConnected()) { - System.out.println("***** 没有连接到服务器 *****"); - System.out.println("***** client to connect *****"); + log.info("***** 没有连接到服务器 *****"); + log.info("***** client to connect *****"); // 重新连接 mqttClient.connect(options); } if (mqttClient.isConnected()) {//连接成功，跳出连接 - System.out.println("***** connect success *****"); + log.info("***** connect success *****"); } } catch (MqttException e1) { e1.printStackTrace(); diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java index 7e7ff73..c0a6ca9 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java @@ -12,7 +12,6 @@ import com.rehome.mqttclienttemperature.utils.JdbcUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/rehome/mqttclienttemperature/service/ScheduledService.java b/src/main/java/com/rehome/mqttclienttemperature/service/ScheduledService.java index aa1ea52..706408e 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/ScheduledService.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/ScheduledService.java @@ -5,6 +5,7 @@ package com.rehome.mqttclienttemperature.service; import com.google.gson.Gson; import com.rehome.mqttclienttemperature.controller.JdbcDemoController; import com.rehome.mqttclienttemperature.dto.ResponseDto; +import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -17,6 +18,7 @@ import javax.annotation.Resource; * Created DateTime 2021-04-26 14:35 * @description: 定时任务服务 */ + @Component public class ScheduledService { 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 161a245..b7f1c76 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java @@ -74,16 +74,16 @@ public class TemperatureServiceImpl implements TemperatureService { temperature.setTemperature(strDataTemperature[1]); //postgresql and mysql - //this.temperatureRepository.save(temperature); + this.temperatureRepository.save(temperature); //mysqlTemperatureService.saveTemperature(temperature); // ResponseDto responseDtoSPg = this.postgresSqlTemperatureService.saveTemperature(temperature); // log.info(new Gson().toJson(responseDtoSPg)); //oracle and sqlserver - 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 responseDtoOracle = this.oracleTemperatureService.saveTemperature(temperature); +// log.info(new Gson().toJson(responseDtoOracle)); +// ResponseDto responseDtoSqlserver = this.sqlServerTemperatureService.saveTemperature(temperature); +// log.info(new Gson().toJson(responseDtoSqlserver)); //人大金仓，不开启,太占内存 // ResponseDto responseDtoKingBase = this.kingbaseTemperatureService.saveTemperature(temperature);