From 3c6b716007bc1b91aec380d7d42b2e1ae47c0adc Mon Sep 17 00:00:00 2001 From: wzy-warehouse <18135009705@163.com> Date: Fri, 12 Jun 2026 10:08:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/gis/xian/entity/XianBridge.java | 8 ++++---- .../java/com/gis/xian/entity/XianDangerousSource.java | 8 ++++---- .../java/com/gis/xian/entity/XianEmergencyShelter.java | 8 ++++---- src/main/java/com/gis/xian/entity/XianFirefighter.java | 8 ++++---- src/main/java/com/gis/xian/entity/XianHospitals.java | 8 ++++---- src/main/java/com/gis/xian/entity/XianStorePoints.java | 8 ++++---- src/main/java/com/gis/xian/entity/XianSubwayStations.java | 8 ++++---- .../com/gis/xian/mapper/XianReservoirListMapper.xml | 8 ++++---- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/gis/xian/entity/XianBridge.java b/src/main/java/com/gis/xian/entity/XianBridge.java index 18dc18b..4374839 100644 --- a/src/main/java/com/gis/xian/entity/XianBridge.java +++ b/src/main/java/com/gis/xian/entity/XianBridge.java @@ -86,7 +86,7 @@ public class XianBridge { /** * 位置 */ - private Object point; + private Object geom; /** * 逻辑删除标识,0未删除,1已删除 @@ -120,7 +120,7 @@ public class XianBridge { && (this.getMaster() == null ? other.getMaster() == null : this.getMaster().equals(other.getMaster())) && (this.getMaint() == null ? other.getMaint() == null : this.getMaint().equals(other.getMaint())) && (this.getNote() == null ? other.getNote() == null : this.getNote().equals(other.getNote())) - && (this.getPoint() == null ? other.getPoint() == null : this.getPoint().equals(other.getPoint())) + && (this.getGeom() == null ? other.getGeom() == null : this.getGeom().equals(other.getGeom())) && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete())); } @@ -143,7 +143,7 @@ public class XianBridge { result = prime * result + ((getMaster() == null) ? 0 : getMaster().hashCode()); result = prime * result + ((getMaint() == null) ? 0 : getMaint().hashCode()); result = prime * result + ((getNote() == null) ? 0 : getNote().hashCode()); - result = prime * result + ((getPoint() == null) ? 0 : getPoint().hashCode()); + result = prime * result + ((getGeom() == null) ? 0 : getGeom().hashCode()); result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode()); return result; } @@ -169,7 +169,7 @@ public class XianBridge { sb.append(", master=").append(master); sb.append(", maint=").append(maint); sb.append(", note=").append(note); - sb.append(", point=").append(point); + sb.append(", geom=").append(geom); sb.append(", isDelete=").append(isDelete); sb.append("]"); return sb.toString(); diff --git a/src/main/java/com/gis/xian/entity/XianDangerousSource.java b/src/main/java/com/gis/xian/entity/XianDangerousSource.java index 25f9bec..33c5831 100644 --- a/src/main/java/com/gis/xian/entity/XianDangerousSource.java +++ b/src/main/java/com/gis/xian/entity/XianDangerousSource.java @@ -201,7 +201,7 @@ public class XianDangerousSource { /** * */ - private Object point; + private Object geom; /** * 逻辑删除标识,0未删除,1已删除 @@ -258,7 +258,7 @@ public class XianDangerousSource { && (this.getWriteTime() == null ? other.getWriteTime() == null : this.getWriteTime().equals(other.getWriteTime())) && (this.getLon() == null ? other.getLon() == null : this.getLon().equals(other.getLon())) && (this.getLat() == null ? other.getLat() == null : this.getLat().equals(other.getLat())) - && (this.getPoint() == null ? other.getPoint() == null : this.getPoint().equals(other.getPoint())) + && (this.getGeom() == null ? other.getGeom() == null : this.getGeom().equals(other.getGeom())) && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete())); } @@ -304,7 +304,7 @@ public class XianDangerousSource { result = prime * result + ((getWriteTime() == null) ? 0 : getWriteTime().hashCode()); result = prime * result + ((getLon() == null) ? 0 : getLon().hashCode()); result = prime * result + ((getLat() == null) ? 0 : getLat().hashCode()); - result = prime * result + ((getPoint() == null) ? 0 : getPoint().hashCode()); + result = prime * result + ((getGeom() == null) ? 0 : getGeom().hashCode()); result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode()); return result; } @@ -353,7 +353,7 @@ public class XianDangerousSource { sb.append(", writeTime=").append(writeTime); sb.append(", lon=").append(lon); sb.append(", lat=").append(lat); - sb.append(", point=").append(point); + sb.append(", geom=").append(geom); sb.append(", isDelete=").append(isDelete); sb.append("]"); return sb.toString(); diff --git a/src/main/java/com/gis/xian/entity/XianEmergencyShelter.java b/src/main/java/com/gis/xian/entity/XianEmergencyShelter.java index 0595d37..85c8a0d 100644 --- a/src/main/java/com/gis/xian/entity/XianEmergencyShelter.java +++ b/src/main/java/com/gis/xian/entity/XianEmergencyShelter.java @@ -71,7 +71,7 @@ public class XianEmergencyShelter { /** * 位置 */ - private Object point; + private Object geom; /** * 逻辑删除标识,0未删除,1已删除 @@ -102,7 +102,7 @@ public class XianEmergencyShelter { && (this.getEffectiveNumberOfRefugees() == null ? other.getEffectiveNumberOfRefugees() == null : this.getEffectiveNumberOfRefugees().equals(other.getEffectiveNumberOfRefugees())) && (this.getLon() == null ? other.getLon() == null : this.getLon().equals(other.getLon())) && (this.getLat() == null ? other.getLat() == null : this.getLat().equals(other.getLat())) - && (this.getPoint() == null ? other.getPoint() == null : this.getPoint().equals(other.getPoint())) + && (this.getGeom() == null ? other.getGeom() == null : this.getGeom().equals(other.getGeom())) && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete())); } @@ -122,7 +122,7 @@ public class XianEmergencyShelter { result = prime * result + ((getEffectiveNumberOfRefugees() == null) ? 0 : getEffectiveNumberOfRefugees().hashCode()); result = prime * result + ((getLon() == null) ? 0 : getLon().hashCode()); result = prime * result + ((getLat() == null) ? 0 : getLat().hashCode()); - result = prime * result + ((getPoint() == null) ? 0 : getPoint().hashCode()); + result = prime * result + ((getGeom() == null) ? 0 : getGeom().hashCode()); result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode()); return result; } @@ -145,7 +145,7 @@ public class XianEmergencyShelter { sb.append(", effectiveNumberOfRefugees=").append(effectiveNumberOfRefugees); sb.append(", lon=").append(lon); sb.append(", lat=").append(lat); - sb.append(", point=").append(point); + sb.append(", geom=").append(geom); sb.append(", isDelete=").append(isDelete); sb.append("]"); return sb.toString(); diff --git a/src/main/java/com/gis/xian/entity/XianFirefighter.java b/src/main/java/com/gis/xian/entity/XianFirefighter.java index 0e45403..0834deb 100644 --- a/src/main/java/com/gis/xian/entity/XianFirefighter.java +++ b/src/main/java/com/gis/xian/entity/XianFirefighter.java @@ -281,7 +281,7 @@ public class XianFirefighter { /** * */ - private Object point; + private Object geom; /** * 逻辑删除标识,0未删除,1已删除 @@ -354,7 +354,7 @@ public class XianFirefighter { && (this.getWriteTime() == null ? other.getWriteTime() == null : this.getWriteTime().equals(other.getWriteTime())) && (this.getLon() == null ? other.getLon() == null : this.getLon().equals(other.getLon())) && (this.getLat() == null ? other.getLat() == null : this.getLat().equals(other.getLat())) - && (this.getPoint() == null ? other.getPoint() == null : this.getPoint().equals(other.getPoint())) + && (this.getGeom() == null ? other.getGeom() == null : this.getGeom().equals(other.getGeom())) && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete())); } @@ -416,7 +416,7 @@ public class XianFirefighter { result = prime * result + ((getWriteTime() == null) ? 0 : getWriteTime().hashCode()); result = prime * result + ((getLon() == null) ? 0 : getLon().hashCode()); result = prime * result + ((getLat() == null) ? 0 : getLat().hashCode()); - result = prime * result + ((getPoint() == null) ? 0 : getPoint().hashCode()); + result = prime * result + ((getGeom() == null) ? 0 : getGeom().hashCode()); result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode()); return result; } @@ -481,7 +481,7 @@ public class XianFirefighter { sb.append(", writeTime=").append(writeTime); sb.append(", lon=").append(lon); sb.append(", lat=").append(lat); - sb.append(", point=").append(point); + sb.append(", geom=").append(geom); sb.append(", isDelete=").append(isDelete); sb.append("]"); return sb.toString(); diff --git a/src/main/java/com/gis/xian/entity/XianHospitals.java b/src/main/java/com/gis/xian/entity/XianHospitals.java index 5ec7813..e3485d4 100644 --- a/src/main/java/com/gis/xian/entity/XianHospitals.java +++ b/src/main/java/com/gis/xian/entity/XianHospitals.java @@ -316,7 +316,7 @@ public class XianHospitals { /** * */ - private Object point; + private Object geom; /** * 逻辑删除标识,0未删除,1已删除 @@ -396,7 +396,7 @@ public class XianHospitals { && (this.getWriteTime() == null ? other.getWriteTime() == null : this.getWriteTime().equals(other.getWriteTime())) && (this.getLon() == null ? other.getLon() == null : this.getLon().equals(other.getLon())) && (this.getLat() == null ? other.getLat() == null : this.getLat().equals(other.getLat())) - && (this.getPoint() == null ? other.getPoint() == null : this.getPoint().equals(other.getPoint())) + && (this.getGeom() == null ? other.getGeom() == null : this.getGeom().equals(other.getGeom())) && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete())); } @@ -465,7 +465,7 @@ public class XianHospitals { result = prime * result + ((getWriteTime() == null) ? 0 : getWriteTime().hashCode()); result = prime * result + ((getLon() == null) ? 0 : getLon().hashCode()); result = prime * result + ((getLat() == null) ? 0 : getLat().hashCode()); - result = prime * result + ((getPoint() == null) ? 0 : getPoint().hashCode()); + result = prime * result + ((getGeom() == null) ? 0 : getGeom().hashCode()); result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode()); return result; } @@ -537,7 +537,7 @@ public class XianHospitals { sb.append(", writeTime=").append(writeTime); sb.append(", lon=").append(lon); sb.append(", lat=").append(lat); - sb.append(", point=").append(point); + sb.append(", geom=").append(geom); sb.append(", isDelete=").append(isDelete); sb.append("]"); return sb.toString(); diff --git a/src/main/java/com/gis/xian/entity/XianStorePoints.java b/src/main/java/com/gis/xian/entity/XianStorePoints.java index ee31120..553757c 100644 --- a/src/main/java/com/gis/xian/entity/XianStorePoints.java +++ b/src/main/java/com/gis/xian/entity/XianStorePoints.java @@ -251,7 +251,7 @@ public class XianStorePoints { /** * */ - private Object point; + private Object geom; /** * @@ -318,7 +318,7 @@ public class XianStorePoints { && (this.getOverwriteTime() == null ? other.getOverwriteTime() == null : this.getOverwriteTime().equals(other.getOverwriteTime())) && (this.getLon() == null ? other.getLon() == null : this.getLon().equals(other.getLon())) && (this.getLat() == null ? other.getLat() == null : this.getLat().equals(other.getLat())) - && (this.getPoint() == null ? other.getPoint() == null : this.getPoint().equals(other.getPoint())) + && (this.getGeom() == null ? other.getGeom() == null : this.getGeom().equals(other.getGeom())) && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete())); } @@ -374,7 +374,7 @@ public class XianStorePoints { result = prime * result + ((getOverwriteTime() == null) ? 0 : getOverwriteTime().hashCode()); result = prime * result + ((getLon() == null) ? 0 : getLon().hashCode()); result = prime * result + ((getLat() == null) ? 0 : getLat().hashCode()); - result = prime * result + ((getPoint() == null) ? 0 : getPoint().hashCode()); + result = prime * result + ((getGeom() == null) ? 0 : getGeom().hashCode()); result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode()); return result; } @@ -433,7 +433,7 @@ public class XianStorePoints { sb.append(", overwriteTime=").append(overwriteTime); sb.append(", lon=").append(lon); sb.append(", lat=").append(lat); - sb.append(", point=").append(point); + sb.append(", point=").append(geom); sb.append(", isDelete=").append(isDelete); sb.append("]"); return sb.toString(); diff --git a/src/main/java/com/gis/xian/entity/XianSubwayStations.java b/src/main/java/com/gis/xian/entity/XianSubwayStations.java index bb22697..0bf0ed4 100644 --- a/src/main/java/com/gis/xian/entity/XianSubwayStations.java +++ b/src/main/java/com/gis/xian/entity/XianSubwayStations.java @@ -61,7 +61,7 @@ public class XianSubwayStations { /** * 站点经纬度 */ - private Object point; + private Object geom; /** * 逻辑删除标识,0未删除,1已删除 @@ -90,7 +90,7 @@ public class XianSubwayStations { && (this.getPointOtherDefenses() == null ? other.getPointOtherDefenses() == null : this.getPointOtherDefenses().equals(other.getPointOtherDefenses())) && (this.getLon() == null ? other.getLon() == null : this.getLon().equals(other.getLon())) && (this.getLat() == null ? other.getLat() == null : this.getLat().equals(other.getLat())) - && (this.getPoint() == null ? other.getPoint() == null : this.getPoint().equals(other.getPoint())) + && (this.getGeom() == null ? other.getGeom() == null : this.getGeom().equals(other.getGeom())) && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete())); } @@ -108,7 +108,7 @@ public class XianSubwayStations { result = prime * result + ((getPointOtherDefenses() == null) ? 0 : getPointOtherDefenses().hashCode()); result = prime * result + ((getLon() == null) ? 0 : getLon().hashCode()); result = prime * result + ((getLat() == null) ? 0 : getLat().hashCode()); - result = prime * result + ((getPoint() == null) ? 0 : getPoint().hashCode()); + result = prime * result + ((getGeom() == null) ? 0 : getGeom().hashCode()); result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode()); return result; } @@ -129,7 +129,7 @@ public class XianSubwayStations { sb.append(", pointOtherDefenses=").append(pointOtherDefenses); sb.append(", lon=").append(lon); sb.append(", lat=").append(lat); - sb.append(", point=").append(point); + sb.append(", geom=").append(geom); sb.append(", isDelete=").append(isDelete); sb.append("]"); return sb.toString(); diff --git a/src/main/resources/com/gis/xian/mapper/XianReservoirListMapper.xml b/src/main/resources/com/gis/xian/mapper/XianReservoirListMapper.xml index 34af4d3..1ce26e8 100644 --- a/src/main/resources/com/gis/xian/mapper/XianReservoirListMapper.xml +++ b/src/main/resources/com/gis/xian/mapper/XianReservoirListMapper.xml @@ -17,15 +17,15 @@ - - + + - SELECT id, reservoir_name, location, safety_assess_result, longitude, latitude FROM xian_reservoir_list + SELECT id, reservoir_name, location, safety_assess_result, lon, lat FROM xian_reservoir_list id = #{id} AND is_delete = 0