From 57c63c7af9bcff4d38da1bf247ec0eac21887c48 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 一月 2023 16:11:13 +0800
Subject: [PATCH] 5
---
src/main/java/com/lf/server/controller/data/MetaController.java | 4
src/main/java/com/lf/server/entity/ctrl/TabMapperEntity.java | 32 ++++++++
data/db_tab.sql | 117 ++++++++++------------------
data/update.sql | 7 -
src/main/java/com/lf/server/controller/data/upload/QueryController.java | 4
src/main/java/com/lf/server/controller/show/DataLibController.java | 4
src/main/java/com/lf/server/entity/data/MetaEntity.java | 40 ++-------
src/main/resources/mapper/data/MetaMapper.xml | 12 +-
8 files changed, 97 insertions(+), 123 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index defbdbe..f342317 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -593,36 +593,56 @@
-- 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(geom) from lf.sys_meta;
------------------------------------------------------------------------------------------------------ 17.鍏冩暟鎹枃浠惰〃
--- DROP TABLE IF EXISTS lf.sys_meta_file;
-create table lf.sys_meta_file(
+
+----------------------------------------------------------------------------------------------------- 16.鍏冩暟鎹〃-New
+-- DROP TABLE IF EXISTS lf.sys_meta; DROP TABLE IF EXISTS lf.sys_meta_file;
+create table lf.sys_meta_new (
id serial primary key,
+ eventid varchar(38) default new_guid(),
+ metaid integer default 0,
+ dirid integer default 0,
+ depid integer default 0,
+ verid integer default 0,
name varchar(256),
- metaid integer,
- fileid integer default 0,
- guid varchar(40) default new_guid(),
+ type varchar(100),
+ guid varchar(38) default new_guid(),
path varchar(512),
- sizes float default 0,
+ sizes float8 default 0,
+ tab varchar(50),
+ rows integer default 0,
create_user integer default 1,
create_time timestamp(6) without time zone default now(),
update_user integer,
- update_time timestamp(6) without time zone
+ update_time timestamp(6) without time zone,
+ bak varchar(1024),
+ geom geometry(MultiPolygon, 4490)
);
-comment on table lf.sys_meta_file is '鍏冩暟鎹枃浠惰〃';
-comment on column lf.sys_meta_file.id is '涓婚敭ID';
-comment on column lf.sys_meta_file.name is '鏂囦欢鍚�';
-comment on column lf.sys_meta_file.metaid is '鍏冩暟鎹甀D';
-comment on column lf.sys_meta_file.fileid is '鐖舵枃浠禝D锛�0-娌℃湁';
-comment on column lf.sys_meta_file.guid is '鏂囦欢ID';
-comment on column lf.sys_meta_file.path is '瀛樺偍璺緞';
-comment on column lf.sys_meta_file.sizes is '鏂囦欢澶у皬锛氬崟浣峂B';
-comment on column lf.sys_meta_file.create_user is '鍒涘缓浜篒D';
-comment on column lf.sys_meta_file.create_time is '鍒涘缓鏃堕棿';
-comment on column lf.sys_meta_file.update_user is '鏇存柊浜篒D';
-comment on column lf.sys_meta_file.update_time is '鏇存柊鏃堕棿';
--- insert into lf.sys_meta_file (metaid,name,path) values (1,'a.jpg','c:\a.jpg');
+-- drop index index_sys_meta_geom;
+create index index_sys_meta_geom on lf.sys_meta_new 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.eventid is 'GUID';
+comment on column lf.sys_meta.metaid is '鐖跺厓鏁版嵁ID锛�0-娌℃湁';
+comment on column lf.sys_meta.dirid is '鐩綍ID';
+comment on column lf.sys_meta.depid is '鍗曚綅ID';
+comment on column lf.sys_meta.verid is '鐗堟湰ID';
+comment on column lf.sys_meta.name is '鍚嶇О';
+comment on column lf.sys_meta.type is '绫诲瀷:file-鏂囦欢锛宻hp-ShapeFile锛実db-GDB锛寊ip-鍘嬬缉鍖�';
+comment on column lf.sys_meta.guid is '鏂囦欢GUID';
+comment on column lf.sys_meta.path is '瀛樺偍璺緞';
+comment on column lf.sys_meta.sizes is '澶у皬锛氬崟浣峂B';
+comment on column lf.sys_meta.tab is '琛ㄥ悕';
+comment on column lf.sys_meta.rows is '琛屾暟';
+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.bak is '澶囨敞';
+comment on column lf.sys_meta.geom is '绌洪棿浣嶇疆';
+-- insert into lf.sys_meta(dirid,depid,geom,sizes,name,path) values (1,1,ST_PolygonFromText('MultiPolygon (((100 0,120 0,120 20,100 20,100 0)))', 4490),0.001,'a.jpg','c:\a.jpg');
+-- alter table lf.sys_meta rename column bstab to tab; alter table lf.sys_meta drop column mdtab;
-select * from lf.sys_meta_file;
+select * from lf.sys_meta; select a.*,st_astext(geom) from lf.sys_meta a;
----------------------------------------------------------------------------------------------------- 18.闄勪欢琛�
-- DROP TABLE IF EXISTS lf.sys_attach;
create table lf.sys_attach(
@@ -1098,59 +1118,6 @@
comment on column lf.sys_flow.update_time is '鏇存柊鏃堕棿';
select * from lf.sys_flow;
------------------------------------------------------------------------------------------------------ 16.鍏冩暟鎹〃-New
--- DROP TABLE IF EXISTS lf.sys_meta; DROP TABLE IF EXISTS lf.sys_meta_file;
-create table lf.sys_meta_new (
- id serial primary key,
- eventid varchar(38) default new_guid(),
- metaid integer default 0,
- dirid integer default 0,
- depid integer default 0,
- verid integer default 0,
- name varchar(256),
- type varchar(100),
- guid varchar(38) default new_guid(),
- path varchar(512),
- sizes float8 default 0,
- bstab varchar(50),
- bsrows integer default 0,
- mdtab varchar(50),
- mdrows integer default 0,
- create_user integer default 1,
- create_time timestamp(6) without time zone default now(),
- update_user integer,
- update_time timestamp(6) without time zone,
- bak varchar(1024),
- geom geometry(MultiPolygon, 4490)
-);
--- drop index index_sys_meta_geom;
-create index index_sys_meta_geom on lf.sys_meta_new 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.eventid is 'GUID';
-comment on column lf.sys_meta.metaid is '鐖跺厓鏁版嵁ID锛�0-娌℃湁';
-comment on column lf.sys_meta.dirid is '鐩綍ID';
-comment on column lf.sys_meta.depid is '鍗曚綅ID';
-comment on column lf.sys_meta.verid is '鐗堟湰ID';
-comment on column lf.sys_meta.name is '鍚嶇О';
-comment on column lf.sys_meta.type is '绫诲瀷:file-鏂囦欢锛宻hp-ShapeFile锛実db-GDB锛寊ip-鍘嬬缉鍖�';
-comment on column lf.sys_meta.guid is '鏂囦欢GUID';
-comment on column lf.sys_meta.path is '瀛樺偍璺緞';
-comment on column lf.sys_meta.sizes is '澶у皬锛氬崟浣峂B';
-comment on column lf.sys_meta.bstab is '涓氬姟琛ㄥ悕';
-comment on column lf.sys_meta.bsrows is '涓氬姟琛ㄨ鏁�';
-comment on column lf.sys_meta.mdtab is '鍏冩暟鎹〃鍚�';
-comment on column lf.sys_meta.mdrows is '鍏冩暟鎹鏁�';
-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.bak is '澶囨敞';
-comment on column lf.sys_meta.geom is '绌洪棿浣嶇疆';
--- insert into lf.sys_meta(dirid,depid,geom,sizes,name,path) values (1,1,ST_PolygonFromText('MultiPolygon (((100 0,120 0,120 20,100 20,100 0)))', 4490),0.001,'a.jpg','c:\a.jpg');
--- create table lf.sys_meta as select * from lf.sys_meta_new;
-
-select * from lf.sys_meta_new; select a.*,st_astext(geom) from lf.sys_meta a;
----------------------------------------------------------------------------------------------------- 32.FME鏃ュ織琛�
create table lf.sys_fme_log (
id serial primary key,
diff --git a/data/update.sql b/data/update.sql
index 3aedf7b..e4ab8ad 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -108,12 +108,7 @@
select * from lf.sys_coord where epsgcode = 'EPSG:4490';
select * from lf.sys_operate;
-with recursive rs as(
- select a.*, fullName from lf.sys_dir a where name=#{name}
-union
- select a.* from lf.sys_dir a, rs b where a.pid=b.id
-)
-select * from rs order by order_num;
+
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index 49a4110..b819767 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -132,11 +132,11 @@
}
MetaEntity meta = metaService.selectById(id);
- if (null == meta || null == meta.getBstab() || !meta.getBstab().contains(StaticData.POINT)) {
+ if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
}
- String entity = meta.getBstab().substring(meta.getBstab().indexOf(".") + 1).replace("_", "").toLowerCase();
+ String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
if (null == baseMapper) {
return null;
diff --git a/src/main/java/com/lf/server/controller/data/upload/QueryController.java b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
index 0c4ffdc..f3fc760 100644
--- a/src/main/java/com/lf/server/controller/data/upload/QueryController.java
+++ b/src/main/java/com/lf/server/controller/data/upload/QueryController.java
@@ -181,11 +181,11 @@
}
MetaEntity meta = metaService.selectById(id);
- if (null == meta || null == meta.getBstab() || !meta.getBstab().contains(StaticData.POINT)) {
+ if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
}
- String entity = meta.getBstab().substring(meta.getBstab().indexOf(".") + 1).replace("_", "").toLowerCase();
+ String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
if (null == baseMapper) {
return null;
diff --git a/src/main/java/com/lf/server/controller/show/DataLibController.java b/src/main/java/com/lf/server/controller/show/DataLibController.java
index 0832ea0..e8075cd 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -106,11 +106,11 @@
}
MetaEntity meta = metaService.selectById(id);
- if (null == meta || null == meta.getBstab() || !meta.getBstab().contains(StaticData.POINT)) {
+ if (null == meta || null == meta.getTab() || !meta.getTab().contains(StaticData.POINT)) {
return fail("鎵句笉鍒板厓鏁版嵁淇℃伅", null);
}
- String entity = meta.getBstab().substring(meta.getBstab().indexOf(".") + 1).replace("_", "").toLowerCase();
+ String entity = meta.getTab().substring(meta.getTab().indexOf(".") + 1).replace("_", "").toLowerCase();
BasicMapper baseMapper = ClassHelper.getBasicMapper(entity);
if (null == baseMapper) {
return null;
diff --git a/src/main/java/com/lf/server/entity/ctrl/TabMapperEntity.java b/src/main/java/com/lf/server/entity/ctrl/TabMapperEntity.java
new file mode 100644
index 0000000..6ffbabc
--- /dev/null
+++ b/src/main/java/com/lf/server/entity/ctrl/TabMapperEntity.java
@@ -0,0 +1,32 @@
+package com.lf.server.entity.ctrl;
+
+/**
+ * 琛ㄦ槧灏勫疄浣撶被
+ * @author WWW
+ */
+public class TabMapperEntity {
+ public TabMapperEntity() {
+ }
+
+ public TabMapperEntity(String fileName, String type, String tab, String subPath) {
+ this.fileName = fileName;
+ this.type = type;
+ this.tab = tab;
+ this.subPath = subPath;
+ }
+
+ private String fileName;
+
+ private String extName;
+
+ private String type;
+
+ private String subPath;
+
+ private String tab;
+
+ private String entity;
+
+ private Integer rows;
+
+}
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 fe2d53b..9334620 100644
--- a/src/main/java/com/lf/server/entity/data/MetaEntity.java
+++ b/src/main/java/com/lf/server/entity/data/MetaEntity.java
@@ -32,13 +32,9 @@
private double sizes;
- private String bstab;
+ private String tab;
- private int bsrows;
-
- private String mdtab;
-
- private int mdrows;
+ private int rows;
private int createUser;
@@ -151,36 +147,20 @@
this.sizes = sizes;
}
- public String getBstab() {
- return bstab;
+ public String getTab() {
+ return tab;
}
- public void setBstab(String bstab) {
- this.bstab = bstab;
+ public void setTab(String tab) {
+ this.tab = tab;
}
- public int getBsrows() {
- return bsrows;
+ public int getRows() {
+ return rows;
}
- public void setBsrows(int bsrows) {
- this.bsrows = bsrows;
- }
-
- public String getMdtab() {
- return mdtab;
- }
-
- public void setMdtab(String mdtab) {
- this.mdtab = mdtab;
- }
-
- public int getMdrows() {
- return mdrows;
- }
-
- public void setMdrows(int mdrows) {
- this.mdrows = mdrows;
+ public void setRows(int rows) {
+ this.rows = rows;
}
public int getCreateUser() {
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index 8945497..09e5acc 100644
--- a/src/main/resources/mapper/data/MetaMapper.xml
+++ b/src/main/resources/mapper/data/MetaMapper.xml
@@ -100,17 +100,17 @@
</selectKey>
insert into lf.sys_meta
- (eventid,metaid,dirid,depid,verid,name,type,guid,path,sizes,bstab,bsrows,mdtab,mdrows,create_user,create_time,bak,geom)
+ (eventid,metaid,dirid,depid,verid,name,type,guid,path,sizes,tab,rows,create_user,create_time,bak,geom)
values
- (#{eventid},#{metaid},#{dirid},#{depid},#{verid},#{name},#{type},#{guid},#{path},#{sizes},#{bstab},#{bsrows},#{mdtab},#{mdrows},#{createUser},now(),#{bak},#{geom})
+ (#{eventid},#{metaid},#{dirid},#{depid},#{verid},#{name},#{type},#{guid},#{path},#{sizes},#{tab},#{rows},#{createUser},now(),#{bak},#{geom})
</insert>
<insert id="inserts">
insert into lf.sys_meta
- (eventid,metaid,dirid,depid,verid,name,type,guid,path,sizes,bstab,bsrows,mdtab,mdrows,create_user,create_time,bak,geom)
+ (eventid,metaid,dirid,depid,verid,name,type,guid,path,sizes,tab,rows,create_user,create_time,bak,geom)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.eventid},#{item.metaid},#{item.dirid},#{item.depid},#{item.verid},#{item.name},#{item.type},#{item.guid},#{item.path},#{item.sizes},#{item.bstab},#{item.bsrows},#{item.mdtab},#{item.mdrows},#{item.createUser},now(),#{item.bak},#{item.geom})
+ (#{item.eventid},#{item.metaid},#{item.dirid},#{item.depid},#{item.verid},#{item.name},#{item.type},#{item.guid},#{item.path},#{item.sizes},#{item.tab},#{item.rows},#{item.createUser},now(),#{item.bak},#{item.geom})
</foreach>
</insert>
@@ -127,7 +127,7 @@
<update id="update">
update lf.sys_meta
- set eventid=#{eventid},metaid=#{metaid},dirid=#{dirid},depid=#{depid},verid=#{verid},name=#{name},type=#{type},guid=#{guid},path=#{path},sizes=#{sizes},bstab=#{bstab},bsrows=#{bsrows},mdtab=#{mdtab},mdrows=#{mdrows},update_user=#{updateUser},update_time=now(),bak=#{bak},geom=#{geom}
+ set eventid=#{eventid},metaid=#{metaid},dirid=#{dirid},depid=#{depid},verid=#{verid},name=#{name},type=#{type},guid=#{guid},path=#{path},sizes=#{sizes},tab=#{tab},rows=#{rows},update_user=#{updateUser},update_time=now(),bak=#{bak},geom=#{geom}
where id=#{id}
</update>
@@ -135,7 +135,7 @@
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_meta
<set>
- eventid=#{item.eventid},metaid=#{item.metaid},dirid=#{item.dirid},depid=#{item.depid},verid=#{item.verid},name=#{item.name},type=#{item.type},guid=#{item.guid},path=#{item.path},sizes=#{item.sizes},bstab=#{item.bstab},bsrows=#{item.bsrows},mdtab=#{item.mdtab},mdrows=#{item.mdrows},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},geom=#{item.geom}
+ eventid=#{item.eventid},metaid=#{item.metaid},dirid=#{item.dirid},depid=#{item.depid},verid=#{item.verid},name=#{item.name},type=#{item.type},guid=#{item.guid},path=#{item.path},sizes=#{item.sizes},tab=#{item.tab},rows=#{item.rows},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},geom=#{item.geom}
</set>
where id = #{item.id}
</foreach>
--
Gitblit v1.9.3