From 06acc1588a1c7610fb55bfade536b669718360b4 Mon Sep 17 00:00:00 2001
From: liuchengqian <liuchengqian666@gmail.com>
Date: Mon, 6 Mar 2023 11:34:47 +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

---
 .../model/entity/FirePointOrdinaryEntity.java | 182 ++++++++++++------
 .../model/entity/FirePointPreciseEntity.java  | 182 ++++++++++++------
 2 files changed, 242 insertions(+), 122 deletions(-)

diff --git a/src/main/java/com/xkrs/straw/model/entity/FirePointOrdinaryEntity.java b/src/main/java/com/xkrs/straw/model/entity/FirePointOrdinaryEntity.java
index 6660d9d..5d95b36 100644
--- a/src/main/java/com/xkrs/straw/model/entity/FirePointOrdinaryEntity.java
+++ b/src/main/java/com/xkrs/straw/model/entity/FirePointOrdinaryEntity.java
@@ -21,21 +21,9 @@ public class FirePointOrdinaryEntity implements Serializable {
     /**
      * 火点编码
      */
-    @Column(length = 32, unique = true, columnDefinition = "varchar(32)")
+    @Column(length = 64, unique = true, columnDefinition = "varchar(64)")
     private String fireCode;
 
-    /**
-     * 省市区的编码
-     */
-    @Column(length = 32, columnDefinition = "varchar(32)")
-    private String countyCode;
-
-    /**
-     * 省市区的名称
-     */
-    @Column(length = 64, columnDefinition = "varchar(64)")
-    private String countyName;
-
     /**
      * 卫星监测的时间
      */
@@ -82,18 +70,6 @@ public class FirePointOrdinaryEntity implements Serializable {
     @Column(length = 512, columnDefinition = "varchar(512)")
     private String satelliteImage;
 
-    /**
-     * 乡镇街道的编码
-     */
-    @Column(length = 64, columnDefinition = "varchar(64)")
-    private String townCode;
-
-    /**
-     * 乡镇街道的名字
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String townName;
-
     /**
      * 添加的时间
      */
@@ -112,6 +88,54 @@ public class FirePointOrdinaryEntity implements Serializable {
     @Column(length = 1024, columnDefinition = "varchar(1024)")
     private String remark;
 
+    /**
+     * 省的编码
+     */
+    @Column(length = 64, columnDefinition = "varchar(64)")
+    private String proCode;
+
+    /**
+     * 省的名称
+     */
+    @Column(length = 128, columnDefinition = "varchar(128)")
+    private String proName;
+
+    /**
+     * 市的编码
+     */
+    @Column(length = 64, columnDefinition = "varchar(64)")
+    private String cityCode;
+
+    /**
+     * 市的名称
+     */
+    @Column(length = 128, columnDefinition = "varchar(128)")
+    private String cityName;
+
+    /**
+     * 区县的编码
+     */
+    @Column(length = 64, columnDefinition = "varchar(64)")
+    private String countyCode;
+
+    /**
+     * 区县的名称
+     */
+    @Column(length = 128, columnDefinition = "varchar(128)")
+    private String countyName;
+
+    /**
+     * 乡镇街道的编码
+     */
+    @Column(length = 64, columnDefinition = "varchar(64)")
+    private String townCode;
+
+    /**
+     * 乡镇街道的名称
+     */
+    @Column(length = 128, columnDefinition = "varchar(128)")
+    private String townName;
+
     public FirePointOrdinaryEntity() {
     }
 
@@ -131,22 +155,6 @@ public class FirePointOrdinaryEntity implements Serializable {
         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;
     }
@@ -211,22 +219,6 @@ public class FirePointOrdinaryEntity implements Serializable {
         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;
     }
@@ -251,13 +243,75 @@ public class FirePointOrdinaryEntity implements Serializable {
         this.remark = remark;
     }
 
+    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 "FirePointOrdinaryEntity{" +
                 "id=" + id +
                 ", fireCode='" + fireCode + '\'' +
-                ", countyCode='" + countyCode + '\'' +
-                ", countyName='" + countyName + '\'' +
                 ", satelliteTime='" + satelliteTime + '\'' +
                 ", longitude=" + longitude +
                 ", latitude=" + latitude +
@@ -266,11 +320,17 @@ public class FirePointOrdinaryEntity implements Serializable {
                 ", confidence='" + confidence + '\'' +
                 ", fireImage='" + fireImage + '\'' +
                 ", satelliteImage='" + satelliteImage + '\'' +
-                ", townCode='" + townCode + '\'' +
-                ", townName='" + townName + '\'' +
                 ", addTime='" + addTime + '\'' +
                 ", firePointAddress='" + firePointAddress + '\'' +
                 ", remark='" + remark + '\'' +
+                ", proCode='" + proCode + '\'' +
+                ", proName='" + proName + '\'' +
+                ", cityCode='" + cityCode + '\'' +
+                ", cityName='" + cityName + '\'' +
+                ", countyCode='" + countyCode + '\'' +
+                ", countyName='" + countyName + '\'' +
+                ", townCode='" + townCode + '\'' +
+                ", townName='" + townName + '\'' +
                 '}';
     }
 }
diff --git a/src/main/java/com/xkrs/straw/model/entity/FirePointPreciseEntity.java b/src/main/java/com/xkrs/straw/model/entity/FirePointPreciseEntity.java
index 95ebe03..db2fd05 100644
--- a/src/main/java/com/xkrs/straw/model/entity/FirePointPreciseEntity.java
+++ b/src/main/java/com/xkrs/straw/model/entity/FirePointPreciseEntity.java
@@ -21,21 +21,9 @@ public class FirePointPreciseEntity implements Serializable {
     /**
      * 火点编码
      */
-    @Column(length = 32, unique = true, columnDefinition = "varchar(32)")
+    @Column(length = 64, unique = true, columnDefinition = "varchar(64)")
     private String fireCode;
 
-    /**
-     * 省市区的编码
-     */
-    @Column(length = 32, columnDefinition = "varchar(32)")
-    private String countyCode;
-
-    /**
-     * 省市区的名称
-     */
-    @Column(length = 64, columnDefinition = "varchar(64)")
-    private String countyName;
-
     /**
      * 卫星监测的时间
      */
@@ -82,18 +70,6 @@ public class FirePointPreciseEntity implements Serializable {
     @Column(length = 512, columnDefinition = "varchar(512)")
     private String satelliteImage;
 
-    /**
-     * 乡镇街道的编码
-     */
-    @Column(length = 64, columnDefinition = "varchar(64)")
-    private String townCode;
-
-    /**
-     * 乡镇街道的名字
-     */
-    @Column(length = 85, columnDefinition = "varchar(85)")
-    private String townName;
-
     /**
      * 添加的时间
      */
@@ -112,6 +88,54 @@ public class FirePointPreciseEntity implements Serializable {
     @Column(length = 1024, columnDefinition = "varchar(1024)")
     private String remark;
 
+    /**
+     * 省的编码
+     */
+    @Column(length = 64, columnDefinition = "varchar(64)")
+    private String proCode;
+
+    /**
+     * 省的名称
+     */
+    @Column(length = 128, columnDefinition = "varchar(128)")
+    private String proName;
+
+    /**
+     * 市的编码
+     */
+    @Column(length = 64, columnDefinition = "varchar(64)")
+    private String cityCode;
+
+    /**
+     * 市的名称
+     */
+    @Column(length = 128, columnDefinition = "varchar(128)")
+    private String cityName;
+
+    /**
+     * 区县的编码
+     */
+    @Column(length = 64, columnDefinition = "varchar(64)")
+    private String countyCode;
+
+    /**
+     * 区县的名称
+     */
+    @Column(length = 128, columnDefinition = "varchar(128)")
+    private String countyName;
+
+    /**
+     * 乡镇街道的编码
+     */
+    @Column(length = 64, columnDefinition = "varchar(64)")
+    private String townCode;
+
+    /**
+     * 乡镇街道的名称
+     */
+    @Column(length = 128, columnDefinition = "varchar(128)")
+    private String townName;
+
     public FirePointPreciseEntity() {
     }
 
@@ -131,22 +155,6 @@ public class FirePointPreciseEntity implements Serializable {
         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;
     }
@@ -211,22 +219,6 @@ public class FirePointPreciseEntity implements Serializable {
         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;
     }
@@ -251,13 +243,75 @@ public class FirePointPreciseEntity implements Serializable {
         this.remark = remark;
     }
 
+    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 "FirePointPreciseEntity{" +
                 "id=" + id +
                 ", fireCode='" + fireCode + '\'' +
-                ", countyCode='" + countyCode + '\'' +
-                ", countyName='" + countyName + '\'' +
                 ", satelliteTime='" + satelliteTime + '\'' +
                 ", longitude=" + longitude +
                 ", latitude=" + latitude +
@@ -266,11 +320,17 @@ public class FirePointPreciseEntity implements Serializable {
                 ", confidence='" + confidence + '\'' +
                 ", fireImage='" + fireImage + '\'' +
                 ", satelliteImage='" + satelliteImage + '\'' +
-                ", townCode='" + townCode + '\'' +
-                ", townName='" + townName + '\'' +
                 ", addTime='" + addTime + '\'' +
                 ", firePointAddress='" + firePointAddress + '\'' +
                 ", remark='" + remark + '\'' +
+                ", proCode='" + proCode + '\'' +
+                ", proName='" + proName + '\'' +
+                ", cityCode='" + cityCode + '\'' +
+                ", cityName='" + cityName + '\'' +
+                ", countyCode='" + countyCode + '\'' +
+                ", countyName='" + countyName + '\'' +
+                ", townCode='" + townCode + '\'' +
+                ", townName='" + townName + '\'' +
                 '}';
     }
 }