From abd36d3cf94c501f33281eae0322f15a17225a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E6=BC=8F=E6=B4=9E?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8C=E6=88=90?= <> Date: Sat, 13 Sep 2025 17:32:52 +0800 Subject: [PATCH] 20250913 --- admin-client-temperature.iml | 4 +- .../AdminClientTemperatureApplication.java | 6 +- .../MqttDianDengTechClient.java | 2 +- .../controller/JdbcDemoController.java | 30 ++++++---- .../entity/WebServiceProvince.java | 14 ++--- .../entity/WebServiceWeatherInfo.java | 58 +++++++++---------- 6 files changed, 59 insertions(+), 55 deletions(-) diff --git a/admin-client-temperature.iml b/admin-client-temperature.iml index 881a08a..60dcaf7 100644 --- a/admin-client-temperature.iml +++ b/admin-client-temperature.iml @@ -10,9 +10,7 @@ - - - + diff --git a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java index 2c5ef5d..977633f 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java +++ b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java @@ -19,9 +19,9 @@ import javax.annotation.Resource; import java.util.Map; @Slf4j -@EnableJpaAuditing -@EnableScheduling -@EnableAsync +//@EnableJpaAuditing +//@EnableScheduling +//@EnableAsync @SpringBootApplication public class AdminClientTemperatureApplication implements CommandLineRunner, ApplicationContextAware { diff --git a/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java b/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java index 035efcc..7380905 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java +++ b/src/main/java/com/rehome/mqttclienttemperature/MqttDianDengTechClient.java @@ -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); } } diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java index c0a6ca9..db3d044 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java @@ -53,7 +53,7 @@ import java.util.concurrent.*; */ @Slf4j -@RestController +//@RestController public class JdbcDemoController { @Resource @@ -64,20 +64,26 @@ 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"); -// ds.setUrl("jdbc:oracle:thin:@192.168.1.9:1521/orcl"); -// ds.setUrl("jdbc:oracle:thin:@192.168.3.7:1521/orcl"); +// ds.setUrl("jdbc:oracle:thin:@192.168.3.9:1521/orcl"); // ds.setUsername("appserver"); // 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"); } /** @@ -85,16 +91,16 @@ public class JdbcDemoController { * * @return */ - //@RequestMapping("/api/list") + @RequestMapping("/api/list") public ResponseDto queryList() { // 自定义一个线程池,内部包含8个线程 - ExecutorService customPool = Executors.newFixedThreadPool(8); + ExecutorService customPool = Executors.newFixedThreadPool(2); // 自定义一个线程池,内部包含10个线程 ExecutorService executorService = Executors.newFixedThreadPool(10); CompletableFuture future = CompletableFuture.supplyAsync(() -> { String sql = "select * from temperature where id = ?"; List jdbcParamValues = new ArrayList<>(); - for (int i = 2292104; i < 2298700; i++) { + for (int i = 2575155; i < 2600000; i++) { jdbcParamValues.add(i + 1); Gson gson = new Gson(); ResponseDto responseDto = JdbcUtil.executeSql(ds, sql, jdbcParamValues); diff --git a/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java b/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java index 0b9fe41..55082b9 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java +++ b/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java @@ -1,7 +1,7 @@ package com.rehome.mqttclienttemperature.entity; -import io.swagger.annotations.ApiModelProperty; +//import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.annotations.Proxy; import org.springframework.data.annotation.CreatedDate; @@ -18,27 +18,27 @@ import java.util.Date; public class WebServiceProvince implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @ApiModelProperty(value = "主键") + //@ApiModelProperty(value = "主键") private Long id; - @ApiModelProperty(value = "洲、国内外省份") + //@ApiModelProperty(value = "洲、国内外省份") @Column(length = 100) private String provinceName; - @ApiModelProperty(value = "日期") + //@ApiModelProperty(value = "日期") @Temporal(TemporalType.TIMESTAMP) @CreatedDate private Date createDate; - @ApiModelProperty(value = "时") + //@ApiModelProperty(value = "时") @Column(length = 20) private String dataHour; - @ApiModelProperty(value = "分") + //@ApiModelProperty(value = "分") @Column(length = 20) private String dataMinute; - @ApiModelProperty(value = "秒") + //@ApiModelProperty(value = "秒") @Column(length = 20) private String dataSecond; } diff --git a/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java b/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java index c58da1a..7de0f12 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java +++ b/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java @@ -1,6 +1,6 @@ package com.rehome.mqttclienttemperature.entity; -import io.swagger.annotations.ApiModelProperty; +//import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.hibernate.annotations.Proxy; import org.springframework.data.annotation.CreatedDate; @@ -31,123 +31,123 @@ public class WebServiceWeatherInfo { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @ApiModelProperty(value = "主键") + //@ApiModelProperty(value = "主键") private Long id; @Column(length = 100) - @ApiModelProperty(value = "洲、国内外省份名称") + //@ApiModelProperty(value = "洲、国内外省份名称") private String provinceName; @Column(length = 100) - @ApiModelProperty(value = "国内外城市中文名称") + //@ApiModelProperty(value = "国内外城市中文名称") private String cityName; @Column(length = 30) - @ApiModelProperty(value = "城市编号") + //@ApiModelProperty(value = "城市编号") private String cityCode; @Column(length = 30) - @ApiModelProperty(value = "城市图片名称") + //@ApiModelProperty(value = "城市图片名称") private String cityPhoto; @Column(length = 30) - @ApiModelProperty(value = "天气最后更新时间") + //@ApiModelProperty(value = "天气最后更新时间") private String weatherLastUpdate; @Column(length = 20) - @ApiModelProperty(value = "当天的 气温") + //@ApiModelProperty(value = "当天的 气温") private String weatherNow; - @ApiModelProperty(value = "概况") + //@ApiModelProperty(value = "概况") private String weatherShortDesc; @Column(length = 30) - @ApiModelProperty(value = "风向和风力") + //@ApiModelProperty(value = "风向和风力") private String windDesc; @Column(length = 30) - @ApiModelProperty(value = "天气趋势开始图片名称(以下称：图标一)") + //@ApiModelProperty(value = "天气趋势开始图片名称(以下称：图标一)") private String weatherTrendStart; @Column(length = 30) - @ApiModelProperty(value = "天气趋势结束图片名称(以下称：图标二)") + //@ApiModelProperty(value = "天气趋势结束图片名称(以下称：图标二)") private String weatherTrendEnd; //存放长文本 //@Lob //@Basic(fetch = FetchType.LAZY) - @ApiModelProperty(value = "现在的天气实况") + //@ApiModelProperty(value = "现在的天气实况") @Column(columnDefinition = "text") private String weatherRealStatus; //存放长文本 //@Lob //@Basic(fetch = FetchType.LAZY) - @ApiModelProperty(value = "天气和生活指数") + //@ApiModelProperty(value = "天气和生活指数") @Column(columnDefinition = "text") private String weatherLiveIndex; @Column(length = 20) - @ApiModelProperty(value = "第二天的 气温") + //@ApiModelProperty(value = "第二天的 气温") private String nextDateTemperature; @Column(length = 30) - @ApiModelProperty(value = "第二天的 概况") + //@ApiModelProperty(value = "第二天的 概况") private String nextDateWeatherShortDesc; @Column(length = 30) - @ApiModelProperty(value = "第二天的 风向和风力") + //@ApiModelProperty(value = "第二天的 风向和风力") private String nextDateWindDesc; @Column(length = 30) - @ApiModelProperty(value = "第二天的 图标一") + //@ApiModelProperty(value = "第二天的 图标一") private String nextDateWeatherTrendStart; @Column(length = 30) - @ApiModelProperty(value = "第二天的 图标二") + //@ApiModelProperty(value = "第二天的 图标二") private String nextDateWeatherTrendEnd; @Column(length = 20) - @ApiModelProperty(value = "第三天的 气温") + //@ApiModelProperty(value = "第三天的 气温") private String threeDayTemperature; @Column(length = 30) - @ApiModelProperty(value = "第三天的 概况") + //@ApiModelProperty(value = "第三天的 概况") private String threeWeatherShortDesc; @Column(length = 30) - @ApiModelProperty(value = "第三天的 风向和风力") + //@ApiModelProperty(value = "第三天的 风向和风力") private String threeDayWindDesc; @Column(length = 30) - @ApiModelProperty(value = "第三天的 图标一") + //@ApiModelProperty(value = "第三天的 图标一") private String threeDayWeatherTrendStart; @Column(length = 30) - @ApiModelProperty(value = "第三天的 图标二") + //@ApiModelProperty(value = "第三天的 图标二") private String threeDayWeatherTrendEnd; - @ApiModelProperty(value = "被查询的城市或地区的介绍") + //@ApiModelProperty(value = "被查询的城市或地区的介绍") //存放长文本 // @Lob // @Basic(fetch = FetchType.LAZY) @Column(columnDefinition = "text") private String cityIntroduce; - @ApiModelProperty(value = "日期") + //@ApiModelProperty(value = "日期") @Temporal(TemporalType.TIMESTAMP) @CreatedDate private Date createDate; - @ApiModelProperty(value = "时") + //@ApiModelProperty(value = "时") @Column(length = 20) private String dataHour; - @ApiModelProperty(value = "分") + //@ApiModelProperty(value = "分") @Column(length = 20) private String dataMinute; - @ApiModelProperty(value = "秒") + //@ApiModelProperty(value = "秒") @Column(length = 20) private String dataSecond;