diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 93f46c6..39ab141 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,6 +6,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -21,5 +31,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c7eadfe..31d3ea8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,10 @@
-
+
+
+
+
@@ -29,6 +32,13 @@
+
+
+
@@ -48,7 +58,7 @@
-
+
@@ -160,6 +170,8 @@
+
+
@@ -178,4 +190,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java
index 2e3b958..28515b7 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/entity/Temperature.java
@@ -25,12 +25,12 @@ 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.SEQUENCE,generator="temperature_seq")
-// @SequenceGenerator(name="temperature_seq", sequenceName="temperature_seq_name_appserver")
+// @GeneratedValue(strategy = GenerationType.IDENTITY)
+// @ApiModelProperty(value = "主键")
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE,generator="temperature_seq")
+ @SequenceGenerator(name="temperature_seq", sequenceName="temperature_seq_name_appserver")
private Long id;
@ApiModelProperty(value = "温度")
@@ -61,6 +61,6 @@ public class Temperature implements Serializable {
@ApiModelProperty(value = "时间")
@Column(length=20)
- private String createDate;
+ private Date createDate;
}
diff --git a/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java b/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java
index 03818c0..91673fe 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceProvince.java
@@ -12,28 +12,31 @@ import java.io.Serializable;
@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_name_appserver")
private Long id;
@ApiModelProperty(value = "洲、国内外省份")
- @Column(length=100)
+ @Column(length = 100)
private String provinceName;
@ApiModelProperty(value = "日期")
- @Column(length=20)
+ @Column(length = 20)
private String createDate;
@ApiModelProperty(value = "时")
- @Column(length=20)
+ @Column(length = 20)
private String dataHour;
@ApiModelProperty(value = "分")
- @Column(length=20)
+ @Column(length = 20)
private String dataMinute;
@ApiModelProperty(value = "秒")
- @Column(length=20)
+ @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 b6c1f6f..53dcae8 100644
--- a/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java
+++ b/src/main/java/com/rehome/mqttclienttemperature/entity/WebServiceWeatherInfo.java
@@ -21,52 +21,55 @@ import javax.persistence.*;
@Proxy(lazy = false)
@Data
@Entity
-@Table(indexes = {@Index(name = "idx_cityName", columnList = "cityName"),@Index(name = "idx_cityCode", columnList = "cityCode"),@Index(name = "idx_createDate", columnList = "createDate"),@Index(name = "idx_dataHour", columnList = "dataHour"),@Index(name = "idx_dataMinute", columnList = "dataMinute"),@Index(name = "idx_dataSecond", columnList = "dataSecond"),
- @Index(name = "data_create_date_city_code", columnList = "cityCode"),@Index(name = "data_create_date_city_code", columnList = "createDate"),
- @Index(name = "data_create_date_city_name", columnList = "cityName"),@Index(name = "data_create_date_city_name", columnList = "createDate")})
+@Table(indexes = {@Index(name = "idx_cityName", columnList = "cityName"), @Index(name = "idx_cityCode", columnList = "cityCode"), @Index(name = "idx_createDate", columnList = "createDate"), @Index(name = "idx_dataHour", columnList = "dataHour"), @Index(name = "idx_dataMinute", columnList = "dataMinute"), @Index(name = "idx_dataSecond", columnList = "dataSecond"),
+ @Index(name = "data_create_date_city_code", columnList = "cityCode"), @Index(name = "data_create_date_city_code", columnList = "createDate"),
+ @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_name_appserver")
private Long id;
- @Column(length=100)
+ @Column(length = 100)
@ApiModelProperty(value = "洲、国内外省份名称")
private String provinceName;
- @Column(length=100)
+ @Column(length = 100)
@ApiModelProperty(value = "国内外城市中文名称")
private String cityName;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "城市编号")
private String cityCode;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "城市图片名称")
private String cityPhoto;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "天气最后更新时间")
private String weatherLastUpdate;
- @Column(length=20)
+ @Column(length = 20)
@ApiModelProperty(value = "当天的 气温")
private String weatherNow;
@ApiModelProperty(value = "概况")
private String weatherShortDesc;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "风向和风力")
private String windDesc;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "天气趋势开始图片名称(以下称：图标一)")
private String weatherTrendStart;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "天气趋势结束图片名称(以下称：图标二)")
private String weatherTrendEnd;
@@ -82,43 +85,43 @@ public class WebServiceWeatherInfo {
@ApiModelProperty(value = "天气和生活指数")
private String weatherLiveIndex;
- @Column(length=20)
+ @Column(length = 20)
@ApiModelProperty(value = "第二天的 气温")
private String nextDateTemperature;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "第二天的 概况")
private String nextDateWeatherShortDesc;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "第二天的 风向和风力")
private String nextDateWindDesc;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "第二天的 图标一")
private String nextDateWeatherTrendStart;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "第二天的 图标二")
private String nextDateWeatherTrendEnd;
- @Column(length=20)
+ @Column(length = 20)
@ApiModelProperty(value = "第三天的 气温")
private String threeDayTemperature;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "第三天的 概况")
private String threeWeatherShortDesc;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "第三天的 风向和风力")
private String threeDayWindDesc;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "第三天的 图标一")
private String threeDayWeatherTrendStart;
- @Column(length=30)
+ @Column(length = 30)
@ApiModelProperty(value = "第三天的 图标二")
private String threeDayWeatherTrendEnd;
@@ -129,19 +132,19 @@ public class WebServiceWeatherInfo {
private String cityIntroduce;
@ApiModelProperty(value = "日期")
- @Column(length=20)
+ @Column(length = 20)
private String createDate;
@ApiModelProperty(value = "时")
- @Column(length=20)
+ @Column(length = 20)
private String dataHour;
@ApiModelProperty(value = "分")
- @Column(length=20)
+ @Column(length = 20)
private String dataMinute;
@ApiModelProperty(value = "秒")
- @Column(length=20)
+ @Column(length = 20)
private String dataSecond;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4e9d3b1..3a08ad1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -12,20 +12,20 @@ spring:
#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.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/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.7:1521/orcl
-# username: appserver
-# password: appserver
+# 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.1.9:1521/orcl
+ username: appserver
+ password: appserver
jpa:
- database: mysql # 配置 DBMS 类型
+ database: oracle # 配置 DBMS 类型
show-sql: true # 配置是否将执行的 SQL 输出到日志
open-in-view: true
hibernate: