From 31bfaa54f63b023ac6c4c26d0718c7bdf4276b8f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 19 十月 2022 10:38:48 +0800
Subject: [PATCH] 1

---
 src/main/resources/mapper/data/DownloadMapper.xml           |   12 +++---
 data/db_tab.sql                                             |   30 +++++++-------
 src/main/java/com/lf/server/entity/data/DownloadEntity.java |   10 ++--
 src/main/java/com/lf/server/entity/data/MetaEntity.java     |   10 ++--
 src/main/resources/mapper/data/MetaMapper.xml               |   12 +++---
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/data/db_tab.sql b/data/db_tab.sql
index 3bfa8e3..392227e 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -548,13 +548,13 @@
   create_time timestamp(6) without time zone default now(),
   update_user integer,
   update_time timestamp(6) without time zone,
-  geo geometry default null,
-  CONSTRAINT enforce_dims_geom CHECK (st_ndims(geo) = 2),
-  CONSTRAINT enforce_geotype_geom CHECK (geometrytype(geo) = 'POLYGON'::text OR geo IS NULL),
-  CONSTRAINT enforce_srid_geom CHECK (st_srid(geo) = 4490)
+  geom geometry default null,
+  CONSTRAINT enforce_dims_geom CHECK (st_ndims(geom) = 2),
+  CONSTRAINT enforce_geotype_geom CHECK (geometrytype(geom) = 'POLYGON'::text OR geom IS NULL),
+  CONSTRAINT enforce_srid_geom CHECK (st_srid(geom) = 4490)
 );
--- drop index index_sys_meta_geo;
-create index index_sys_meta_geo on lf.sys_meta using GIST (geo);
+-- drop index index_sys_meta_geom;
+create index index_sys_meta_geom on lf.sys_meta using GIST (geom);
 comment on table lf.sys_meta is '鍏冩暟鎹〃';
 comment on column lf.sys_meta.id is '涓婚敭ID';
 comment on column lf.sys_meta.name is '鍚嶇О';
@@ -572,10 +572,10 @@
 comment on column lf.sys_meta.create_time is '鍒涘缓鏃堕棿';
 comment on column lf.sys_meta.update_user is '鏇存柊浜篒D';
 comment on column lf.sys_meta.update_time is '鏇存柊鏃堕棿';
-comment on column lf.sys_meta.geo is '绌洪棿浣嶇疆';
--- insert into lf.sys_meta(dirid,depid,name,geo,sizes) values (1,1,'Test',ST_PolygonFromText('POLYGON ((100 0,120 0,120 20,100 20,100 0))',4490),0.001);
+comment on column lf.sys_meta.geom is '绌洪棿浣嶇疆';
+-- insert into lf.sys_meta(dirid,depid,name,geom,sizes) values (1,1,'Test',ST_PolygonFromText('POLYGON ((100 0,120 0,120 20,100 20,100 0))',4490),0.001);
 
-select * from lf.sys_meta; select id,name,dirid,depid,verid,type,sizes,descr,create_user,create_time,update_user,update_time,st_astext(geo) from lf.sys_meta;
+select * from lf.sys_meta; select id,name,dirid,depid,verid,type,sizes,descr,create_user,create_time,update_user,update_time,st_astext(geom) from lf.sys_meta;
 ----------------------------------------------------------------------------------------------------- 17.鍏冩暟鎹枃浠惰〃
 -- DROP TABLE IF EXISTS lf.sys_meta_file;
 create table lf.sys_meta_file(
@@ -761,13 +761,13 @@
   create_time timestamp(6) without time zone default now(),
   download_user integer,
   download_time timestamp(6) without time zone,
-  geo geometry default null,
+  geom geometry default null,
   bak varchar(1024)
-  CONSTRAINT enforce_dims_geom CHECK (st_ndims(geo) = 2),
-  CONSTRAINT enforce_geotype_geom CHECK (geometrytype(geo) = 'POLYGON'::text OR geo IS NULL),
-  CONSTRAINT enforce_srid_geom CHECK (st_srid(geo) = 4490)
+  CONSTRAINT enforce_dims_geom CHECK (st_ndims(geom) = 2),
+  CONSTRAINT enforce_geotype_geom CHECK (geometrytype(geom) = 'POLYGON'::text OR geom IS NULL),
+  CONSTRAINT enforce_srid_geom CHECK (st_srid(geom) = 4490)
 );
-create index index_sys_download_geo on lf.sys_download using gist (geo);
+create index index_sys_download_geom on lf.sys_download using gist (geom);
 comment on table lf.sys_download is '涓嬭浇璁板綍琛�';
 comment on column lf.sys_download.id is '涓婚敭ID';
 comment on column lf.sys_download.name is '鍚嶇О';
