From d2b8e4d2ad5848e251998e2dcde09868cd6153a0 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 31 八月 2023 09:41:40 +0800
Subject: [PATCH] 资源管理添加4个状态查询字段
---
src/main/java/com/moon/server/controller/sys/ResController.java | 10 +++-
src/main/java/com/moon/server/service/sys/ResService.java | 8 ++--
src/main/resources/mapper/sys/ResMapper.xml | 30 ++++++++++++++-
src/main/java/com/moon/server/mapper/sys/ResMapper.java | 20 +++++++---
4 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/sys/ResController.java b/src/main/java/com/moon/server/controller/sys/ResController.java
index 12b9775..e8f6d9b 100644
--- a/src/main/java/com/moon/server/controller/sys/ResController.java
+++ b/src/main/java/com/moon/server/controller/sys/ResController.java
@@ -47,22 +47,26 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "status", value = "鐘舵��", dataType = "Integer", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "category", value = "鏈嶅姟绫诲埆", dataType = "Integer", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "type", value = "鏈嶅姟绫诲瀷", dataType = "Integer", paramType = "query", example = ""),
+ @ApiImplicitParam(name = "data", value = "鏁版嵁绫诲瀷", dataType = "Integer", 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<ResEntity>> selectByPageAndCount(String name, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<ResEntity>> selectByPageAndCount(String name, Integer status, Integer category, Integer type, Integer data, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = resService.selectCount(name);
+ int count = resService.selectCount(name, status, category, type, data);
if (count == 0) {
return success(0, null);
}
- List<ResEntity> rs = resService.selectByPage(name, pageSize, pageSize * (pageIndex - 1));
+ List<ResEntity> rs = resService.selectByPage(name, status, category, type, data, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/moon/server/mapper/sys/ResMapper.java b/src/main/java/com/moon/server/mapper/sys/ResMapper.java
index ae4c5e3..676d5ea 100644
--- a/src/main/java/com/moon/server/mapper/sys/ResMapper.java
+++ b/src/main/java/com/moon/server/mapper/sys/ResMapper.java
@@ -16,20 +16,28 @@
/**
* 鏌ヨ璁板綍鏁�
*
- * @param name 鍚嶇О
+ * @param name 鍚嶇О
+ * @param status 鐘舵��
+ * @param category 鏈嶅姟绫诲埆
+ * @param type 鏈嶅姟绫诲瀷
+ * @param data 鏁版嵁绫诲瀷
* @return 璁板綍鏁�
*/
- public Integer selectCount(String name);
+ public Integer selectCount(String name, Integer status, Integer category, Integer type, Integer data);
/**
* 鍒嗛〉鏌ヨ
*
- * @param name 鍚嶇О
- * @param limit 璁板綍鏁�
- * @param offset 鍋忕Щ閲�
+ * @param name 鍚嶇О
+ * @param status 鐘舵��
+ * @param category 鏈嶅姟绫诲埆
+ * @param type 鏈嶅姟绫诲瀷
+ * @param data 鏁版嵁绫诲瀷
+ * @param limit 璁板綍鏁�
+ * @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<ResEntity> selectByPage(String name, Integer limit, Integer offset);
+ public List<ResEntity> selectByPage(String name, Integer status, Integer category, Integer type, Integer data, Integer limit, Integer offset);
/**
* 鏌ヨ鎵�鏈�
diff --git a/src/main/java/com/moon/server/service/sys/ResService.java b/src/main/java/com/moon/server/service/sys/ResService.java
index a885396..4319c83 100644
--- a/src/main/java/com/moon/server/service/sys/ResService.java
+++ b/src/main/java/com/moon/server/service/sys/ResService.java
@@ -18,17 +18,17 @@
ResMapper resMapper;
@Override
- public Integer selectCount(String name) {
+ public Integer selectCount(String name, Integer status, Integer category, Integer type, Integer data) {
name = StringHelper.getLikeUpperStr(name);
- return resMapper.selectCount(name);
+ return resMapper.selectCount(name, status, category, type, data);
}
@Override
- public List<ResEntity> selectByPage(String name, Integer limit, Integer offset) {
+ public List<ResEntity> selectByPage(String name, Integer status, Integer category, Integer type, Integer data, Integer limit, Integer offset) {
name = StringHelper.getLikeUpperStr(name);
- return resMapper.selectByPage(name, limit, offset);
+ return resMapper.selectByPage(name, status, category, type, data, limit, offset);
}
@Override
diff --git a/src/main/resources/mapper/sys/ResMapper.xml b/src/main/resources/mapper/sys/ResMapper.xml
index 1e901b0..812adac 100644
--- a/src/main/resources/mapper/sys/ResMapper.xml
+++ b/src/main/resources/mapper/sys/ResMapper.xml
@@ -4,8 +4,21 @@
<select id="selectCount" resultType="java.lang.Integer">
select count(*) from lf.sys_res
<where>
+ 1 = 1
<if test="name != null">
- upper(cn_name) like #{name} or upper(en_name) like #{name}
+ and (upper(cn_name) like #{name} or upper(en_name) like #{name})
+ </if>
+ <if test="status != null">
+ and status = #{status}
+ </if>
+ <if test="category != null">
+ and category = #{category}
+ </if>
+ <if test="type != null">
+ and type = #{type}
+ </if>
+ <if test="data != null">
+ and data = #{data}
</if>
</where>
</select>
@@ -13,8 +26,21 @@
<select id="selectByPage" resultType="com.moon.server.entity.sys.ResEntity">
select a.*, fn_uname(a.create_user) createName, fn_uname(a.update_user) updateName from lf.sys_res a
<where>
+ 1 = 1
<if test="name != null">
- upper(cn_name) like #{name} or upper(en_name) like #{name}
+ and (upper(cn_name) like #{name} or upper(en_name) like #{name})
+ </if>
+ <if test="status != null">
+ and status = #{status}
+ </if>
+ <if test="category != null">
+ and category = #{category}
+ </if>
+ <if test="type != null">
+ and type = #{type}
+ </if>
+ <if test="data != null">
+ and data = #{data}
</if>
</where>
order by a.id desc
--
Gitblit v1.9.3