为基础接口添加name属性

src/main/java/com/gis/xian/vo/XianDangerousSourceBasePointVo.java

@@ -17,7 +17,10 @@ public class XianDangerousSourceBasePointVo {
      * id
      */
     private Long id;
-
+    /**
+     * 企业名称
+     */
+    private String name;
     /**
      * 经度
      */
@@ -31,6 +34,7 @@ public class XianDangerousSourceBasePointVo {
     public static XianDangerousSourceBasePointVo entity2Vo(XianDangerousSource entity) {
         XianDangerousSourceBasePointVo vo = new XianDangerousSourceBasePointVo();
         vo.setId(entity.getId());
+        vo.setName(entity.getName());
         vo.setLon(entity.getLon() != null ? entity.getLon().doubleValue() : null);
         vo.setLat(entity.getLat() != null ? entity.getLat().doubleValue() : null);
         return vo;
@@ -49,11 +53,11 @@ public class XianDangerousSourceBasePointVo {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         XianDangerousSourceBasePointVo that = (XianDangerousSourceBasePointVo) o;
-        return Objects.equals(id, that.id) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
+        return Objects.equals(id, that.id) && Objects.equals(name, that.name) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, lon, lat);
+        return Objects.hash(id, name, lon, lat);
     }
 }

src/main/java/com/gis/xian/vo/XianEmergencyShelterBasePointVo.java

@@ -17,6 +17,11 @@ public class XianEmergencyShelterBasePointVo {
      * id
      */
     private Long id;
+    /**
+     * 避难所名字
+     */
+    private String name;
+
 
     /**
      * 经度
@@ -31,6 +36,7 @@ public class XianEmergencyShelterBasePointVo {
     public static XianEmergencyShelterBasePointVo entity2Vo(XianEmergencyShelter entity) {
         XianEmergencyShelterBasePointVo vo = new XianEmergencyShelterBasePointVo();
         vo.setId(entity.getId());
+        vo.setName(entity.getName());
         vo.setLon(entity.getLon() != null ? entity.getLon().doubleValue() : null);
         vo.setLat(entity.getLat() != null ? entity.getLat().doubleValue() : null);
         return vo;
@@ -49,11 +55,11 @@ public class XianEmergencyShelterBasePointVo {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         XianEmergencyShelterBasePointVo that = (XianEmergencyShelterBasePointVo) o;
-        return Objects.equals(id, that.id) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
+        return Objects.equals(id, that.id) && Objects.equals(name, that.name) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, lon, lat);
+        return Objects.hash(id, name, lon, lat);
     }
 }

src/main/java/com/gis/xian/vo/XianFirefighterBasePointVo.java

@@ -17,6 +17,11 @@ public class XianFirefighterBasePointVo {
      * id
      */
     private Long id;
+    /**
+     * 队伍名称
+     */
+    private String teamName;
+
 
     /**
      * 经度
@@ -31,6 +36,7 @@ public class XianFirefighterBasePointVo {
     public static XianFirefighterBasePointVo entity2Vo(XianFirefighter entity) {
         XianFirefighterBasePointVo vo = new XianFirefighterBasePointVo();
         vo.setId(entity.getId());
+        vo.setTeamName(entity.getTeamName());
         vo.setLon(entity.getLon() != null ? entity.getLon().doubleValue() : null);
         vo.setLat(entity.getLat() != null ? entity.getLat().doubleValue() : null);
         return vo;
@@ -49,11 +55,11 @@ public class XianFirefighterBasePointVo {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         XianFirefighterBasePointVo that = (XianFirefighterBasePointVo) o;
-        return Objects.equals(id, that.id) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
+        return Objects.equals(id, that.id) && Objects.equals(teamName, that.teamName) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, lon, lat);
+        return Objects.hash(id, teamName,lon, lat);
     }
 }

src/main/java/com/gis/xian/vo/XianHiddenDangerSpotsBasePointVo.java

@@ -18,6 +18,10 @@ public class XianHiddenDangerSpotsBasePointVo {
      */
     private Long id;
 
+    /**
+     * 灾害点名称
+     */
+    private String disasterName;
     /**
      * 经度
      */
@@ -31,6 +35,7 @@ public class XianHiddenDangerSpotsBasePointVo {
     public static XianHiddenDangerSpotsBasePointVo entity2Vo(XianHiddenDangerSpots entity) {
         XianHiddenDangerSpotsBasePointVo vo = new XianHiddenDangerSpotsBasePointVo();
         vo.setId(entity.getId());
+        vo.setDisasterName(entity.getDisasterName());
         vo.setLon(entity.getLon());
         vo.setLat(entity.getLat());
         vo.setDisasterType(entity.getDisasterType());
@@ -55,11 +60,11 @@ public class XianHiddenDangerSpotsBasePointVo {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         XianHiddenDangerSpotsBasePointVo that = (XianHiddenDangerSpotsBasePointVo) o;
-        return Objects.equals(id, that.id) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat) && Objects.equals(disasterType, that.disasterType);
+        return Objects.equals(id, that.id) && Objects.equals(disasterName, that.disasterName) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat) && Objects.equals(disasterType, that.disasterType);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, lon, lat, disasterType);
+        return Objects.hash(id, disasterName, lon, lat, disasterType);
     }
 }