@@ -783,7 +783,7 @@
 comment on column lf.sys_download.download_user is '涓嬭浇浜篒D';
 comment on column lf.sys_download.download_time is '涓嬭浇鏃堕棿';
 comment on column lf.sys_download.bak is '澶囨敞';
-comment on column lf.sys_download.geo is '绌洪棿浣嶇疆';
+comment on column lf.sys_download.geom is '绌洪棿浣嶇疆';
 -- insert into lf.sys_download (name,pwd,url,descr) values ('2022-09-27','123456','','娴嬭瘯涓嬭浇');
 
 select * from lf.sys_download;
diff --git a/src/main/java/com/lf/server/entity/data/DownloadEntity.java b/src/main/java/com/lf/server/entity/data/DownloadEntity.java
index a707f70..617a564 100644
--- a/src/main/java/com/lf/server/entity/data/DownloadEntity.java
+++ b/src/main/java/com/lf/server/entity/data/DownloadEntity.java
@@ -36,7 +36,7 @@
 
     private Timestamp downloadTime;
 
-    private String geo;
+    private String geom;
 
     private String bak;
 
@@ -147,12 +147,12 @@
         this.downloadTime = downloadTime;
     }
 
-    public String getGeo() {
-        return geo;
+    public String getGeom() {
+        return geom;
     }
 
-    public void setGeo(String geo) {
-        this.geo = geo;
+    public void setGeom(String geo) {
+        this.geom = geo;
     }
 
     public String getBak() {
diff --git a/src/main/java/com/lf/server/entity/data/MetaEntity.java b/src/main/java/com/lf/server/entity/data/MetaEntity.java
index 8a1d1a6..7a52f64 100644
--- a/src/main/java/com/lf/server/entity/data/MetaEntity.java
+++ b/src/main/java/com/lf/server/entity/data/MetaEntity.java
@@ -42,7 +42,7 @@
 
     private Timestamp updateTime;
 
-    private String geo;
+    private String geom;
 
     public MetaEntity() {
     }
@@ -175,11 +175,11 @@
         this.updateTime = updateTime;
     }
 
-    public String getGeo() {
-        return geo;
+    public String getGeom() {
+        return geom;
     }
 
-    public void setGeo(String geo) {
-        this.geo = geo;
+    public void setGeom(String geo) {
+        this.geom = geo;
     }
 }
diff --git a/src/main/resources/mapper/data/DownloadMapper.xml b/src/main/resources/mapper/data/DownloadMapper.xml
index b34929f..229f015 100644
--- a/src/main/resources/mapper/data/DownloadMapper.xml
+++ b/src/main/resources/mapper/data/DownloadMapper.xml
@@ -31,17 +31,17 @@
 
     <insert id="insert" parameterType="com.lf.server.entity.data.DownloadEntity">
        insert into lf.sys_download
-       (name,type,depid,dcount,pwd,url,descr,guid,create_user,create_time,download_user,download_time,geo,bak)
+       (name,type,depid,dcount,pwd,url,descr,guid,create_user,create_time,download_user,download_time,geom,bak)
        values
-       (#{name},#{type},#{depid},#{dcount},#{pwd},#{url},#{descr},#{guid},#{createUser},now(),#{downloadUser},now(),#{geo},#{bak})
+       (#{name},#{type},#{depid},#{dcount},#{pwd},#{url},#{descr},#{guid},#{createUser},now(),#{downloadUser},now(),#{geom},#{bak})
     </insert>
 
     <insert id="inserts">
         insert into lf.sys_download
-        (name,type,depid,dcount,pwd,url,descr,guid,create_user,create_time,download_user,download_time,geo,bak)
+        (name,type,depid,dcount,pwd,url,descr,guid,create_user,create_time,download_user,download_time,geom,bak)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.name},#{item.type},#{item.depid},#{item.dcount},#{item.pwd},#{item.url},#{item.descr},#{item.guid},#{item.createUser},now(),#{item.downloadUser},now(),#{item.geo},#{item.bak})
+            (#{item.name},#{item.type},#{item.depid},#{item.dcount},#{item.pwd},#{item.url},#{item.descr},#{item.guid},#{item.createUser},now(),#{item.downloadUser},now(),#{item.geom},#{item.bak})
         </foreach>
     </insert>
 
@@ -58,7 +58,7 @@
 
     <update id="update">
     update lf.sys_download
-    set name=#{name},type=#{type},depid=#{depid},dcount=#{dcount},pwd=#{pwd},url=#{url},descr=#{descr},guid=#{guid},download_user=#{downloadUser},download_time=now(),geo=#{geo},bak=#{bak}
+    set name=#{name},type=#{type},depid=#{depid},dcount=#{dcount},pwd=#{pwd},url=#{url},descr=#{descr},guid=#{guid},download_user=#{downloadUser},download_time=now(),geom=#{geom},bak=#{bak}
     where id=#{id}
     </update>
 
@@ -66,7 +66,7 @@
         <foreach collection="list" item="item" index="index" separator=";">
             update lf.sys_download
             <set>
-                name=#{item.name},type=#{item.type},depid=#{item.depid},dcount=#{item.dcount},pwd=#{item.pwd},url=#{item.url},descr=#{item.descr},guid=#{item.guid},download_user=#{item.downloadUser},download_time=now(),geo=#{item.geo},bak=#{item.bak}
+                name=#{item.name},type=#{item.type},depid=#{item.depid},dcount=#{item.dcount},pwd=#{item.pwd},url=#{item.url},descr=#{item.descr},guid=#{item.guid},download_user=#{item.downloadUser},download_time=now(),geom=#{item.geom},bak=#{item.bak}
             </set>
             where id = #{item.id}
         </foreach>
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index f5914b6..def3224 100644
--- a/src/main/resources/mapper/data/MetaMapper.xml
+++ b/src/main/resources/mapper/data/MetaMapper.xml
@@ -31,17 +31,17 @@
 
     <insert id="insert" parameterType="com.lf.server.entity.data.MetaEntity">
        insert into lf.sys_meta
-       (name,dirid,depid,verid,type,sizes,cs,scale,resolution,gather,descr,create_user,create_time,geo)
+       (name,dirid,depid,verid,type,sizes,cs,scale,resolution,gather,descr,create_user,create_time,geom)
        values
-       (#{name},#{dirid},#{depid},#{verid},#{type},#{sizes},#{cs},#{scale},#{resolution},now(),#{descr},#{createUser},now(),#{geo})
+       (#{name},#{dirid},#{depid},#{verid},#{type},#{sizes},#{cs},#{scale},#{resolution},now(),#{descr},#{createUser},now(),#{geom})
     </insert>
 
     <insert id="inserts">
         insert into lf.sys_meta
-        (name,dirid,depid,verid,type,sizes,cs,scale,resolution,gather,descr,create_user,create_time,geo)
+        (name,dirid,depid,verid,type,sizes,cs,scale,resolution,gather,descr,create_user,create_time,geom)
         values
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.name},#{item.dirid},#{item.depid},#{item.verid},#{item.type},#{item.sizes},#{item.cs},#{item.scale},#{item.resolution},now(),#{item.descr},#{item.createUser},now(),#{item.geo})
+            (#{item.name},#{item.dirid},#{item.depid},#{item.verid},#{item.type},#{item.sizes},#{item.cs},#{item.scale},#{item.resolution},now(),#{item.descr},#{item.createUser},now(),#{item.geom})
         </foreach>
     </insert>
 
@@ -58,7 +58,7 @@
 
     <update id="update">
         update lf.sys_meta
-        set name=#{name},dirid=#{dirid},depid=#{depid},verid=#{verid},type=#{type},sizes=#{sizes},cs=#{cs},scale=#{scale},resolution=#{resolution},gather=now(),descr=#{descr},update_user=#{updateUser},update_time=now(),geo=#{geo}
+        set name=#{name},dirid=#{dirid},depid=#{depid},verid=#{verid},type=#{type},sizes=#{sizes},cs=#{cs},scale=#{scale},resolution=#{resolution},gather=now(),descr=#{descr},update_user=#{updateUser},update_time=now(),geom=#{geom}
         where id=#{id}
     </update>
 
@@ -66,7 +66,7 @@
         <foreach collection="list" item="item" index="index" separator=";">
             update lf.sys_meta
             <set>
-                name=#{item.name},dirid=#{item.dirid},depid=#{item.depid},verid=#{item.verid},type=#{item.type},sizes=#{item.sizes},cs=#{item.cs},scale=#{item.scale},resolution=#{item.resolution},gather=now(),descr=#{item.descr},update_user=#{item.updateUser},update_time=now(),geo=#{item.geo}
+                name=#{item.name},dirid=#{item.dirid},depid=#{item.depid},verid=#{item.verid},type=#{item.type},sizes=#{item.sizes},cs=#{item.cs},scale=#{item.scale},resolution=#{item.resolution},gather=now(),descr=#{item.descr},update_user=#{item.updateUser},update_time=now(),geom=#{item.geom}
             </set>
             where id = #{item.id}
         </foreach>

--
Gitblit v1.9.3