From bb02cd628487d0758820c1e4ab129627905aa366 Mon Sep 17 00:00:00 2001 From: liuchengqian Date: Wed, 8 Mar 2023 11:13:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xkrs/model/qo/AuditFireTypeQo.java | 38 -- .../java/com/xkrs/model/qo/FirePointQo.java | 172 -------- .../com/xkrs/model/qo/GlobalConfigDictQo.java | 46 --- .../validation/AuditFireTypeQoUpdate.java | 4 - .../com/xkrs/model/vo/GaoDeIgGeocodeVo.java | 4 +- .../com/xkrs/model/vo/GaoDeWeatherVo.java | 378 +++++++----------- 6 files changed, 141 insertions(+), 501 deletions(-) delete mode 100644 src/main/java/com/xkrs/model/qo/AuditFireTypeQo.java delete mode 100644 src/main/java/com/xkrs/model/qo/FirePointQo.java delete mode 100644 src/main/java/com/xkrs/model/qo/GlobalConfigDictQo.java delete mode 100644 src/main/java/com/xkrs/model/validation/AuditFireTypeQoUpdate.java diff --git a/src/main/java/com/xkrs/model/qo/AuditFireTypeQo.java b/src/main/java/com/xkrs/model/qo/AuditFireTypeQo.java deleted file mode 100644 index ceabfa5..0000000 --- a/src/main/java/com/xkrs/model/qo/AuditFireTypeQo.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.xkrs.model.qo; - -import com.xkrs.model.validation.AuditFireTypeQoUpdate; - -import javax.validation.constraints.NotNull; - -public class AuditFireTypeQo { - - @NotNull(message = "{FirePoint.fireCode.blank}", groups = {AuditFireTypeQoUpdate.class}) - private String fireCode; - - @NotNull(message = "{FirePoint.auditFireType.blank}", groups = {AuditFireTypeQoUpdate.class}) - private String auditFireType; - - public AuditFireTypeQo() { - } - - public String getFireCode() { - return fireCode; - } - - public void setFireCode(String fireCode) { - this.fireCode = fireCode; - } - - public String getAuditFireType() { - return auditFireType; - } - - public void setAuditFireType(String auditFireType) { - this.auditFireType = auditFireType; - } - - @Override - public String toString() { - return "AuditFireTypeQo{" + "fireCode='" + fireCode + '\'' + ", auditFireType='" + auditFireType + '\'' + '}'; - } -} diff --git a/src/main/java/com/xkrs/model/qo/FirePointQo.java b/src/main/java/com/xkrs/model/qo/FirePointQo.java deleted file mode 100644 index bfff4e7..0000000 --- a/src/main/java/com/xkrs/model/qo/FirePointQo.java +++ /dev/null @@ -1,172 +0,0 @@ -package com.xkrs.model.qo; - -/** - * @author XinYi Song - * 火点参数类 - */ -public class FirePointQo { - - /** - * 火点编码 - */ - private String fireCode; - - /** - * 省市区的编码 - */ - private Integer countyCode; - - /** - * 省市区的名称 - */ - private String countyName; - - /** - * 卫星监测的时间戳 - */ - private Integer satelliteTimeTs; - - /** - * 经度 - */ - private Double longitude; - - /** - * 纬度 - */ - private Double latitude; - - /** - * 卫星类型 - */ - private String satelliteType; - - /** - * 植被类型 - */ - private String landtype; - - /** - * 置信度 - */ - private String confidence; - - /** - * 当前火点的图片 - */ - private String fireImage; - - /** - * 卫星影像图片 - */ - private String satelliteImage; - - /** - * 乡镇街道区划编码 - */ - private String towncode; - - public FirePointQo() { - } - - public String getFireCode() { - return fireCode; - } - - public void setFireCode(String fireCode) { - this.fireCode = fireCode; - } - - public Integer getCountyCode() { - return countyCode; - } - - public void setCountyCode(Integer countyCode) { - this.countyCode = countyCode; - } - - public String getCountyName() { - return countyName; - } - - public void setCountyName(String countyName) { - this.countyName = countyName; - } - - public Integer getSatelliteTimeTs() { - return satelliteTimeTs; - } - - public void setSatelliteTimeTs(Integer satelliteTimeTs) { - this.satelliteTimeTs = satelliteTimeTs; - } - - public Double getLongitude() { - return longitude; - } - - public void setLongitude(Double longitude) { - this.longitude = longitude; - } - - public Double getLatitude() { - return latitude; - } - - public void setLatitude(Double latitude) { - this.latitude = latitude; - } - - public String getSatelliteType() { - return satelliteType; - } - - public void setSatelliteType(String satelliteType) { - this.satelliteType = satelliteType; - } - - public String getLandtype() { - return landtype; - } - - public void setLandtype(String landtype) { - this.landtype = landtype; - } - - public String getConfidence() { - return confidence; - } - - public void setConfidence(String confidence) { - this.confidence = confidence; - } - - public String getFireImage() { - return fireImage; - } - - public void setFireImage(String fireImage) { - this.fireImage = fireImage; - } - - public String getSatelliteImage() { - return satelliteImage; - } - - public void setSatelliteImage(String satelliteImage) { - this.satelliteImage = satelliteImage; - } - - public String getTowncode() { - return towncode; - } - - public void setTowncode(String towncode) { - this.towncode = towncode; - } - - @Override - public String toString() { - return "FirePointQo{" + "fireCode='" + fireCode + '\'' + ", countyCode=" + countyCode + ", countyName='" + countyName + '\'' + ", satelliteTimeTs=" + satelliteTimeTs + ", longitude=" + longitude + ", latitude=" + latitude + ", satelliteType='" + satelliteType + '\'' + ", landtype='" + landtype + '\'' + ", confidence='" + confidence + '\'' + ", fireImage='" + fireImage + '\'' + ", satelliteImage='" + satelliteImage + '\'' + ", towncode='" + towncode + '\'' + '}'; - } -} diff --git a/src/main/java/com/xkrs/model/qo/GlobalConfigDictQo.java b/src/main/java/com/xkrs/model/qo/GlobalConfigDictQo.java deleted file mode 100644 index 778272f..0000000 --- a/src/main/java/com/xkrs/model/qo/GlobalConfigDictQo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.xkrs.model.qo; - -public class GlobalConfigDictQo { - - /** - * 全局配置字典的编码 - */ - private Long code; - - /** - * 全局配置字典的名称 - */ - private String name; - - /** - * 全局配置字典的备注 - */ - private String remark; - - public GlobalConfigDictQo() { - } - - public Long getCode() { - return code; - } - - public void setCode(Long code) { - this.code = code; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } -} diff --git a/src/main/java/com/xkrs/model/validation/AuditFireTypeQoUpdate.java b/src/main/java/com/xkrs/model/validation/AuditFireTypeQoUpdate.java deleted file mode 100644 index 3491edd..0000000 --- a/src/main/java/com/xkrs/model/validation/AuditFireTypeQoUpdate.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.xkrs.model.validation; - -public interface AuditFireTypeQoUpdate { -} diff --git a/src/main/java/com/xkrs/model/vo/GaoDeIgGeocodeVo.java b/src/main/java/com/xkrs/model/vo/GaoDeIgGeocodeVo.java index 38ee1fe..71ebb1c 100644 --- a/src/main/java/com/xkrs/model/vo/GaoDeIgGeocodeVo.java +++ b/src/main/java/com/xkrs/model/vo/GaoDeIgGeocodeVo.java @@ -3,9 +3,7 @@ package com.xkrs.model.vo; import java.util.List; /** - * @author wudong - * @date 2022/5/6 17:38 - * @description + * 高德逆地理类 */ public class GaoDeIgGeocodeVo { diff --git a/src/main/java/com/xkrs/model/vo/GaoDeWeatherVo.java b/src/main/java/com/xkrs/model/vo/GaoDeWeatherVo.java index fa37353..d6d4f73 100644 --- a/src/main/java/com/xkrs/model/vo/GaoDeWeatherVo.java +++ b/src/main/java/com/xkrs/model/vo/GaoDeWeatherVo.java @@ -3,9 +3,7 @@ package com.xkrs.model.vo; import java.util.List; /** - * @author wudong - * @date 2022/5/6 16:42 - * @description 高德天气接受类 + * 高德天气类 */ public class GaoDeWeatherVo { @@ -13,10 +11,147 @@ public class GaoDeWeatherVo { private String count; private String info; private String infocode; -// private Live lives; private List forecasts; - public GaoDeWeatherVo() { + public static class Forecast { + private String city; + private String adcode; + private String province; + private String reporttime; + private List casts; + + public static class Cast { + private String date; + private String week; + private String dayweather; + private String nightweather; + private String daytemp; + private String nighttemp; + private String daywind; + private String nightwind; + private String daypower; + private String nightpower; + + public String getDate() { + return date; + } + + public void setDate(String date) { + this.date = date; + } + + public String getWeek() { + return week; + } + + public void setWeek(String week) { + this.week = week; + } + + public String getDayweather() { + return dayweather; + } + + public void setDayweather(String dayweather) { + this.dayweather = dayweather; + } + + public String getNightweather() { + return nightweather; + } + + public void setNightweather(String nightweather) { + this.nightweather = nightweather; + } + + public String getDaytemp() { + return daytemp; + } + + public void setDaytemp(String daytemp) { + this.daytemp = daytemp; + } + + public String getNighttemp() { + return nighttemp; + } + + public void setNighttemp(String nighttemp) { + this.nighttemp = nighttemp; + } + + public String getDaywind() { + return daywind; + } + + public void setDaywind(String daywind) { + this.daywind = daywind; + } + + public String getNightwind() { + return nightwind; + } + + public void setNightwind(String nightwind) { + this.nightwind = nightwind; + } + + public String getDaypower() { + return daypower; + } + + public void setDaypower(String daypower) { + this.daypower = daypower; + } + + public String getNightpower() { + return nightpower; + } + + public void setNightpower(String nightpower) { + this.nightpower = nightpower; + } + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getAdcode() { + return adcode; + } + + public void setAdcode(String adcode) { + this.adcode = adcode; + } + + public String getProvince() { + return province; + } + + public void setProvince(String province) { + this.province = province; + } + + public String getReporttime() { + return reporttime; + } + + public void setReporttime(String reporttime) { + this.reporttime = reporttime; + } + + public List getCasts() { + return casts; + } + + public void setCasts(List casts) { + this.casts = casts; + } } public String getStatus() { @@ -51,7 +186,6 @@ public class GaoDeWeatherVo { this.infocode = infocode; } - public List getForecasts() { return forecasts; } @@ -61,236 +195,4 @@ public class GaoDeWeatherVo { } } -class Live { - private String province; - private String city; - private String adcode; - private String weather; - private String temperature; - private String winddirection; - private String windpower; - private String humidity; - private String reporttime; - public Live() { - } - - public String getProvince() { - return province; - } - - public void setProvince(String province) { - this.province = province; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getAdcode() { - return adcode; - } - - public void setAdcode(String adcode) { - this.adcode = adcode; - } - - public String getWeather() { - return weather; - } - - public void setWeather(String weather) { - this.weather = weather; - } - - public String getTemperature() { - return temperature; - } - - public void setTemperature(String temperature) { - this.temperature = temperature; - } - - public String getWinddirection() { - return winddirection; - } - - public void setWinddirection(String winddirection) { - this.winddirection = winddirection; - } - - public String getWindpower() { - return windpower; - } - - public void setWindpower(String windpower) { - this.windpower = windpower; - } - - public String getHumidity() { - return humidity; - } - - public void setHumidity(String humidity) { - this.humidity = humidity; - } - - public String getReporttime() { - return reporttime; - } - - public void setReporttime(String reporttime) { - this.reporttime = reporttime; - } -} - -class Forecast { - private String city; - private String adcode; - private String province; - private String reporttime; - private List casts; - - public Forecast() { - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getAdcode() { - return adcode; - } - - public void setAdcode(String adcode) { - this.adcode = adcode; - } - - public String getProvince() { - return province; - } - - public void setProvince(String province) { - this.province = province; - } - - public String getReporttime() { - return reporttime; - } - - public void setReporttime(String reporttime) { - this.reporttime = reporttime; - } - - public List getCasts() { - return casts; - } - - public void setCasts(List casts) { - this.casts = casts; - } -} - -class Cast { - private String date; - private String week; - private String dayweather; - private String nightweather; - private String daytemp; - private String nighttemp; - private String daywind; - private String nightwind ; - private String daypower ; - private String nightpower ; - - public Cast() { - } - - public String getDate() { - return date; - } - - public void setDate(String date) { - this.date = date; - } - - public String getWeek() { - return week; - } - - public void setWeek(String week) { - this.week = week; - } - - public String getDayweather() { - return dayweather; - } - - public void setDayweather(String dayweather) { - this.dayweather = dayweather; - } - - public String getNightweather() { - return nightweather; - } - - public void setNightweather(String nightweather) { - this.nightweather = nightweather; - } - - public String getDaytemp() { - return daytemp; - } - - public void setDaytemp(String daytemp) { - this.daytemp = daytemp; - } - - public String getNighttemp() { - return nighttemp; - } - - public void setNighttemp(String nighttemp) { - this.nighttemp = nighttemp; - } - - public String getDaywind() { - return daywind; - } - - public void setDaywind(String daywind) { - this.daywind = daywind; - } - - public String getNightwind() { - return nightwind; - } - - public void setNightwind(String nightwind) { - this.nightwind = nightwind; - } - - public String getDaypower() { - return daypower; - } - - public void setDaypower(String daypower) { - this.daypower = daypower; - } - - public String getNightpower() { - return nightpower; - } - - public void setNightpower(String nightpower) { - this.nightpower = nightpower; - } -} \ No newline at end of file