From 7cba4e1dd5575c57c0a6544a35d17fb03d57cf89 Mon Sep 17 00:00:00 2001
From: xing <xingjs@qq.com>
Date: 星期二, 21 二月 2023 16:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/lf/server/mapper/show/OneMapMapper.java | 1
src/main/java/com/lf/server/controller/data/MetaController.java | 31 +++++++++++++++
src/main/java/com/lf/server/controller/all/BaseQueryController.java | 36 ++++++++++++++++++
src/main/java/com/lf/server/mapper/md/MdgdcgMapper.java | 0
src/main/java/com/lf/server/mapper/md/MdzxcgMapper.java | 0
src/main/java/com/lf/server/service/data/MetaService.java | 13 +++++-
data/update.sql | 3 +
src/main/java/com/lf/server/mapper/data/MetaMapper.java | 17 +++++++-
src/main/resources/mapper/data/MetaMapper.xml | 19 +++++++++
9 files changed, 114 insertions(+), 6 deletions(-)
diff --git a/data/update.sql b/data/update.sql
index 8a5108e..80665e5 100644
--- a/data/update.sql
+++ b/data/update.sql
@@ -224,7 +224,8 @@
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
diff --git a/src/main/java/com/lf/server/controller/all/BaseQueryController.java b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
index c16bbaf..96002cf 100644
--- a/src/main/java/com/lf/server/controller/all/BaseQueryController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseQueryController.java
@@ -13,6 +13,7 @@
import com.lf.server.entity.data.DictEntity;
import com.lf.server.entity.data.DomainEntity;
import com.lf.server.entity.data.DownloadEntity;
+import com.lf.server.entity.data.MetaEntity;
import com.lf.server.entity.sys.AttachEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.AesHelper;
@@ -22,6 +23,7 @@
import com.lf.server.mapper.all.GeomBaseMapper;
import com.lf.server.service.all.BaseQueryService;
import com.lf.server.service.data.DownloadService;
+import com.lf.server.service.data.MetaService;
import com.lf.server.service.show.DataLibService;
import com.lf.server.service.sys.AttachService;
import com.lf.server.service.sys.DepService;
@@ -49,6 +51,9 @@
@Autowired
DepService depService;
+
+ @Autowired
+ MetaService metaService;
@Autowired
DataLibService dataLibService;
@@ -131,6 +136,37 @@
}
@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 = "鏍规嵁ID鏌ヨWKT")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "鏄犲皠鍚嶇О", dataType = "String", paramType = "query", example = "dlgagnp"),
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 79d1831..2658252 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -94,6 +94,37 @@
}
@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 = "鏍规嵁鐩綍ID鏌ヨ鐗堟湰鍒楄〃")
@ApiImplicitParams({
@ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query")
diff --git a/src/main/java/com/lf/server/mapper/data/MetaMapper.java b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
index cd37b48..129db33 100644
--- a/src/main/java/com/lf/server/mapper/data/MetaMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
@@ -82,11 +82,24 @@
public List<MetaEntity> selectByPageForUpload(String name, Integer createUser, String types, Integer limit, Integer offset);
/**
- * 鏌ヨ鎵�鏈�
+ * 鏍规嵁鐖禝D鏌ヨ璁板綍鏁�
*
+ * @param metaid
+ * @param name
* @return
*/
- public List<MetaEntity> selectAll();
+ public Integer selectCountByPid(Integer metaid, String name);
+
+ /**
+ * 鏍规嵁鐖禝D鍒嗛〉鏌ヨ
+ *
+ * @param metaid
+ * @param name
+ * @param limit
+ * @param offset
+ * @return
+ */
+ public List<MetaEntity> selectPageByPid(Integer metaid, String name, Integer limit, Integer offset);
/**
* 鏍规嵁ID鏌ヨ
diff --git a/src/main/java/com/lf/server/mapper/md/MdGdcgMapper.java b/src/main/java/com/lf/server/mapper/md/MdgdcgMapper.java
similarity index 100%
rename from src/main/java/com/lf/server/mapper/md/MdGdcgMapper.java
rename to src/main/java/com/lf/server/mapper/md/MdgdcgMapper.java
diff --git a/src/main/java/com/lf/server/mapper/md/MdZxcgMapper.java b/src/main/java/com/lf/server/mapper/md/MdzxcgMapper.java
similarity index 100%
rename from src/main/java/com/lf/server/mapper/md/MdZxcgMapper.java
rename to src/main/java/com/lf/server/mapper/md/MdzxcgMapper.java
diff --git a/src/main/java/com/lf/server/mapper/show/OneMapMapper.java b/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
index 2bd6dfe..f64912c 100644
--- a/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
+++ b/src/main/java/com/lf/server/mapper/show/OneMapMapper.java
@@ -101,6 +101,7 @@
/**
* 鏌ヨ琛ㄤ俊鎭�
*
+ * @param tableName
* @return {@link List}<{@link String}>
*/
public List<String> queryTableInfo(@Param("tableName") String tableName);
diff --git a/src/main/java/com/lf/server/service/data/MetaService.java b/src/main/java/com/lf/server/service/data/MetaService.java
index 97faf79..73598d8 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -66,8 +66,17 @@
}
@Override
- public List<MetaEntity> selectAll() {
- return metaMapper.selectAll();
+ public Integer selectCountByPid(Integer metaid, String name) {
+ name = StringHelper.getLikeStr(name);
+
+ return metaMapper.selectCountByPid(metaid, name);
+ }
+
+ @Override
+ public List<MetaEntity> selectPageByPid(Integer metaid, String name, Integer limit, Integer offset) {
+ name = StringHelper.getLikeStr(name);
+
+ return metaMapper.selectPageByPid(metaid, name, limit, offset);
}
@Override
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index b491e64..0756411 100644
--- a/src/main/resources/mapper/data/MetaMapper.xml
+++ b/src/main/resources/mapper/data/MetaMapper.xml
@@ -106,10 +106,27 @@
limit #{limit} offset #{offset}
</select>
- <select id="selectAll" resultType="com.lf.server.entity.data.MetaEntity">
+ <select id="selectCountByPid" resultType="java.lang.Integer">
+ select count(*) from lf.sys_meta
+ <where>
+ metaid = #{metaid}
+ <if test="name != null">
+ and name like #{name}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectPageByPid" resultType="com.lf.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
from lf.sys_meta a
+ <where>
+ metaid = #{metaid}
+ <if test="name != null">
+ and name like #{name}
+ </if>
+ </where>
order by id desc
+ limit #{limit} offset #{offset}
</select>
<select id="selectById" resultType="com.lf.server.entity.data.MetaEntity">
--
Gitblit v1.9.3