优化

src/main/java/com/xkrs/straw/model/entity/FirePointOrdinaryEntity.java

@@ -88,6 +88,12 @@ public class FirePointOrdinaryEntity implements Serializable {
     @Column(length = 1024, columnDefinition = "varchar(1024)")
     private String remark;
 
+    /**
+     * 占位符
+     */
+    @Column(length = 1024, columnDefinition = "varchar(1024)")
+    private String placeHolder;
+
     /**
      * 省的编码
      */
@@ -243,6 +249,14 @@ public class FirePointOrdinaryEntity implements Serializable {
         this.remark = remark;
     }
 
+    public String getPlaceHolder() {
+        return placeHolder;
+    }
+
+    public void setPlaceHolder(String placeHolder) {
+        this.placeHolder = placeHolder;
+    }
+
     public String getProCode() {
         return proCode;
     }
@@ -323,6 +337,7 @@ public class FirePointOrdinaryEntity implements Serializable {
                 ", addTime='" + addTime + '\'' +
                 ", firePointAddress='" + firePointAddress + '\'' +
                 ", remark='" + remark + '\'' +
+                ", placeHolder='" + placeHolder + '\'' +
                 ", proCode='" + proCode + '\'' +
                 ", proName='" + proName + '\'' +
                 ", cityCode='" + cityCode + '\'' +

src/main/java/com/xkrs/straw/model/entity/FirePointPreciseEntity.java

@@ -88,6 +88,12 @@ public class FirePointPreciseEntity implements Serializable {
     @Column(length = 1024, columnDefinition = "varchar(1024)")
     private String remark;
 
+    /**
+     * 占位符
+     */
+    @Column(length = 1024, columnDefinition = "varchar(1024)")
+    private String placeHolder;
+
     /**
      * 省的编码
      */
@@ -243,6 +249,14 @@ public class FirePointPreciseEntity implements Serializable {
         this.remark = remark;
     }
 
+    public String getPlaceHolder() {
+        return placeHolder;
+    }
+
+    public void setPlaceHolder(String placeHolder) {
+        this.placeHolder = placeHolder;
+    }
+
     public String getProCode() {
         return proCode;
     }
@@ -323,6 +337,7 @@ public class FirePointPreciseEntity implements Serializable {
                 ", addTime='" + addTime + '\'' +
                 ", firePointAddress='" + firePointAddress + '\'' +
                 ", remark='" + remark + '\'' +
+                ", placeHolder='" + placeHolder + '\'' +
                 ", proCode='" + proCode + '\'' +
                 ", proName='" + proName + '\'' +
                 ", cityCode='" + cityCode + '\'' +

src/main/java/com/xkrs/straw/model/qo/AllFirePointQo.java

@@ -6,46 +6,57 @@ public class AllFirePointQo {
      * 火点编码
      */
     private String fireCode;
+
     /**
      * 省市区的编码
      */
     private Long countyCode;
+
     /**
      * 省市区的名称
      */
     private String countyName;
+
     /**
      * 卫星监测的时间戳
      */
     private Long satelliteTimeTs;
+
     /**
      * 经度
      */
     private Double longitude;
+
     /**
      * 纬度
      */
     private Double latitude;
+
     /**
      * 卫星类型
      */
     private String satelliteType;
+
     /**
      * 植被类型
      */
     private String landType;
+
     /**
      * 置信度
      */
     private String confidence;
+
     /**
      * 当前火点的图片
      */
     private String fireImage;
+
     /**
      * 卫星影像图片
      */
     private String satelliteImage;
+
     /**
      * 乡镇街道的编码
      */

src/main/java/com/xkrs/straw/model/vo/AllFirePointVo.java

@@ -12,16 +12,6 @@ public class AllFirePointVo {
      */
     private String fireCode;
 
-    /**
-     * 省市区的编码
-     */
-    private String countyCode;
-
-    /**
-     * 省市区的名称
-     */
-    private String countyName;
-
     /**
      * 卫星监测的时间
      */
@@ -62,16 +52,6 @@ public class AllFirePointVo {
      */
     private String satelliteImage;
 
-    /**
-     * 乡镇街道的编码
-     */
-    private String townCode;
-
-    /**
-     * 乡镇街道的名字
-     */
-    private String townName;
-
     /**
      * 添加的时间
      */
@@ -87,6 +67,51 @@ public class AllFirePointVo {
      */
     private String remark;
 
+    /**
+     * 占位符
+     */
+    private String placeHolder;
+
+    /**
+     * 省的编码
+     */
+    private String proCode;
+
+    /**
+     * 省的名称
+     */
+    private String proName;
+
+    /**
+     * 市的编码
+     */
+    private String cityCode;
+
+    /**
+     * 市的名称
+     */
+    private String cityName;
+
+    /**
+     * 区县的编码
+     */
+    private String countyCode;
+
+    /**
+     * 区县的名称
+     */
+    private String countyName;
+
+    /**
+     * 乡镇街道的编码
+     */
+    private String townCode;
+
+    /**
+     * 乡镇街道的名称
+     */
+    private String townName;
+
     public AllFirePointVo() {
     }
 
@@ -106,22 +131,6 @@ public class AllFirePointVo {
         this.fireCode = fireCode;
     }
 
-    public String getCountyCode() {
-        return countyCode;
-    }
-
-    public void setCountyCode(String countyCode) {
-        this.countyCode = countyCode;
-    }
-
-    public String getCountyName() {
-        return countyName;
-    }
-
-    public void setCountyName(String countyName) {
-        this.countyName = countyName;
-    }
-
     public String getSatelliteTime() {
         return satelliteTime;
     }
@@ -186,22 +195,6 @@ public class AllFirePointVo {
         this.satelliteImage = satelliteImage;
     }
 
-    public String getTownCode() {
-        return townCode;
-    }
-
-    public void setTownCode(String townCode) {
-        this.townCode = townCode;
-    }
-
-    public String getTownName() {
-        return townName;
-    }
-
-    public void setTownName(String townName) {
-        this.townName = townName;
-    }
-
     public String getAddTime() {
         return addTime;
     }
@@ -226,13 +219,83 @@ public class AllFirePointVo {
         this.remark = remark;
     }
 
+    public String getPlaceHolder() {
+        return placeHolder;
+    }
+
+    public void setPlaceHolder(String placeHolder) {
+        this.placeHolder = placeHolder;
+    }
+
+    public String getProCode() {
+        return proCode;
+    }
+
+    public void setProCode(String proCode) {
+        this.proCode = proCode;
+    }
+
+    public String getProName() {
+        return proName;
+    }
+
+    public void setProName(String proName) {
+        this.proName = proName;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public String getCountyCode() {
+        return countyCode;
+    }
+
+    public void setCountyCode(String countyCode) {
+        this.countyCode = countyCode;
+    }
+
+    public String getCountyName() {
+        return countyName;
+    }
+
+    public void setCountyName(String countyName) {
+        this.countyName = countyName;
+    }
+
+    public String getTownCode() {
+        return townCode;
+    }
+
+    public void setTownCode(String townCode) {
+        this.townCode = townCode;
+    }
+
+    public String getTownName() {
+        return townName;
+    }
+
+    public void setTownName(String townName) {
+        this.townName = townName;
+    }
+
     @Override
     public String toString() {
         return "AllFirePointVo{" +
                 "id=" + id +
                 ", fireCode='" + fireCode + '\'' +
-                ", countyCode='" + countyCode + '\'' +
-                ", countyName='" + countyName + '\'' +
                 ", satelliteTime='" + satelliteTime + '\'' +
                 ", longitude=" + longitude +
                 ", latitude=" + latitude +
@@ -241,11 +304,18 @@ public class AllFirePointVo {
                 ", confidence='" + confidence + '\'' +
                 ", fireImage='" + fireImage + '\'' +
                 ", satelliteImage='" + satelliteImage + '\'' +
-                ", townCode='" + townCode + '\'' +
-                ", townName='" + townName + '\'' +
                 ", addTime='" + addTime + '\'' +
                 ", firePointAddress='" + firePointAddress + '\'' +
                 ", remark='" + remark + '\'' +
+                ", placeHolder='" + placeHolder + '\'' +
+                ", proCode='" + proCode + '\'' +
+                ", proName='" + proName + '\'' +
+                ", cityCode='" + cityCode + '\'' +
+                ", cityName='" + cityName + '\'' +
+                ", countyCode='" + countyCode + '\'' +
+                ", countyName='" + countyName + '\'' +
+                ", townCode='" + townCode + '\'' +
+                ", townName='" + townName + '\'' +
                 '}';
     }
 }