diff --git a/pom.xml b/pom.xml index f6a2948..d6d314d 100644 --- a/pom.xml +++ b/pom.xml @@ -267,6 +267,28 @@ 1.7.9 + + + com.kingbase8 + kingbase8 + 8.6.0 + + + cn.com.kingbase + KesDialect-for-hibernate4 + 1.0.0 + + + + + + + + + + + + diff --git a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java index b9dc3b7..2d578c3 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java +++ b/src/main/java/com/rehome/mqttclienttemperature/controller/JdbcDemoController.java @@ -70,7 +70,7 @@ public class JdbcDemoController { //配置数据源 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.setUrl("jdbc:mysql://192.168.3.9:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true"); ds.setUsername("root"); ds.setPassword("Skyinno251,"); ds.setDriver("com.mysql.cj.jdbc.Driver"); @@ -89,16 +89,16 @@ public class JdbcDemoController { * * @return */ - //@RequestMapping("/api/list") + @RequestMapping("/api/list") public ResponseDto queryList() { // 自定义一个线程池,内部包含8个线程 - ExecutorService customPool = Executors.newFixedThreadPool(8); + ExecutorService customPool = Executors.newFixedThreadPool(4); // 自定义一个线程池,内部包含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 = 0; i < 2310577; 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/Temperature.java b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java index a99d68c..a259efa 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java +++ b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java @@ -26,13 +26,9 @@ import java.util.Date; //同时创建普通索引和组合索引,注意普通索引每个索引名都不同，注意组合索引每个索引名都相同 @Table(indexes = {@Index(name = "idx_dataDate", columnList = "dataDate"),@Index(name = "idx_locationDesc", columnList = "locationDesc"),@Index(name = "idx_dataHour", columnList = "dataHour"),@Index(name = "idx_dataMinute", columnList = "dataMinute"),@Index(name = "data_date_location_desc", columnList = "dataDate"),@Index(name = "data_date_location_desc", columnList = "locationDesc")}) public class Temperature implements Serializable { -// @Id -// @GeneratedValue(strategy = GenerationType.IDENTITY) -// @ApiModelProperty(value = "主键") @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) @ApiModelProperty(value = "主键") - @GeneratedValue(strategy = GenerationType.SEQUENCE,generator="temperature_seq") - @SequenceGenerator(name="temperature_seq", sequenceName="temperature_seq_appserver") private Long id; @ApiModelProperty(value = "温度") diff --git a/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java b/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java index 7e364c5..0b9fe41 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java +++ b/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java @@ -16,13 +16,9 @@ import java.util.Date; @Data @Entity public class WebServiceProvince implements Serializable { -// @Id -// @GeneratedValue(strategy = GenerationType.IDENTITY) -// @ApiModelProperty(value = "主键") @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) @ApiModelProperty(value = "主键") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "webService_province_seq") - @SequenceGenerator(name = "webService_province_seq", sequenceName = "webService_province_seq") private Long id; @ApiModelProperty(value = "洲、国内外省份") diff --git a/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java b/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java index 2e3fd3e..d4211c1 100644 --- a/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java +++ b/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java @@ -29,13 +29,9 @@ import java.util.Date; // @Index(name = "data_create_date_city_name", columnList = "cityName"), @Index(name = "data_create_date_city_name", columnList = "createDate")}) public class WebServiceWeatherInfo { -// @Id -// @GeneratedValue(strategy = GenerationType.IDENTITY) -// @ApiModelProperty(value = "主键") @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) @ApiModelProperty(value = "主键") - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "webService_weather_info_seq") - @SequenceGenerator(name = "webService_weather_info_seq", sequenceName = "webService_weather_info_seq") private Long id; @Column(length = 100) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f4027dd..dee4bbe 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -9,35 +9,30 @@ 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, - #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 - #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 - #url: jdbc:mysql://192.168.3.7:3306/appserver?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true - #url: jdbc:mysql://192.168.1.24:3306/weather?useUnicode=true&characterEncoding=utf-8&useSSL=false&autoReconnect=true - #url: jdbc:mysql://192.168.3.24: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 - #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 -# 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 + # =====================kingbase相关配置===================== + hikari: + #数据库线程池最大连接数 + maximum-pool-size: 6 + # 数据库类型 + name: kingbase + #数据库连接驱动 + driver-class-name: com.kingbase8.Driver + #数据库连接url + url: jdbc:kingbase8://192.168.3.24:54321/appserver?currentSchema=appserver + #数据库连接账号 + username: system + #数据库连接密码 + password: 452131wW jpa: - database: oracle # 配置 DBMS 类型 - show-sql: true # 配置是否将执行的 SQL 输出到日志 + # 配置是否将执行的 SQL 输出到日志 + show-sql: false open-in-view: true - hibernate: - ddl-auto: update # 第一次建表create 后面用update，要不然每次重启都会新建表 + properties: + hibernate: + dialect: org.hibernate.dialect.Kingbase8Dialect + ddl-auto: update + hbm2ddl: + auto: update servlet: multipart: # 开启 multipart 上传功能