diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2433f37..18cc7ac 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,17 +5,10 @@ - - - - - - - + - diff --git a/src/main/java/com/rehome/mqttclienttemperature/service/impl/SqlServerTemperatureServiceImpl.java b/src/main/java/com/rehome/mqttclienttemperature/service/impl/SqlServerTemperatureServiceImpl.java index 91b6b96..b7871b1 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/impl/SqlServerTemperatureServiceImpl.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/impl/SqlServerTemperatureServiceImpl.java @@ -44,7 +44,7 @@ public class SqlServerTemperatureServiceImpl implements SqlServerTemperatureServ //pg //String sql = "insert into temperature(temperature, humidity, data_date, data_hour, data_minute, topic, location_desc, create_date) values(?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP)"; //sqlserver 和 pg 相同 - String sql = "insert into temperature(id,temperature, humidity, data_date, data_hour, data_minute, topic, location_desc, create_date) values(SELECT @@IDENTITY AS id,?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP)"; + String sql = "insert into dbo.temperature(id,temperature, humidity, data_date, data_hour, data_minute, topic, location_desc, create_date) values((NEXT VALUE FOR dbo.hibernate_sequence),?, ?, ?, ?, ?, ?, ?, CURRENT_TIMESTAMP)"; List jdbcParamValues = new ArrayList<>(); jdbcParamValues.add(temperature.getTemperature()); @@ -57,7 +57,7 @@ public class SqlServerTemperatureServiceImpl implements SqlServerTemperatureServ //jdbcParamValues.add(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(temperature.getCreateDate())); Gson gson = new Gson(); - ResponseDto responseDto = JdbcUtil.executeInsertSql(ds, sql, jdbcParamValues); + ResponseDto responseDto = JdbcUtil.executeSql(ds, sql, jdbcParamValues); String dbQueryResult = gson.toJson(responseDto); log.info(dbQueryResult); jdbcParamValues.clear(); 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 2b04436..37243c8 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java +++ b/src/main/java/com/rehome/mqttclienttemperature/service/impl/TemperatureServiceImpl.java @@ -67,12 +67,12 @@ public class TemperatureServiceImpl implements TemperatureService { temperature.setHumidity(strDataTemperature[0]); temperature.setTemperature(strDataTemperature[1]); - this.temperatureRepository.save(temperature); -// ResponseDto responseDto = this.oracleTemperatureService.saveTemperature(temperature); -// log.info(new Gson().toJson(responseDto)); + //this.temperatureRepository.save(temperature); + ResponseDto responseDtoOracle = this.oracleTemperatureService.saveTemperature(temperature); + log.info(new Gson().toJson(responseDtoOracle)); -// ResponseDto responseDto = this.sqlServerTemperatureService.saveTemperature(temperature); -// log.info(new Gson().toJson(responseDto)); + ResponseDto responseDtoSqlserver = this.sqlServerTemperatureService.saveTemperature(temperature); + log.info(new Gson().toJson(responseDtoSqlserver)); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 01e5757..f7a9dfd 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,10 +10,10 @@ logging: spring: datasource: type: com.zaxxer.hikari.HikariDataSource - driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://192.168.3.29:1433;DatabaseName=appserver;encrypt=false; - username: sa - password: 452131wW +# 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://192.168.2.18:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true @@ -25,15 +25,16 @@ 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, + url: jdbc:mysql://127.0.0.1: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: oracle.jdbc.driver.OracleDriver # url: jdbc:oracle:thin:@192.168.3.9:1521/orcl # username: appserver # password: appserver jpa: - database: sql_server # 配置 DBMS 类型 + database: mysql # 配置 DBMS 类型 show-sql: true # 配置是否将执行的 SQL 输出到日志 open-in-view: true hibernate: