From 1db90f352e0068556fd691d407b72b2dd3a3f8db Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 18 十月 2022 18:30:23 +0800
Subject: [PATCH] 1
---
data/db_tab.sql | 33 ++++++++--------
src/main/java/com/lf/server/entity/data/MetaEntity.java | 62 +++++++++++++++---------------
src/main/resources/mapper/data/MetaMapper.xml | 16 ++++----
3 files changed, 56 insertions(+), 55 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index db6900e..8bce095 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -533,17 +533,17 @@
-- DROP TABLE IF EXISTS lf.sys_meta;
create table lf.sys_meta(
id serial primary key,
- dirid integer,
- depid integer,
name varchar(256),
- format varchar(100),
- fsize bigint default 0,
+ dirid integer default 0,
+ depid integer default 0,
+ verid integer default 0,
+ type varchar(100),
+ sizes bigint default 0,
cs varchar(50),
- fscale varchar(50),
+ scale varchar(50),
resolution varchar(50),
gather timestamp(6) without time zone,
descr varchar(256),
- guid varchar(40) default null,
create_user integer default 1,
create_time timestamp(6) without time zone default now(),
update_user integer,
@@ -553,28 +553,29 @@
CONSTRAINT enforce_geotype_geom CHECK (geometrytype(geo) = 'POLYGON'::text OR geo IS NULL),
CONSTRAINT enforce_srid_geom CHECK (st_srid(geo) = 4490)
);
-create index index_sys_meta_geo on lf.sys_meta using gist (geo);
+-- drop index index_sys_meta_geo;
+create index index_sys_meta_geo on lf.sys_meta using GIST (geo);
comment on table lf.sys_meta is '鍏冩暟鎹〃';
comment on column lf.sys_meta.id is '涓婚敭ID';
+comment on column lf.sys_meta.name is '鍚嶇О';
comment on column lf.sys_meta.dirid is '鐩綍ID';
comment on column lf.sys_meta.depid is '鍗曚綅ID';
-comment on column lf.sys_meta.name is '鍚嶇О';
-comment on column lf.sys_meta.format is '鏍煎紡';
-comment on column lf.sys_meta.fsize is '澶у皬锛氬崟浣嶄负kb';
+comment on column lf.sys_meta.verid is '鐗堟湰ID';
+comment on column lf.sys_meta.type is '鏍煎紡';
+comment on column lf.sys_meta.sizes is '澶у皬锛氬崟浣嶄负B';
comment on column lf.sys_meta.cs is '鍧愭爣绯�';
-comment on column lf.sys_meta.fscale is '姣斾緥灏�';
+comment on column lf.sys_meta.scale is '姣斾緥灏�';
comment on column lf.sys_meta.resolution is '鍒嗚鲸鐜�';
comment on column lf.sys_meta.gather is '閲囬泦鏃ユ湡';
comment on column lf.sys_meta.descr is '鎻忚堪';
-comment on column lf.sys_meta.guid is '鏂囦欢ID';
comment on column lf.sys_meta.create_user is '鍒涘缓浜篒D';
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) values (1,1,'Test',ST_PolygonFromText('POLYGON ((100 0,120 0,120 20,100 20,100 0))',4490));
+comment on column lf.sys_meta.geo is '绌洪棿浣嶇疆';
+-- insert into lf.sys_meta(dirid,depid,name,geo) values (1,1,'Test',ST_PolygonFromText('POLYGON ((100 0,120 0,120 20,100 20,100 0))',4490));
-select id,dirid,depid,name,descr,guid,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(geo) from lf.sys_meta;
----------------------------------------------------------------------------------------------------- 17.鍏冩暟鎹枃浠惰〃
-- DROP TABLE IF EXISTS lf.sys_meta_file;
create table lf.sys_meta_file(
@@ -780,8 +781,8 @@
comment on column lf.sys_download.create_time is '鍒涘缓鏃堕棿';
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.geo is '绌洪棿';
comment on column lf.sys_download.bak is '澶囨敞';
+comment on column lf.sys_download.geo 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/MetaEntity.java b/src/main/java/com/lf/server/entity/data/MetaEntity.java
index 5b9e565..e283e2d 100644
--- a/src/main/java/com/lf/server/entity/data/MetaEntity.java
+++ b/src/main/java/com/lf/server/entity/data/MetaEntity.java
@@ -8,31 +8,31 @@
* @author WWW
*/
public class MetaEntity implements Serializable {
- private static final long serialVersionUID = -525590434915195392L;
+ private static final long serialVersionUID = -351865749970015936L;
private int id;
+
+ private String name;
private int dirid;
private int depid;
- private String name;
+ private int verid;
- private String format;
+ private String type;
- private long fsize;
+ private long sizes;
private String cs;
- private String fscale;
+ private String scale;
private String resolution;
private Timestamp gather;
private String descr;
-
- private String guid;
private int createUser;
@@ -55,6 +55,14 @@
this.id = id;
}
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
public int getDirid() {
return dirid;
}
@@ -71,28 +79,28 @@
this.depid = depid;
}
- public String getName() {
- return name;
+ public int getVerid() {
+ return verid;
}
- public void setName(String name) {
- this.name = name;
+ public void setVerid(int verid) {
+ this.verid = verid;
}
- public String getFormat() {
- return format;
+ public String getType() {
+ return type;
}
- public void setFormat(String format) {
- this.format = format;
+ public void setType(String type) {
+ this.type = type;
}
- public long getFsize() {
- return fsize;
+ public long getSizes() {
+ return sizes;
}
- public void setFsize(long fsize) {
- this.fsize = fsize;
+ public void setSizes(long sizes) {
+ this.sizes = sizes;
}
public String getCs() {
@@ -103,12 +111,12 @@
this.cs = cs;
}
- public String getFscale() {
- return fscale;
+ public String getScale() {
+ return scale;
}
- public void setFscale(String fscale) {
- this.fscale = fscale;
+ public void setScale(String scale) {
+ this.scale = scale;
}
public String getResolution() {
@@ -133,14 +141,6 @@
public void setDescr(String descr) {
this.descr = descr;
- }
-
- public String getGuid() {
- return guid;
- }
-
- public void setGuid(String guid) {
- this.guid = guid;
}
public int getCreateUser() {
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index 91fa7f8..f5914b6 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
- (dirid,depid,name,format,fsize,cs,fscale,resolution,gather,descr,guid,create_user,create_time,geo)
+ (name,dirid,depid,verid,type,sizes,cs,scale,resolution,gather,descr,create_user,create_time,geo)
values
- (#{dirid},#{depid},#{name},#{format},#{fsize},#{cs},#{fscale},#{resolution},now(),#{descr},#{guid},#{createUser},now(),#{geo})
+ (#{name},#{dirid},#{depid},#{verid},#{type},#{sizes},#{cs},#{scale},#{resolution},now(),#{descr},#{createUser},now(),#{geo})
</insert>
<insert id="inserts">
insert into lf.sys_meta
- (dirid,depid,name,format,fsize,cs,fscale,resolution,gather,descr,guid,create_user,create_time,geo)
+ (name,dirid,depid,verid,type,sizes,cs,scale,resolution,gather,descr,create_user,create_time,geo)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.dirid},#{item.depid},#{item.name},#{item.format},#{item.fsize},#{item.cs},#{item.fscale},#{item.resolution},now(),#{item.descr},#{item.guid},#{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.geo})
</foreach>
</insert>
@@ -57,16 +57,16 @@
</delete>
<update id="update">
- update lf.sys_meta
- set dirid=#{dirid},depid=#{depid},name=#{name},format=#{format},fsize=#{fsize},cs=#{cs},fscale=#{fscale},resolution=#{resolution},gather=now(),descr=#{descr},guid=#{guid},update_user=#{updateUser},update_time=now(),geo=#{geo}
- where id=#{id}
+ 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}
+ where id=#{id}
</update>
<update id="updates">
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_meta
<set>
- dirid=#{item.dirid},depid=#{item.depid},name=#{item.name},format=#{item.format},fsize=#{item.fsize},cs=#{item.cs},fscale=#{item.fscale},resolution=#{item.resolution},gather=now(),descr=#{item.descr},guid=#{item.guid},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(),geo=#{item.geo}
</set>
where id = #{item.id}
</foreach>
--
Gitblit v1.9.3