diff --git a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java index 34e47f1..a9564f9 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java +++ b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java @@ -19,8 +19,8 @@ import javax.annotation.Resource; import java.util.Map; @Slf4j -@EnableScheduling -@EnableAsync +//@EnableScheduling +//@EnableAsync @SpringBootApplication public class AdminClientTemperatureApplication implements CommandLineRunner, ApplicationContextAware { diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java index 31ae78d..455beb4 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java @@ -64,12 +64,12 @@ public class JdbcDemoController { static { //配置数据源 -// ds.setId("1"); -// ds.setName("mysql"); -// ds.setUrl("jdbc:mysql://192.168.1.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true"); -// ds.setUsername("root"); -// ds.setPassword("Skyinno251,"); -// ds.setDriver("com.mysql.cj.jdbc.Driver"); + ds.setId("1"); + ds.setName("mysql"); + ds.setUrl("jdbc:mysql://192.168.1.24:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true"); + ds.setUsername("root"); + ds.setPassword("Skyinno251,"); + ds.setDriver("com.mysql.cj.jdbc.Driver"); // ds.setId("2"); // ds.setName("oracle"); @@ -78,12 +78,12 @@ public class JdbcDemoController { // ds.setPassword("appserver"); // ds.setDriver("oracle.jdbc.driver.OracleDriver"); - ds.setId("3"); - ds.setName("sqlserver"); - ds.setUrl("jdbc:sqlserver://192.168.3.29:1433;DatabaseName=appserver;encrypt=false"); - ds.setUsername("sa"); - ds.setPassword("452131wW"); - ds.setDriver("com.microsoft.sqlserver.jdbc.SQLServerDriver"); +// ds.setId("3"); +// ds.setName("sqlserver"); +// ds.setUrl("jdbc:sqlserver://192.168.3.29:1433;DatabaseName=appserver;encrypt=false"); +// ds.setUsername("sa"); +// ds.setPassword("452131wW"); +// ds.setDriver("com.microsoft.sqlserver.jdbc.SQLServerDriver"); } /** @@ -91,7 +91,7 @@ public class JdbcDemoController { * * @return */ - //@RequestMapping("/api/list") + @RequestMapping("/api/list") public ResponseDto queryList() { // 自定义一个线程池,内部包含8个线程 ExecutorService customPool = Executors.newFixedThreadPool(2); @@ -100,7 +100,7 @@ public class JdbcDemoController { CompletableFuture future = CompletableFuture.supplyAsync(() -> { String sql = "select * from temperature where id = ?"; List jdbcParamValues = new ArrayList<>(); - for (int i = 2575155; i < 2600000; i++) { + for (int i = 3075212; i < 3226763; i++) { jdbcParamValues.add(i + 1); Gson gson = new Gson(); ResponseDto responseDto = JdbcUtil.executeSql(ds, sql, jdbcParamValues); @@ -118,8 +118,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 7fd7357..2412be0 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java +++ b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java @@ -37,12 +37,12 @@ public class Temperature implements Serializable { private Long id; //@ApiModelProperty(value = "温度") - @Column(length=10) - private String temperature; + //@Column(length=10) + private Double temperature; //@ApiModelProperty(value = "湿度") - @Column(length=10) - private String humidity; + //@Column(length=10) + 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 b7f1c76..8f9c9c8 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java @@ -70,8 +70,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])); //postgresql and mysql this.temperatureRepository.save(temperature);