From e73cb6c65e4fc6b1313f56a864aaede91642c4ee Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 31 八月 2023 10:08:13 +0800
Subject: [PATCH] 元数据接口添加创建人、更新人字段
---
src/main/java/com/moon/server/controller/data/MetaController.java | 4 ++--
src/main/java/com/moon/server/entity/data/MetaEntity.java | 20 +++++++++++++++-----
src/main/resources/mapper/data/MetaMapper.xml | 21 +++++++++++----------
3 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/data/MetaController.java b/src/main/java/com/moon/server/controller/data/MetaController.java
index 46088f4..c7b2887 100644
--- a/src/main/java/com/moon/server/controller/data/MetaController.java
+++ b/src/main/java/com/moon/server/controller/data/MetaController.java
@@ -80,8 +80,8 @@
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "sensorType", value = "浼犳劅鍣ㄧ被鍨�", dataType = "Integer", paramType = "query", example = "0"),
@ApiImplicitParam(name = "mataType", value = "鍏冩暟鎹被鍨�", dataType = "Integer", paramType = "query", example = "0"),
- @ApiImplicitParam(name = "startDate", value = "寮�濮嬫棩鏈�", dataType = "Date", paramType = "query", example = "0"),
- @ApiImplicitParam(name = "endDate", value = "缁撴潫鏃ユ湡", dataType = "Date", paramType = "query", example = "0"),
+ @ApiImplicitParam(name = "startDate", value = "寮�濮嬫棩鏈�", dataType = "Date", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "endDate", value = "缁撴潫鏃ユ湡", dataType = "Date", paramType = "query", example = ""),
@ApiImplicitParam(name = "wkt", value = "WKT瀛楃涓�", dataType = "String", paramType = "query", example = "gAPpDbZ53XfoQfvT8dj/uhBWX5os8kBJQ1LrNvH3VX7byFQdUJMPiEr8Fkj0q2i1pw+L8KFrvR0MLXq2xaO21nlQQXmEPofJxpDQZwEWUIFZsToXo1kLRD3t6WQezxWB8YTzXHM20Ba73x/ZuuezVhOFOq1U8HKf1dXQdv7gBzEB6fWMmFDc3FuH8GDDHv3LfT86Gio9VgMO6ohlrUdf3ZKtTHeLSuzGF4t0RZuX97YBNo25IIzpeTfRTXBxfdxA"),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
diff --git a/src/main/java/com/moon/server/entity/data/MetaEntity.java b/src/main/java/com/moon/server/entity/data/MetaEntity.java
index 3055809..3e46f70 100644
--- a/src/main/java/com/moon/server/entity/data/MetaEntity.java
+++ b/src/main/java/com/moon/server/entity/data/MetaEntity.java
@@ -74,7 +74,9 @@
private String ct;
- private String uname;
+ private String createName;
+
+ private String updateName;
private String depName;
@@ -349,12 +351,20 @@
this.ct = ct;
}
- public String getUname() {
- return uname;
+ public String getCreateName() {
+ return createName;
}
- public void setUname(String uname) {
- this.uname = uname;
+ public void setCreateName(String createName) {
+ this.createName = createName;
+ }
+
+ public String getUpdateName() {
+ return updateName;
+ }
+
+ public void setUpdateName(String updateName) {
+ this.updateName = updateName;
}
public String getDepName() {
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index e3a0c7b..a9683a2 100644
--- a/src/main/resources/mapper/data/MetaMapper.xml
+++ b/src/main/resources/mapper/data/MetaMapper.xml
@@ -36,7 +36,7 @@
</select>
<select id="selectByPage" resultType="com.moon.server.entity.data.MetaEntity">
- select st_astext(geom) "geom",a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
+ select st_astext(geom) "geom", a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName, fn_get_fullname(a.depcode, 1) depName, fn_ver(a.verid) verName, fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
<where>
ismeta between 0 and 1
@@ -73,7 +73,7 @@
</select>
<select id="selectGdbByGuid" resultType="com.moon.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
+ select a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName, fn_get_fullname(a.depcode, 1) depName, fn_ver(a.verid) verName, fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
where type = 'gdb' and guid = #{guid};
</select>
@@ -95,7 +95,7 @@
</select>
<select id="selectMetasForPage" resultType="com.moon.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName,
+ select a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName, fn_get_fullname(a.depcode, 1) depName, fn_ver(a.verid) verName, fn_get_fullname(a.dircode, 2) dirName,
(select coalesce(sum(dcount), 0) from lf.sys_download b inner join lf.sys_meta_down c on b.id = c.downid where c.metaid = a.id) "downCount",
(select fn_uname(download_user) from lf.sys_download b inner join lf.sys_meta_down c on b.id = c.downid where c.metaid = a.id order by download_time desc limit 1) "lastUser",
(select max(download_time) from lf.sys_download b inner join lf.sys_meta_down c on b.id = c.downid where c.metaid = a.id) "lastTime"
@@ -130,7 +130,7 @@
</select>
<select id="selectByPageForUpload" resultType="com.moon.server.entity.data.MetaEntity">
- select st_astext(geom) "geom",a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
+ select st_astext(geom) "geom", fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName, fn_get_fullname(a.depcode, 1) depName, fn_ver(a.verid) verName, fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
<where>
create_user = #{createUser}
@@ -156,7 +156,7 @@
</select>
<select id="selectPageByPid" resultType="com.moon.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
+ select a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName, fn_get_fullname(a.depcode, 1) depName, fn_ver(a.verid) verName, fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
<where>
metaid = #{metaid}
@@ -169,12 +169,12 @@
</select>
<select id="selectById" resultType="com.moon.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
+ select a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName, fn_get_fullname(a.depcode, 1) depName, fn_ver(a.verid) verName, fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a where id = #{id}
</select>
<select id="selectByGuid" resultType="com.moon.server.entity.data.MetaEntity">
- select st_astext(geom) "geom",a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
+ select st_astext(geom) "geom", a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName, fn_get_fullname(a.depcode, 1) depName, fn_ver(a.verid) verName, fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
where guid = #{guid}
<if test="dircode != null">
@@ -187,13 +187,14 @@
</select>
<select id="selectByIdsForTab" resultType="com.moon.server.entity.data.MetaEntity">
- select a.* from lf.sys_meta a
+ select a.*
+ from lf.sys_meta a
where id in (${ids}) and a.tab is not null and a.rows > 0
order by a.tab;
</select>
<select id="selectMetaFiles" resultType="com.moon.server.entity.data.MetaEntity">
- select a.*,fn_uname(a.create_user) uname,fn_get_fullname(a.depcode, 1) depName,fn_ver(a.verid) verName,fn_get_fullname(a.dircode, 2) dirName
+ select a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName, fn_get_fullname(a.depcode, 1) depName, fn_ver(a.verid) verName, fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
where id in
<foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
@@ -214,7 +215,7 @@
</select>
<select id="selectMetasByDirCode" resultType="com.moon.server.entity.data.MetaEntity">
- select a.*, fn_uname(a.create_user) uname, fn_get_fullname(a.depcode, 1) depName, fn_ver(a.verid) verName, fn_get_fullname(a.dircode, 2) dirName
+ select a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName, fn_get_fullname(a.depcode, 1) depName, fn_ver(a.verid) verName, fn_get_fullname(a.dircode, 2) dirName
from lf.sys_meta a
where dircode like #{dircode} and
(type = 'tif' or type = 'tiff' or lower(name) in ('骞抽潰鍥剧储寮曟枃浠�.xlsx', '绌胯法瓒婂湴褰㈠浘.dwg', '涓嚎鎴愭灉琛�.xlsx', '绂绘暎鐐�.xlsx', '鎺у埗鐐�.xlsx', '鍦伴潰绾�.xlsx'))
--
Gitblit v1.9.3