From 1a94cba1e248953613aea99496fae4222cafaaae Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 22 十二月 2022 13:34:01 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/controller/data/MetaController.java | 7 ++++---
src/main/java/com/lf/server/service/data/MetaService.java | 8 ++++----
src/main/java/com/lf/server/mapper/data/MetaMapper.java | 6 ++++--
src/main/java/com/lf/server/controller/show/DataLibController.java | 7 ++++---
src/main/resources/mapper/data/MetaMapper.xml | 10 ++++++++--
5 files changed, 24 insertions(+), 14 deletions(-)
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 d4bd77e..793b1f4 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -58,24 +58,25 @@
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
+ @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "10"),
@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 = "/selectByPageAndCount")
- public ResponseMsg<List<MetaEntity>> selectByPageAndCount(Integer dirid, String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<MetaEntity>> selectByPageAndCount(Integer depid, Integer dirid, String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = metaService.selectCount(dirid, name);
+ int count = metaService.selectCount(depid, dirid, name);
if (count == 0) {
return success(0, null);
}
- List<MetaEntity> rs = metaService.selectByPage(dirid, name, pageSize, pageSize * (pageIndex - 1));
+ List<MetaEntity> rs = metaService.selectByPage(depid, dirid, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
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 c27c7e3..5146b2f 100644
--- a/src/main/java/com/lf/server/controller/show/DataLibController.java
+++ b/src/main/java/com/lf/server/controller/show/DataLibController.java
@@ -62,24 +62,25 @@
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
@ApiImplicitParams({
+ @ApiImplicitParam(name = "depid", value = "鍗曚綅ID", dataType = "Integer", paramType = "query", example = "1"),
@ApiImplicitParam(name = "dirid", value = "鐩綍ID", dataType = "Integer", paramType = "query", example = "10"),
@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 = "/selectByPageForMeta")
- public ResponseMsg<List<MetaEntity>> selectByPageForMeta(Integer dirid, String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<MetaEntity>> selectByPageForMeta(Integer depid, Integer dirid, String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = metaService.selectCount(dirid, name);
+ int count = metaService.selectCount(depid, dirid, name);
if (count == 0) {
return success(0, null);
}
- List<MetaEntity> rs = metaService.selectByPage(dirid, name, pageSize, pageSize * (pageIndex - 1));
+ List<MetaEntity> rs = metaService.selectByPage(depid, dirid, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
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 bcbe714..d997bad 100644
--- a/src/main/java/com/lf/server/mapper/data/MetaMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
@@ -17,22 +17,24 @@
/**
* 鏌ヨ璁板綍鏁�
*
+ * @param depid 鍗曚綅ID
* @param dirid 鐩綍ID
* @param name 鍚嶇О
* @return 璁板綍鏁�
*/
- public Integer selectCount(Integer dirid, String name);
+ public Integer selectCount(Integer depid, Integer dirid, String name);
/**
* 鍒嗛〉鏌ヨ
*
+ * @param depid 鍗曚綅ID
* @param dirid 鐩綍ID
* @param name 鍚嶇О
* @param limit 璁板綍鏁�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<MetaEntity> selectByPage(Integer dirid, String name, Integer limit, Integer offset);
+ public List<MetaEntity> selectByPage(Integer depid, Integer dirid, String name, Integer limit, Integer offset);
/**
* 鏌ヨ涓婁紶璁板綍鏁�
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 c4f85a8..bc8d000 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -19,17 +19,17 @@
MetaMapper metaMapper;
@Override
- public Integer selectCount(Integer dirid, String name) {
+ public Integer selectCount(Integer depid, Integer dirid, String name) {
name = StringHelper.getLikeStr(name);
- return metaMapper.selectCount(dirid, name);
+ return metaMapper.selectCount(depid, dirid, name);
}
@Override
- public List<MetaEntity> selectByPage(Integer dirid, String name, Integer limit, Integer offset) {
+ public List<MetaEntity> selectByPage(Integer depid, Integer dirid, String name, Integer limit, Integer offset) {
name = StringHelper.getLikeStr(name);
- return metaMapper.selectByPage(dirid, name, limit, offset);
+ return metaMapper.selectByPage(depid, dirid, name, limit, offset);
}
@Override
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index f3a0d8f..8b70eaf 100644
--- a/src/main/resources/mapper/data/MetaMapper.xml
+++ b/src/main/resources/mapper/data/MetaMapper.xml
@@ -5,8 +5,11 @@
select count(*) from lf.sys_meta
<where>
1 = 1
+ <if test="depid != null">
+ and depid = ANY(fn_rec_array(#{depid}, 'dep'))
+ </if>
<if test="dirid != null">
- and dirid = #{dirid}
+ and dirid = ANY(fn_rec_array(#{dirid}, 'dir'))
</if>
<if test="name != null">
and name like #{name}
@@ -19,8 +22,11 @@
from lf.sys_meta a
<where>
1 = 1
+ <if test="depid != null">
+ and depid = ANY(fn_rec_array(#{depid},'dep'))
+ </if>
<if test="dirid != null">
- and dirid = #{dirid}
+ and dirid = ANY(fn_rec_array(#{dirid},'dir'))
</if>
<if test="name != null">
and name like #{name}
--
Gitblit v1.9.3