From 42e7d0cbd799a5284127aa33ee957e404e083174 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 22 十二月 2022 19:38:11 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/mapper/data/VerMapper.java | 12 ++--
src/main/java/com/lf/server/service/data/VerService.java | 13 +++-
src/main/java/com/lf/server/controller/data/VerController.java | 48 +--------------
src/main/resources/mapper/data/VerMapper.xml | 27 +++-----
src/main/java/com/lf/server/entity/data/VerEntity.java | 30 ++++++---
5 files changed, 51 insertions(+), 79 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/VerController.java b/src/main/java/com/lf/server/controller/data/VerController.java
index 9cc37c2..99e0dc1 100644
--- a/src/main/java/com/lf/server/controller/data/VerController.java
+++ b/src/main/java/com/lf/server/controller/data/VerController.java
@@ -33,64 +33,26 @@
TokenService tokenService;
@SysLog()
- @ApiOperation(value = "鏌ヨ璁板綍鏁�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "sys_ver"),
- @ApiImplicitParam(name = "depName", value = "鐩綍", dataType = "String", paramType = "query", example = ""),
- })
- @GetMapping({"/selectCount"})
- public ResponseMsg<Integer> selectCount(String name, String depName) {
- try {
- int count = versionService.selectCount(name, depName);
-
- return success(count);
- } catch (Exception ex) {
- return fail(ex.getMessage(), -1);
- }
- }
-
- @SysLog()
- @ApiOperation(value = "鍒嗛〉鏌ヨ")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "sys_ver"),
- @ApiImplicitParam(name = "depName", value = "鐩綍", dataType = "String", paramType = "query", example = "1"),
- @ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
- @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
- })
- @GetMapping(value = "/selectByPage")
- public ResponseMsg<List<VerEntity>> selectByPage(String name, String depName, Integer pageSize, Integer pageIndex) {
- try {
- if (pageSize < 1 || pageIndex < 1) {
- return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
- }
- List<VerEntity> rs = versionService.selectByPage(name, depName, pageSize, pageSize * (pageIndex - 1));
- return success(rs);
- } catch (Exception ex) {
- return fail(ex.getMessage(), null);
- }
- }
-
- @SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
- @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = "1"),
- @ApiImplicitParam(name = "depName", value = "鐩綍", dataType = "String", 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<VerEntity>> selectByPageAndCount(String name, String depName, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<VerEntity>> selectByPageAndCount(Integer dirid, String name, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- int count = versionService.selectCount(name, depName);
+ int count = versionService.selectCount(dirid, name);
if (count == 0) {
return success(0, null);
}
- List<VerEntity> rs = versionService.selectByPage(name, depName, pageSize, pageSize * (pageIndex - 1));
+ List<VerEntity> rs = versionService.selectByPage(dirid, name, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/entity/data/VerEntity.java b/src/main/java/com/lf/server/entity/data/VerEntity.java
index ef99156..1a57e64 100644
--- a/src/main/java/com/lf/server/entity/data/VerEntity.java
+++ b/src/main/java/com/lf/server/entity/data/VerEntity.java
@@ -19,8 +19,6 @@
private String descr;
- private String depName;
-
private int createUser;
private Timestamp createTime;
@@ -28,6 +26,10 @@
private int updateUser;
private Timestamp updateTime;
+
+ private String depName;
+
+ private String createName;
public int getId() {
return id;
@@ -61,14 +63,6 @@
this.descr = descr;
}
- public String getDepName() {
- return depName;
- }
-
- public void setDepName(String depName) {
- this.depName = depName;
- }
-
public int getCreateUser() {
return createUser;
}
@@ -100,4 +94,20 @@
public void setUpdateTime(Timestamp updateTime) {
this.updateTime = updateTime;
}
+
+ public String getDepName() {
+ return depName;
+ }
+
+ public void setDepName(String depName) {
+ this.depName = depName;
+ }
+
+ public String getCreateName() {
+ return createName;
+ }
+
+ public void setCreateName(String createName) {
+ this.createName = createName;
+ }
}
diff --git a/src/main/java/com/lf/server/mapper/data/VerMapper.java b/src/main/java/com/lf/server/mapper/data/VerMapper.java
index 6a8ebbc..c3445e0 100644
--- a/src/main/java/com/lf/server/mapper/data/VerMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/VerMapper.java
@@ -17,22 +17,22 @@
/**
* 鏌ヨ璁板綍鏁�
*
- * @param name 鍚嶇О
- * @param depName 鍚嶇О
+ * @param dirid 鐩綍ID
+ * @param name 鍚嶇О
* @return 璁板綍鏁�
*/
- public Integer selectCount(String name,String depName);
+ public Integer selectCount(Integer dirid, String name);
/**
* 鍒嗛〉鏌ヨ
*
- * @param name 鍚嶇О
- * @param depName 鍚嶇О
+ * @param dirid 鐩綍ID
+ * @param name 鍚嶇О
* @param limit 璁板綍鏁�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<VerEntity> selectByPage(String name, String depName, Integer limit, Integer offset);
+ public List<VerEntity> selectByPage(Integer dirid, String name, Integer limit, Integer offset);
/**
* 鏍规嵁鐩綍ID鏌ヨ鐗堟湰鍒楄〃
diff --git a/src/main/java/com/lf/server/service/data/VerService.java b/src/main/java/com/lf/server/service/data/VerService.java
index 3ff8484..0bf3a24 100644
--- a/src/main/java/com/lf/server/service/data/VerService.java
+++ b/src/main/java/com/lf/server/service/data/VerService.java
@@ -1,6 +1,7 @@
package com.lf.server.service.data;
import com.lf.server.entity.data.VerEntity;
+import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.data.VerMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -18,13 +19,17 @@
VerMapper verMapper;
@Override
- public Integer selectCount(String name,String depName) {
- return verMapper.selectCount(name,depName);
+ public Integer selectCount(Integer dirid, String name) {
+ name = StringHelper.getLikeStr(name);
+
+ return verMapper.selectCount(dirid, name);
}
@Override
- public List<VerEntity> selectByPage(String name, String depName, Integer limit, Integer offset) {
- return verMapper.selectByPage(name,depName, limit, offset);
+ public List<VerEntity> selectByPage(Integer dirid, String name, Integer limit, Integer offset) {
+ name = StringHelper.getLikeStr(name);
+
+ return verMapper.selectByPage(dirid, name, limit, offset);
}
@Override
diff --git a/src/main/resources/mapper/data/VerMapper.xml b/src/main/resources/mapper/data/VerMapper.xml
index 723dde2..77c3fe7 100644
--- a/src/main/resources/mapper/data/VerMapper.xml
+++ b/src/main/resources/mapper/data/VerMapper.xml
@@ -3,33 +3,28 @@
<mapper namespace="com.lf.server.mapper.data.VerMapper">
<!-- 缁熻琛屾暟 -->
<select id="selectCount" resultType="java.lang.Integer">
- select count(*) from lf.sys_ver a inner join lf.sys_dir b
- on a.dirid = b.id
+ select count(*) from lf.sys_ver a
<where>
- 1=1
- <if test="name != null">
- and a.name = #{name}
+ 1 = 1
+ <if test="dirid != null">
+ and a.dirid = ANY(fn_rec_array(#{dirid}, 'dir'))
</if>
-
- <if test="depName != null">
- and b.name = #{depName}
+ <if test="name != null">
+ and a.name like #{name}
</if>
</where>
</select>
<!-- 鍒嗛〉鏌ヨ -->
<select id="selectByPage" resultType="com.lf.server.entity.data.VerEntity">
- select a.*,b.name as dep_name
- from lf.sys_ver a inner join lf.sys_dir b
- on a.dirid = b.id
+ select a.*, fn_rec_query(a.dirid, 'dir') depName, fn_uname(create_user) createName from lf.sys_ver a
<where>
1=1
- <if test="name != null">
- and a.name = #{name}
+ <if test="dirid != null">
+ and a.dirid = ANY(fn_rec_array(#{dirid}, 'dir'))
</if>
-
- <if test="depName != null">
- and b.name = #{depName}
+ <if test="name != null">
+ and a.name like #{name}
</if>
</where>
order by id
--
Gitblit v1.9.3