|
|
|
@ -1,6 +1,6 @@
|
|
|
|
package com.rehome.mqttclienttemperature.entity;
|
|
|
|
package com.rehome.mqttclienttemperature.entity;
|
|
|
|
|
|
|
|
|
|
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
|
|
//import io.swagger.annotations.ApiModelProperty;
|
|
|
|
import lombok.Data;
|
|
|
|
import lombok.Data;
|
|
|
|
import org.hibernate.annotations.Proxy;
|
|
|
|
import org.hibernate.annotations.Proxy;
|
|
|
|
import org.springframework.data.annotation.CreatedDate;
|
|
|
|
import org.springframework.data.annotation.CreatedDate;
|
|
|
|
@ -31,123 +31,123 @@ public class WebServiceWeatherInfo {
|
|
|
|
|
|
|
|
|
|
|
|
@Id
|
|
|
|
@Id
|
|
|
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
|
|
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
|
|
|
@ApiModelProperty(value = "主键")
|
|
|
|
//@ApiModelProperty(value = "主键")
|
|
|
|
private Long id;
|
|
|
|
private Long id;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 100)
|
|
|
|
@Column(length = 100)
|
|
|
|
@ApiModelProperty(value = "洲、国内外省份名称")
|
|
|
|
//@ApiModelProperty(value = "洲、国内外省份名称")
|
|
|
|
private String provinceName;
|
|
|
|
private String provinceName;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 100)
|
|
|
|
@Column(length = 100)
|
|
|
|
@ApiModelProperty(value = "国内外城市中文名称")
|
|
|
|
//@ApiModelProperty(value = "国内外城市中文名称")
|
|
|
|
private String cityName;
|
|
|
|
private String cityName;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "城市编号")
|
|
|
|
//@ApiModelProperty(value = "城市编号")
|
|
|
|
private String cityCode;
|
|
|
|
private String cityCode;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "城市图片名称")
|
|
|
|
//@ApiModelProperty(value = "城市图片名称")
|
|
|
|
private String cityPhoto;
|
|
|
|
private String cityPhoto;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "天气最后更新时间")
|
|
|
|
//@ApiModelProperty(value = "天气最后更新时间")
|
|
|
|
private String weatherLastUpdate;
|
|
|
|
private String weatherLastUpdate;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 20)
|
|
|
|
@Column(length = 20)
|
|
|
|
@ApiModelProperty(value = "当天的 气温")
|
|
|
|
//@ApiModelProperty(value = "当天的 气温")
|
|
|
|
private String weatherNow;
|
|
|
|
private String weatherNow;
|
|
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty(value = "概况")
|
|
|
|
//@ApiModelProperty(value = "概况")
|
|
|
|
private String weatherShortDesc;
|
|
|
|
private String weatherShortDesc;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "风向和风力")
|
|
|
|
//@ApiModelProperty(value = "风向和风力")
|
|
|
|
private String windDesc;
|
|
|
|
private String windDesc;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "天气趋势开始图片名称(以下称:图标一)")
|
|
|
|
//@ApiModelProperty(value = "天气趋势开始图片名称(以下称:图标一)")
|
|
|
|
private String weatherTrendStart;
|
|
|
|
private String weatherTrendStart;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "天气趋势结束图片名称(以下称:图标二)")
|
|
|
|
//@ApiModelProperty(value = "天气趋势结束图片名称(以下称:图标二)")
|
|
|
|
private String weatherTrendEnd;
|
|
|
|
private String weatherTrendEnd;
|
|
|
|
|
|
|
|
|
|
|
|
//存放长文本
|
|
|
|
//存放长文本
|
|
|
|
//@Lob
|
|
|
|
//@Lob
|
|
|
|
//@Basic(fetch = FetchType.LAZY)
|
|
|
|
//@Basic(fetch = FetchType.LAZY)
|
|
|
|
@ApiModelProperty(value = "现在的天气实况")
|
|
|
|
//@ApiModelProperty(value = "现在的天气实况")
|
|
|
|
@Column(columnDefinition = "text")
|
|
|
|
@Column(columnDefinition = "text")
|
|
|
|
private String weatherRealStatus;
|
|
|
|
private String weatherRealStatus;
|
|
|
|
|
|
|
|
|
|
|
|
//存放长文本
|
|
|
|
//存放长文本
|
|
|
|
//@Lob
|
|
|
|
//@Lob
|
|
|
|
//@Basic(fetch = FetchType.LAZY)
|
|
|
|
//@Basic(fetch = FetchType.LAZY)
|
|
|
|
@ApiModelProperty(value = "天气和生活指数")
|
|
|
|
//@ApiModelProperty(value = "天气和生活指数")
|
|
|
|
@Column(columnDefinition = "text")
|
|
|
|
@Column(columnDefinition = "text")
|
|
|
|
private String weatherLiveIndex;
|
|
|
|
private String weatherLiveIndex;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 20)
|
|
|
|
@Column(length = 20)
|
|
|
|
@ApiModelProperty(value = "第二天的 气温")
|
|
|
|
//@ApiModelProperty(value = "第二天的 气温")
|
|
|
|
private String nextDateTemperature;
|
|
|
|
private String nextDateTemperature;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "第二天的 概况")
|
|
|
|
//@ApiModelProperty(value = "第二天的 概况")
|
|
|
|
private String nextDateWeatherShortDesc;
|
|
|
|
private String nextDateWeatherShortDesc;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "第二天的 风向和风力")
|
|
|
|
//@ApiModelProperty(value = "第二天的 风向和风力")
|
|
|
|
private String nextDateWindDesc;
|
|
|
|
private String nextDateWindDesc;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "第二天的 图标一")
|
|
|
|
//@ApiModelProperty(value = "第二天的 图标一")
|
|
|
|
private String nextDateWeatherTrendStart;
|
|
|
|
private String nextDateWeatherTrendStart;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "第二天的 图标二")
|
|
|
|
//@ApiModelProperty(value = "第二天的 图标二")
|
|
|
|
private String nextDateWeatherTrendEnd;
|
|
|
|
private String nextDateWeatherTrendEnd;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 20)
|
|
|
|
@Column(length = 20)
|
|
|
|
@ApiModelProperty(value = "第三天的 气温")
|
|
|
|
//@ApiModelProperty(value = "第三天的 气温")
|
|
|
|
private String threeDayTemperature;
|
|
|
|
private String threeDayTemperature;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "第三天的 概况")
|
|
|
|
//@ApiModelProperty(value = "第三天的 概况")
|
|
|
|
private String threeWeatherShortDesc;
|
|
|
|
private String threeWeatherShortDesc;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "第三天的 风向和风力")
|
|
|
|
//@ApiModelProperty(value = "第三天的 风向和风力")
|
|
|
|
private String threeDayWindDesc;
|
|
|
|
private String threeDayWindDesc;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "第三天的 图标一")
|
|
|
|
//@ApiModelProperty(value = "第三天的 图标一")
|
|
|
|
private String threeDayWeatherTrendStart;
|
|
|
|
private String threeDayWeatherTrendStart;
|
|
|
|
|
|
|
|
|
|
|
|
@Column(length = 30)
|
|
|
|
@Column(length = 30)
|
|
|
|
@ApiModelProperty(value = "第三天的 图标二")
|
|
|
|
//@ApiModelProperty(value = "第三天的 图标二")
|
|
|
|
private String threeDayWeatherTrendEnd;
|
|
|
|
private String threeDayWeatherTrendEnd;
|
|
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty(value = "被查询的城市或地区的介绍")
|
|
|
|
//@ApiModelProperty(value = "被查询的城市或地区的介绍")
|
|
|
|
//存放长文本
|
|
|
|
//存放长文本
|
|
|
|
// @Lob
|
|
|
|
// @Lob
|
|
|
|
// @Basic(fetch = FetchType.LAZY)
|
|
|
|
// @Basic(fetch = FetchType.LAZY)
|
|
|
|
@Column(columnDefinition = "text")
|
|
|
|
@Column(columnDefinition = "text")
|
|
|
|
private String cityIntroduce;
|
|
|
|
private String cityIntroduce;
|
|
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty(value = "日期")
|
|
|
|
//@ApiModelProperty(value = "日期")
|
|
|
|
@Temporal(TemporalType.TIMESTAMP)
|
|
|
|
@Temporal(TemporalType.TIMESTAMP)
|
|
|
|
@CreatedDate
|
|
|
|
@CreatedDate
|
|
|
|
private Date createDate;
|
|
|
|
private Date createDate;
|
|
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty(value = "时")
|
|
|
|
//@ApiModelProperty(value = "时")
|
|
|
|
@Column(length = 20)
|
|
|
|
@Column(length = 20)
|
|
|
|
private String dataHour;
|
|
|
|
private String dataHour;
|
|
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty(value = "分")
|
|
|
|
//@ApiModelProperty(value = "分")
|
|
|
|
@Column(length = 20)
|
|
|
|
@Column(length = 20)
|
|
|
|
private String dataMinute;
|
|
|
|
private String dataMinute;
|
|
|
|
|
|
|
|
|
|
|
|
@ApiModelProperty(value = "秒")
|
|
|
|
//@ApiModelProperty(value = "秒")
|
|
|
|
@Column(length = 20)
|
|
|
|
@Column(length = 20)
|
|
|
|
private String dataSecond;
|
|
|
|
private String dataSecond;
|
|
|
|
|
|
|
|
|
|
|
|
|