From cf547f4d9c56cf2d86ae60132aa7496bee93bf9c Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 17:12:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
data/db_tab.sql | 4 +++-
src/main/java/com/lf/server/service/data/UploadService.java | 1 +
data/update.sql | 2 +-
src/main/java/com/lf/server/controller/data/upload/QueryController.java | 31 +++++++++++++++++++++++++++++++
src/main/java/com/lf/server/entity/data/MetaEntity.java | 10 ++++++++++
src/main/resources/mapper/data/MetaMapper.xml | 12 ++++++------
6 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/data/db_tab.sql b/data/db_tab.sql
index 17d9282..a447cc4 100644
--- a/data/db_tab.sql
+++ b/data/db_tab.sql
@@ -552,6 +552,7 @@
id serial primary key,
eventid varchar(38) default new_guid(),
metaid integer default 0,
+ ismeta smallint default 0,
dirid integer default 0,
depid integer default 0,
depcode varchar(24) default '00',
@@ -578,6 +579,7 @@
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.ismeta 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.depcode is '鐩綍缂栫爜';
@@ -596,7 +598,7 @@
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 '绌洪棿浣嶇疆';
+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');
select a.*,st_astext(geom) from lf.sys_meta a; select id,name,dirid,depid,verid,type,sizes,create_user,create_time,update_user,update_time,st_astext(geom) from lf.sys_meta;
diff --git a/data/update.sql b/data/update.sql
index 80665e5..f47958d 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -223,9 +223,9 @@
select a.* from lf.sys_dir a where code = '06' order by code;
select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a where code = '01'
-
select count(*) from lf.sys_meta where metaid = 0
select * from lf.sys_meta where id = 1420 or metaid = 1420
+select * from lf.sys_fme_log order by id desc
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 ff25858..fe8635a 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
@@ -54,6 +54,37 @@
protected BaseQueryService baseQueryService;
@SysLog()
+ @ApiOperation(value = "鏍规嵁鐖禝D鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "metaid", value = "鐖禝D", dataType = "String", paramType = "query", example = "0"),
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
+ @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
+ })
+ @GetMapping(value = "/selectPageAndCountByPid")
+ public ResponseMsg<List<MetaEntity>> selectPageAndCountByPid(Integer metaid, String name, Integer pageSize, Integer pageIndex) {
+ try {
+ if (pageSize < 1 || pageIndex < 1) {
+ return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
+ }
+ if (null == metaid || metaid < 1) {
+ return fail("鐖禝D涓嶈兘涓虹┖涓斿ぇ浜�1", null);
+ }
+
+ int count = metaService.selectCountByPid(metaid, name);
+ if (count == 0) {
+ return success(0, null);
+ }
+
+ List<MetaEntity> rs = metaService.selectPageByPid(metaid, name, pageSize, pageSize * (pageIndex - 1));
+
+ return success(count, rs);
+ } catch (Exception ex) {
+ return fail(ex.getMessage(), null);
+ }
+ }
+
+ @SysLog()
@ApiOperation(value = "鏌ヨ鎵�鏈夊崟浣�")
@GetMapping(value = "/selectDepAll")
public ResponseMsg<List<DepEntity>> selectDepAll() {
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 5af175e..62aa7b5 100644
--- a/src/main/java/com/lf/server/entity/data/MetaEntity.java
+++ b/src/main/java/com/lf/server/entity/data/MetaEntity.java
@@ -16,6 +16,8 @@
private int metaid;
+ private short ismeta;
+
private String dircode;
private String depcode;
@@ -85,6 +87,14 @@
this.metaid = metaid;
}
+ public short getIsmeta() {
+ return ismeta;
+ }
+
+ public void setIsmeta(short ismeta) {
+ this.ismeta = ismeta;
+ }
+
public String getDircode() {
return dircode;
}
diff --git a/src/main/java/com/lf/server/service/data/UploadService.java b/src/main/java/com/lf/server/service/data/UploadService.java
index 940638d..dd49923 100644
--- a/src/main/java/com/lf/server/service/data/UploadService.java
+++ b/src/main/java/com/lf/server/service/data/UploadService.java
@@ -572,6 +572,7 @@
}
MetaEntity me = createMeta(mf, 0);
+ me.setIsmeta((short) 1);
metaService.insert(me);
mf.setMsg(me.getId() > 0 ? "鎴愬姛" : "澶辫触");
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index 0756411..c63685e 100644
--- a/src/main/resources/mapper/data/MetaMapper.xml
+++ b/src/main/resources/mapper/data/MetaMapper.xml
@@ -171,17 +171,17 @@
</selectKey>
insert into lf.sys_meta
- (eventid,metaid,dircode,depcode,verid,name,type,guid,path,sizes,tab,layer,rows,create_user,create_time,bak,geom)
+ (eventid,metaid,ismeta,dircode,depcode,verid,name,type,guid,path,sizes,tab,layer,rows,create_user,create_time,bak,geom)
values
- (#{eventid},#{metaid},#{dircode},#{depcode},#{verid},#{name},#{type},#{guid},#{path},#{sizes},#{tab},#{layer},#{rows},#{createUser},#{createTime},#{bak},#{geom})
+ (#{eventid},#{metaid},#{ismeta},#{dircode},#{depcode},#{verid},#{name},#{type},#{guid},#{path},#{sizes},#{tab},#{layer},#{rows},#{createUser},#{createTime},#{bak},#{geom})
</insert>
<insert id="inserts">
insert into lf.sys_meta
- (eventid,metaid,dircode,depcode,verid,name,type,guid,path,sizes,tab,layer,rows,create_user,create_time,bak,geom)
+ (eventid,metaid,ismeta,dircode,depcode,verid,name,type,guid,path,sizes,tab,layer,rows,create_user,create_time,bak,geom)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.eventid},#{item.metaid},#{item.dircode},#{item.depcode},#{item.verid},#{item.name},#{item.type},#{item.guid},#{item.path},#{item.sizes},#{item.tab},#{item.layer},#{item.rows},#{item.createUser},#{item.createTime},#{item.bak},#{item.geom})
+ (#{item.eventid},#{item.metaid},#{item.ismeta},#{item.dircode},#{item.depcode},#{item.verid},#{item.name},#{item.type},#{item.guid},#{item.path},#{item.sizes},#{item.tab},#{item.layer},#{item.rows},#{item.createUser},#{item.createTime},#{item.bak},#{item.geom})
</foreach>
</insert>
@@ -198,7 +198,7 @@
<update id="update">
update lf.sys_meta
- set eventid=#{eventid},metaid=#{metaid},dircode=#{dircode},depcode=#{depcode},verid=#{verid},name=#{name},type=#{type},guid=#{guid},path=#{path},sizes=#{sizes},tab=#{tab},layer=#{layer},rows=#{rows},update_user=#{updateUser},update_time=now(),bak=#{bak},geom=#{geom}
+ set eventid=#{eventid},metaid=#{metaid},ismeta=#{ismeta},dircode=#{dircode},depcode=#{depcode},verid=#{verid},name=#{name},type=#{type},guid=#{guid},path=#{path},sizes=#{sizes},tab=#{tab},layer=#{layer},rows=#{rows},update_user=#{updateUser},update_time=now(),bak=#{bak},geom=#{geom}
where id=#{id}
</update>
@@ -206,7 +206,7 @@
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_meta
<set>
- eventid=#{item.eventid},metaid=#{item.metaid},dircode=#{item.dircode},depcode=#{item.depcode},verid=#{item.verid},name=#{item.name},type=#{item.type},guid=#{item.guid},path=#{item.path},sizes=#{item.sizes},tab=#{item.tab},layer=#{item.layer},rows=#{item.rows},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},geom=#{item.geom}
+ eventid=#{item.eventid},metaid=#{item.metaid},ismeta=#{item.ismeta},dircode=#{item.dircode},depcode=#{item.depcode},verid=#{item.verid},name=#{item.name},type=#{item.type},guid=#{item.guid},path=#{item.path},sizes=#{item.sizes},tab=#{item.tab},layer=#{item.layer},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