src/main/java/com/gis/xian/vo/XianHospitalsBasePointVo.java

@@ -17,7 +17,10 @@ public class XianHospitalsBasePointVo {
      * id
      */
     private Long id;
-
+    /**
+     * 医院名称
+     */
+    private String name;
     /**
      * 经度
      */
@@ -31,6 +34,7 @@ public class XianHospitalsBasePointVo {
     public static XianHospitalsBasePointVo entity2Vo(XianHospitals entity) {
         XianHospitalsBasePointVo vo = new XianHospitalsBasePointVo();
         vo.setId(entity.getId());
+        vo.setName(entity.getName());
         vo.setLon(entity.getLon() != null ? entity.getLon().doubleValue() : null);
         vo.setLat(entity.getLat() != null ? entity.getLat().doubleValue() : null);
         return vo;
@@ -49,11 +53,11 @@ public class XianHospitalsBasePointVo {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         XianHospitalsBasePointVo that = (XianHospitalsBasePointVo) o;
-        return Objects.equals(id, that.id) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
+        return Objects.equals(id, that.id) && Objects.equals(name, that.name) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, lon, lat);
+        return Objects.hash(id,  name, lon, lat);
     }
 }

src/main/java/com/gis/xian/vo/XianRiskSpotsBasePointVo.java

@@ -14,6 +14,11 @@ public class XianRiskSpotsBasePointVo {
      */
     private Long id;
 
+    /**
+     * 风险点名称
+     */
+    private String riskName;
+
     /**
      * 经度
      */
@@ -27,6 +32,7 @@ public class XianRiskSpotsBasePointVo {
     public static XianRiskSpotsBasePointVo entity2Vo(XianRiskSpots entity) {
         XianRiskSpotsBasePointVo vo = new XianRiskSpotsBasePointVo();
         vo.setId(entity.getId());
+        vo.setRiskName(entity.getRiskName());
         vo.setLon(entity.getLon());
         vo.setLat(entity.getLat());
         return vo;
@@ -45,11 +51,11 @@ public class XianRiskSpotsBasePointVo {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         XianRiskSpotsBasePointVo that = (XianRiskSpotsBasePointVo) o;
-        return Objects.equals(id, that.id) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
+        return Objects.equals(id, that.id) && Objects.equals(riskName, that.riskName) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, lon, lat);
+        return Objects.hash(id, riskName, lon, lat);
     }
 }

src/main/java/com/gis/xian/vo/XianSchoolBasePointVo.java

@@ -18,6 +18,11 @@ public class XianSchoolBasePointVo {
      */
     private Long id;
 
+    /**
+     * 学校名称
+     */
+    private String schoolName;
+
     /**
      * 经度
      */
@@ -31,6 +36,7 @@ public class XianSchoolBasePointVo {
     public static XianSchoolBasePointVo entity2Vo(XianSchool entity) {
         XianSchoolBasePointVo vo = new XianSchoolBasePointVo();
         vo.setId(entity.getId());
+        vo.setSchoolName(entity.getSchoolName());
         vo.setLon(entity.getLon());
         vo.setLat(entity.getLat());
         return vo;
@@ -49,11 +55,11 @@ public class XianSchoolBasePointVo {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         XianSchoolBasePointVo that = (XianSchoolBasePointVo) o;
-        return Objects.equals(id, that.id) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
+        return Objects.equals(id, that.id) && Objects.equals(schoolName, that.schoolName) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, lon, lat);
+        return Objects.hash(id, schoolName, lon, lat);
     }
 }

src/main/java/com/gis/xian/vo/XianStorePointsBasePointVo.java

@@ -17,7 +17,10 @@ public class XianStorePointsBasePointVo {
      * id
      */
     private Long id;
-
+    /**
+     * 储备库名称
+     */
+    private String name;
     /**
      * 经度
      */
@@ -31,6 +34,7 @@ public class XianStorePointsBasePointVo {
     public static XianStorePointsBasePointVo entity2Vo(XianStorePoints entity) {
         XianStorePointsBasePointVo vo = new XianStorePointsBasePointVo();
         vo.setId(entity.getId());
+        vo.setName(entity.getName());
         vo.setLon(entity.getLon() != null ? entity.getLon().doubleValue() : null);
         vo.setLat(entity.getLat() != null ? entity.getLat().doubleValue() : null);
         return vo;
@@ -49,11 +53,11 @@ public class XianStorePointsBasePointVo {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         XianStorePointsBasePointVo that = (XianStorePointsBasePointVo) o;
-        return Objects.equals(id, that.id) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
+        return Objects.equals(id, that.id) && Objects.equals(name, that.name) && Objects.equals(lon, that.lon) && Objects.equals(lat, that.lat);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, lon, lat);
+        return Objects.hash(id, name, lon, lat);
     }
 }

src/main/resources/com/gis/xian/mapper/XianDangerousSourceMapper.xml

@@ -49,7 +49,7 @@
 
     <!-- 获取所有危险源基础点 -->
     <select id="getBasePoints" resultMap="BaseResultMap">
-        SELECT id, lon, lat FROM xian_dangerous_source
+        SELECT id, name, lon, lat FROM xian_dangerous_source
         <where>
             is_delete = 0
         </where>

src/main/resources/com/gis/xian/mapper/XianEmergencyShelterMapper.xml

@@ -23,7 +23,7 @@
 
     <!-- 获取所有应急避难所基础点 -->
     <select id="getBasePoints" resultMap="BaseResultMap">
-        SELECT id, lon, lat FROM xian_emergency_shelter
+        SELECT id, name, lon, lat FROM xian_emergency_shelter
         <where>
             is_delete = 0
         </where>

src/main/resources/com/gis/xian/mapper/XianFirefighterMapper.xml

@@ -65,7 +65,7 @@
 
     <!-- 获取所有消防站基础点 -->
     <select id="getBasePoints" resultMap="BaseResultMap">
-        SELECT id, lon, lat FROM xian_firefighter
+        SELECT id, team_name, lon, lat FROM xian_firefighter
         <where>
             is_delete = 0
         </where>

src/main/resources/com/gis/xian/mapper/XianHiddenDangerSpotsMapper.xml

@@ -27,7 +27,7 @@
 
     <!-- 获取所有基础点：滑坡、泥石流、山洪、内涝 -->
     <select id="getBasePoints" resultMap="XianHiddenDangerSpotsResultMap">
-        SELECT id, lon, lat, disaster_type FROM xian_hidden_danger_spots
+        SELECT id, disaster_name, lon, lat, disaster_type FROM xian_hidden_danger_spots
         <where>
             <choose>
                 <when test='disasterType == "rainstorm"'>

src/main/resources/com/gis/xian/mapper/XianHospitalsMapper.xml

@@ -72,7 +72,7 @@
 
     <!-- 获取所有医院基础点 -->
     <select id="getBasePoints" resultMap="BaseResultMap">
-        SELECT id, lon, lat FROM xian_hospitals
+        SELECT id, name, lon, lat FROM xian_hospitals
         <where>
             is_delete = 0
         </where>

src/main/resources/com/gis/xian/mapper/XianRiskSpotsMapper.xml

@@ -31,7 +31,7 @@
 
     <!-- 获取所有风险点基础信息 -->
     <select id="getBasePoints" resultMap="XianRiskSpotsResultMap">
-        SELECT id, lon, lat FROM xian_risk_spots
+        SELECT id, risk_name, lon, lat FROM xian_risk_spots
         <where>
             is_delete = 0
         </where>

src/main/resources/com/gis/xian/mapper/XianSchoolMapper.xml

@@ -57,7 +57,7 @@
 
     <!-- 获取所有学校基础点 -->
     <select id="getBasePoints" resultMap="BaseResultMap">
-        SELECT id, lon, lat FROM xian_school
+        SELECT id, school_name, lon, lat FROM xian_school
         <where>
             is_delete = 0
         </where>

src/main/resources/com/gis/xian/mapper/XianStorePointsMapper.xml

@@ -59,7 +59,7 @@
 
     <!-- 获取所有物资储备点基础点 -->
     <select id="getBasePoints" resultMap="BaseResultMap">
-        SELECT id, lon, lat FROM xian_store_points
+        SELECT id, name, lon, lat FROM xian_store_points
         <where>
             is_delete = 0
         </where>