优化

src/main/java/com/xkrs/model/qo/AuditFireTypeQo.java

@@ -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 + '\'' + '}';
-    }
-}

src/main/java/com/xkrs/model/qo/FirePointQo.java

@@ -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 + '\'' + '}';
-    }
-}

src/main/java/com/xkrs/model/qo/GlobalConfigDictQo.java

@@ -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;
-    }
-}

src/main/java/com/xkrs/model/validation/AuditFireTypeQoUpdate.java

@@ -1,4 +0,0 @@
-package com.xkrs.model.validation;
-
-public interface AuditFireTypeQoUpdate {
-}

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 {
 

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,193 +11,16 @@ public class GaoDeWeatherVo {
     private String count;
     private String info;
     private String infocode;
-//    private Live lives;
     private List<Forecast> forecasts;
 
-    public GaoDeWeatherVo() {
+    public static class Forecast {
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getCount() {
-        return count;
-    }
-
-    public void setCount(String count) {
-        this.count = count;
-    }
-
-    public String getInfo() {
-        return info;
-    }
-
-    public void setInfo(String info) {
-        this.info = info;
-    }
-
-    public String getInfocode() {
-        return infocode;
-    }
-
-    public void setInfocode(String infocode) {
-        this.infocode = infocode;
-    }
-
-
-    public List<Forecast> getForecasts() {
-        return forecasts;
-    }
-
-    public void setForecasts(List<Forecast> forecasts) {
-        this.forecasts = forecasts;
-    }
-}
-
-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<Cast> casts;
 
-    public Forecast() {
+        public static class Cast {
-    }
-
-    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<Cast> getCasts() {
-        return casts;
-    }
-
-    public void setCasts(List<Cast> casts) {
-        this.casts = casts;
-    }
-}
-
-class Cast {
             private String date;
             private String week;
             private String dayweather;
@@ -211,9 +32,6 @@ class Cast {
             private String daypower;
             private String nightpower;
 
-    public Cast() {
-    }
-
             public String getDate() {
                 return date;
             }
@@ -294,3 +112,87 @@ class Cast {
                 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<Cast> getCasts() {
+            return casts;
+        }
+
+        public void setCasts(List<Cast> casts) {
+            this.casts = casts;
+        }
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getCount() {
+        return count;
+    }
+
+    public void setCount(String count) {
+        this.count = count;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public String getInfocode() {
+        return infocode;
+    }
+
+    public void setInfocode(String infocode) {
+        this.infocode = infocode;
+    }
+
+    public List<Forecast> getForecasts() {
+        return forecasts;
+    }
+
+    public void setForecasts(List<Forecast> forecasts) {
+        this.forecasts = forecasts;
+    }
+}
+
+