From be9f8d7bf1f675def1c280e944ef3c5abb63ac13 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 08 十月 2022 12:35:25 +0800
Subject: [PATCH] 1
---
data/db.sql | 2
src/main/java/com/lf/server/mapper/data/DirMapper.java | 3 +
src/main/resources/mapper/data/DirMapper.xml | 8 ++--
src/main/resources/mapper/sys/DepMapper.xml | 6 +-
src/main/java/com/lf/server/mapper/sys/DepMapper.java | 2
src/main/java/com/lf/server/controller/data/DirController.java | 15 +++++--
src/main/java/com/lf/server/service/sys/DepService.java | 4 +-
src/main/java/com/lf/server/controller/sys/DepController.java | 15 +++++--
src/main/java/com/lf/server/controller/sys/MenusController.java | 2 -
src/main/resources/mapper/sys/MenusMapper.xml | 2
src/main/java/com/lf/server/service/data/DirService.java | 4 +-
11 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/data/db.sql b/data/db.sql
index a2d9166..2ee7acc 100644
--- a/data/db.sql
+++ b/data/db.sql
@@ -930,7 +930,7 @@
)
select * FROM rs order by order_num;
--------------------------------------------------------- 鏌ヨ鍗曚綅
-select * from lf.sys_dep order by order_num;;
+select * from lf.sys_dep order by order_num;
with recursive rs as(
select * from lf.sys_dep where name='涓浗鐭虫补澶╃劧姘旂閬撳伐绋嬫湁闄愬叕鍙�'
diff --git a/src/main/java/com/lf/server/controller/data/DirController.java b/src/main/java/com/lf/server/controller/data/DirController.java
index bb735e7..cb6a1ee 100644
--- a/src/main/java/com/lf/server/controller/data/DirController.java
+++ b/src/main/java/com/lf/server/controller/data/DirController.java
@@ -4,6 +4,7 @@
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.data.DirEntity;
+import com.lf.server.helper.StringHelper;
import com.lf.server.service.data.DirService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -129,9 +130,6 @@
}
}
-
-
-
@SysLog()
@ApiOperation(value = "鏍规嵁ID鏌ヨ鏁版嵁")
@ApiImplicitParams({
@@ -162,10 +160,17 @@
@SysLog()
@ApiOperation(value = "閫掑綊鏌ヨ鏁版嵁")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鐩綍鍚嶇О", dataType = "String", paramType = "query", required = false, example = "涓縿涓滅嚎绠￠亾宸ョ▼鍗楁")
+ })
@GetMapping(value = "/selectDirRecursive")
- public ResponseMsg<List<DirEntity>> selectDirRecursive() {
+ public ResponseMsg<List<DirEntity>> selectDirRecursive(String name) {
try {
- List<DirEntity> list = dirService.selectDirRecursive();
+ if (StringHelper.isEmpty(name)) {
+ name = "涓縿涓滅嚎绠￠亾宸ョ▼鍗楁";
+ }
+ List<DirEntity> list = dirService.selectDirRecursive(name);
+
return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
diff --git a/src/main/java/com/lf/server/controller/sys/DepController.java b/src/main/java/com/lf/server/controller/sys/DepController.java
index b4d4725..8cb2ccf 100644
--- a/src/main/java/com/lf/server/controller/sys/DepController.java
+++ b/src/main/java/com/lf/server/controller/sys/DepController.java
@@ -4,7 +4,7 @@
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.sys.DepEntity;
-import com.lf.server.entity.sys.MenusEntity;
+import com.lf.server.helper.StringHelper;
import com.lf.server.service.sys.DepService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -20,7 +20,6 @@
* @author sws
* @date 2022-09-23
*/
-
@Api(tags = "杩愮淮绠＄悊\\鍗曚綅绠＄悊")
@RestController
@RequestMapping("/dep")
@@ -156,12 +155,20 @@
return fail(ex.getMessage(), null);
}
}
+
@SysLog()
@ApiOperation(value = "閫掑綊鏌ヨ")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鍗曚綅鍚嶇О", dataType = "String", paramType = "query", required = false, example = "涓浗鐭虫补澶╃劧姘旂閬撳伐绋嬫湁闄愬叕鍙�")
+ })
@GetMapping(value = "/selectDepRecursive")
- public ResponseMsg<List<DepEntity>> selectDepRecursive() {
+ public ResponseMsg<List<DepEntity>> selectDepRecursive(String name) {
try {
- List<DepEntity> list = depService.selectDepRecursive();
+ if (StringHelper.isEmpty(name)) {
+ name = "涓浗鐭虫补澶╃劧姘旂閬撳伐绋嬫湁闄愬叕鍙�";
+ }
+ List<DepEntity> list = depService.selectDepRecursive(name);
+
return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
diff --git a/src/main/java/com/lf/server/controller/sys/MenusController.java b/src/main/java/com/lf/server/controller/sys/MenusController.java
index 76ae878..865ee28 100644
--- a/src/main/java/com/lf/server/controller/sys/MenusController.java
+++ b/src/main/java/com/lf/server/controller/sys/MenusController.java
@@ -21,7 +21,6 @@
* @author sws
* @date 2022-09-23
*/
-
@Api(tags= "杩愮淮绠＄悊\\鑿滃崟绠＄悊")
@RestController
@RequestMapping("/Menu")
@@ -158,7 +157,6 @@
return fail(ex.getMessage(), null);
}
}
-
@SysLog()
@ApiOperation(value = "閫掑綊鏌ヨ鏁版嵁")
diff --git a/src/main/java/com/lf/server/mapper/data/DirMapper.java b/src/main/java/com/lf/server/mapper/data/DirMapper.java
index a8ea0b3..57510de 100644
--- a/src/main/java/com/lf/server/mapper/data/DirMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/DirMapper.java
@@ -73,7 +73,8 @@
/**
* 閫掑綊鏌ヨ
+ * @param name
* @return
*/
- public List<DirEntity> selectDirRecursive();
+ public List<DirEntity> selectDirRecursive(String name);
}
diff --git a/src/main/java/com/lf/server/mapper/sys/DepMapper.java b/src/main/java/com/lf/server/mapper/sys/DepMapper.java
index 3110901..4e3eb7b 100644
--- a/src/main/java/com/lf/server/mapper/sys/DepMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/DepMapper.java
@@ -73,5 +73,5 @@
* 閫掑綊鏌ヨ
* @return
*/
- public List<DepEntity> selectDepRecursive();
+ public List<DepEntity> selectDepRecursive(String name);
}
diff --git a/src/main/java/com/lf/server/service/data/DirService.java b/src/main/java/com/lf/server/service/data/DirService.java
index 27da960..c170b97 100644
--- a/src/main/java/com/lf/server/service/data/DirService.java
+++ b/src/main/java/com/lf/server/service/data/DirService.java
@@ -59,7 +59,7 @@
}
@Override
- public List<DirEntity> selectDirRecursive() {
- return dirMapper.selectDirRecursive();
+ public List<DirEntity> selectDirRecursive(String name) {
+ return dirMapper.selectDirRecursive(name);
}
}
diff --git a/src/main/java/com/lf/server/service/sys/DepService.java b/src/main/java/com/lf/server/service/sys/DepService.java
index 6492bb5..31500454 100644
--- a/src/main/java/com/lf/server/service/sys/DepService.java
+++ b/src/main/java/com/lf/server/service/sys/DepService.java
@@ -60,7 +60,7 @@
}
@Override
- public List<DepEntity> selectDepRecursive() {
- return depMapper.selectDepRecursive();
+ public List<DepEntity> selectDepRecursive(String name) {
+ return depMapper.selectDepRecursive(name);
}
}
\ No newline at end of file
diff --git a/src/main/resources/mapper/data/DirMapper.xml b/src/main/resources/mapper/data/DirMapper.xml
index f608f53..2e3aadb 100644
--- a/src/main/resources/mapper/data/DirMapper.xml
+++ b/src/main/resources/mapper/data/DirMapper.xml
@@ -20,7 +20,7 @@
<select id="selectDirRecursive" resultMap="resultMap" resultType="com.lf.server.entity.data.DirEntity">
with recursive rs as(
- select * from lf.sys_dir where name='涓縿涓滅嚎绠￠亾宸ョ▼鍗楁'
+ select * from lf.sys_dir where name=#{name}
union
select a.* from lf.sys_dir a, rs b where a.pid=b.id
)
@@ -58,16 +58,16 @@
<update id="updateDir">
update lf.sys_dir set pid=#{pid},name=#{name},code=#{code},descr=#{descr},level=#{level},order_num=#{orderNum},
- update_user=#{updateUser}, update_time=now(),bak=#{bak} where id=#{id}
+ update_user=#{updateUser},update_time=now(),bak=#{bak} where id=#{id}
</update>
<update id="updateDirs">
- <foreach collection="list" item="item" index="index" separator="," >
+ <foreach collection="list" item="item" index="index" separator=";">
update lf.sys_dir
<set>
pid=#{item.pid},name=#{item.name},code=#{item.code},descr=#{item.descr},level=#{item.level},
- order_num=#{item.orderNum},update_user=#{item.updateUser}, update_time=now(),bak=#{item.bak}
+ order_num=#{item.orderNum},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak}
</set>
where id = #{item.id}
</foreach>
diff --git a/src/main/resources/mapper/sys/DepMapper.xml b/src/main/resources/mapper/sys/DepMapper.xml
index ece592a..3ace895 100644
--- a/src/main/resources/mapper/sys/DepMapper.xml
+++ b/src/main/resources/mapper/sys/DepMapper.xml
@@ -15,7 +15,7 @@
<select id="selectDepRecursive" resultMap="resultMap" resultType="com.lf.server.entity.sys.DepEntity">
with recursive rs as(
- select * from lf.sys_dep where name='涓浗鐭虫补澶╃劧姘旂閬撳伐绋嬫湁闄愬叕鍙�'
+ select * from lf.sys_dep where name=#{name}
union
select a.* from lf.sys_dep a, rs b where a.pid=b.id
)
@@ -62,11 +62,11 @@
</update>
<update id="updateDeps">
- <foreach collection="list" item="item" index="index" separator="," >
+ <foreach collection="list" item="item" index="index" separator=";">
update lf.sys_menu
<set>
pid=#{item.pid},name=#{item.name},sname=#{item.sname},code=#{item.code},uncode=#{item.uncode},addr=#{item.addr},contact=#{item.contact},
- fax=#{item.fax},email=#{item.email},post=#{item.post},website=#{item.website},level=#{item.level},order_num =#{item.orderNum},
+ fax=#{item.fax},email=#{item.email},post=#{item.post},website=#{item.website},level=#{item.level},order_num=#{item.orderNum},
update_user=#{item.updateUser},update_time=now(),bak=#{item.bak}
</set>
where id = #{item.id}
diff --git a/src/main/resources/mapper/sys/MenusMapper.xml b/src/main/resources/mapper/sys/MenusMapper.xml
index 65d2e30..fb87217 100644
--- a/src/main/resources/mapper/sys/MenusMapper.xml
+++ b/src/main/resources/mapper/sys/MenusMapper.xml
@@ -65,7 +65,7 @@
</update>
<update id="updateMenus">
- <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+ <foreach collection="list" item="item" index="index" separator=";">
update lf.sys_menu
<set>
pid=#{item.pid},cn_name=#{item.cnName},en_name=#{item.enName},url=#{item.url},perms=#{item.perms},type=#{item.type},
--
Gitblit v1.9.3