diff --git a/.idea/misc.xml b/.idea/misc.xml index b21ccde..f36671a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,5 +11,5 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index cc98f91..2433f37 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,11 +5,17 @@ - - + + + + + + + + - + diff --git a/pom.xml b/pom.xml index 2bad480..1e40ac8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.9 + 2.5.3 com.rehome @@ -15,7 +15,7 @@ admin-client-temperature admin-client-temperature - 21 + 1.8 diff --git a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java index 558a815..7f5731d 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java +++ b/src/main/java/com/rehome/mqttclienttemperature/AdminClientTemperatureApplication.java @@ -2,7 +2,6 @@ package com.rehome.mqttclienttemperature; import com.rehome.mqttclienttemperature.service.TemperatureService; -import jakarta.annotation.Resource; import org.springframework.beans.BeansException; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; @@ -13,6 +12,8 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.web.bind.annotation.RequestMapping; + +import javax.annotation.Resource; import java.util.Map; @EnableJpaAuditing diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java index 0b834ed..7e7ff73 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java @@ -9,10 +9,11 @@ import com.rehome.mqttclienttemperature.dto.TemperatureDto; import com.rehome.mqttclienttemperature.entity.Temperature; import com.rehome.mqttclienttemperature.service.TemperatureService; import com.rehome.mqttclienttemperature.utils.JdbcUtil; -import jakarta.annotation.Resource; 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; import java.util.concurrent.*; diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureController.java index 603e495..0127317 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/TemperatureController.java @@ -6,13 +6,13 @@ import com.rehome.mqttclienttemperature.dto.RequestTemperatureDto; import com.rehome.mqttclienttemperature.entity.Temperature; import com.rehome.mqttclienttemperature.response.Result; import com.rehome.mqttclienttemperature.service.TemperatureService; -import jakarta.annotation.Resource; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.List; /** diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/api/TemperatureApiController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/api/TemperatureApiController.java index 9e7b731..b3bdbfa 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/api/TemperatureApiController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/api/TemperatureApiController.java @@ -6,11 +6,12 @@ import com.rehome.mqttclienttemperature.dto.RequestTemperatureDto; import com.rehome.mqttclienttemperature.entity.Temperature; import com.rehome.mqttclienttemperature.response.Result; import com.rehome.mqttclienttemperature.service.TemperatureService; -import jakarta.annotation.Resource; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; import java.util.List; /** diff --git a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java index 6711709..7fd7357 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java +++ b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java @@ -1,11 +1,12 @@ package com.rehome.mqttclienttemperature.entity; -import jakarta.persistence.*; import lombok.Data; import org.hibernate.annotations.Proxy; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import javax.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/com/rehome/mqttclienttemperature/service/ScheduledService.java b/src/main/java/com/rehome/mqttclienttemperature/service/ScheduledService.java index 5288b98..aa1ea52 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/ScheduledService.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/ScheduledService.java @@ -5,10 +5,10 @@ package com.rehome.mqttclienttemperature.service; import com.google.gson.Gson; import com.rehome.mqttclienttemperature.controller.JdbcDemoController; import com.rehome.mqttclienttemperature.dto.ResponseDto; -import jakarta.annotation.Resource; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import javax.annotation.Resource; /** 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 c8a8bb9..2b04436 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java @@ -7,13 +7,14 @@ import com.rehome.mqttclienttemperature.entity.Temperature; import com.rehome.mqttclienttemperature.service.OracleTemperatureService; import com.rehome.mqttclienttemperature.service.SqlServerTemperatureService; import com.rehome.mqttclienttemperature.service.TemperatureService; -import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; + +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -66,12 +67,12 @@ public class TemperatureServiceImpl implements TemperatureService { temperature.setHumidity(strDataTemperature[0]); temperature.setTemperature(strDataTemperature[1]); -// this.temperatureRepository.save(temperature); + this.temperatureRepository.save(temperature); // ResponseDto responseDto = this.oracleTemperatureService.saveTemperature(temperature); // log.info(new Gson().toJson(responseDto)); - ResponseDto responseDto = this.sqlServerTemperatureService.saveTemperature(temperature); - log.info(new Gson().toJson(responseDto)); +// ResponseDto responseDto = this.sqlServerTemperatureService.saveTemperature(temperature); +// log.info(new Gson().toJson(responseDto)); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b1ecd4d..01e5757 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,12 +10,12 @@ logging: spring: datasource: type: com.zaxxer.hikari.HikariDataSource -# driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver -# url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=appserver;encrypt=false; -# username: sa -# password: Skyinno251, + driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver + url: jdbc:sqlserver://192.168.3.29:1433;DatabaseName=appserver;encrypt=false; + username: sa + password: 452131wW #url: jdbc:mysql://192.168.3.29:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true - url: jdbc:mysql://127.0.0.1:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true + #url: jdbc:mysql://127.0.0.1:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://192.168.2.18:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://192.168.1.92:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true #url: jdbc:mysql://192.168.3.7:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true @@ -25,15 +25,15 @@ spring: #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:mysql://192.168.3.9:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true - driverClassName: com.mysql.cj.jdbc.Driver #com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver - username: root - password: Skyinno251, +# driverClassName: com.mysql.cj.jdbc.Driver #com.mysql.cj.jdbc.Driver com.mysql.jdbc.Driver +# username: root +# password: Skyinno251, # driverClassName: oracle.jdbc.driver.OracleDriver # url: jdbc:oracle:thin:@192.168.3.9:1521/orcl # username: appserver # password: appserver jpa: - database: mysql # 配置 DBMS 类型 + database: sql_server # 配置 DBMS 类型 show-sql: true # 配置是否将执行的 SQL 输出到日志 open-in-view: true hibernate: