Skip to content

Commit dd88df7

Browse files
lmxdawnlmxdawn
committed
优化
1 parent 7b9ed39 commit dd88df7

File tree

8 files changed

+149
-2
lines changed

8 files changed

+149
-2
lines changed

‎admin-api/src/main/java/com/lmxdawn/admin/controller/admin/auth/AuthPermissionRuleController.java

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package com.lmxdawn.admin.controller.admin.auth;
2+
3+
import com.lmxdawn.admin.annotation.AdminAuthRuleAnnotation;
4+
import com.lmxdawn.admin.entity.auth.AuthPermissionRule;
5+
import com.lmxdawn.admin.service.auth.AuthPermissionRuleService;
6+
import com.lmxdawn.admin.vo.ResultVO;
7+
import org.springframework.web.bind.annotation.PostMapping;
8+
import org.springframework.web.bind.annotation.RequestParam;
9+
10+
import javax.annotation.Resource;
11+
import java.util.List;
12+
import java.util.Map;
13+
14+
/**
15+
* 权限规则相关
16+
*/
17+
public class AuthPermissionRuleController {
18+
19+
@Resource
20+
private AuthPermissionRuleService authPermissionRuleService;
21+
22+
@AdminAuthRuleAnnotation("/admin/auth/permission_rule/index")
23+
@PostMapping("/admin/auth/permission_rule/index")
24+
public ResultVO index(@RequestParam(value = "status", required = false) Integer status,
25+
@RequestParam(value = "name", required = false) String name,
26+
Map<String,Object> map) {
27+
map.put("status", status);
28+
map.put("name", name);
29+
30+
List<AuthPermissionRule> authPermissionRuleList = authPermissionRuleService.listAll(map);
31+
32+
33+
return null;
34+
}
35+
36+
37+
}

‎admin-api/src/main/java/com/lmxdawn/admin/dao/auth/AuthPermissionRuleDao.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.apache.ibatis.annotations.Mapper;
55

66
import java.util.List;
7+
import java.util.Map;
78

89

910
@Mapper
@@ -15,5 +16,12 @@ public interface AuthPermissionRuleDao {
1516
* @return
1617
*/
1718
List<AuthPermissionRule> listByIdIn(List<Long> ids);
18-
19+
20+
/**
21+
* 查询所有
22+
* @param map
23+
* @return
24+
*/
25+
List<AuthPermissionRule> listAll(Map<String,Object> map);
26+
1927
}

‎admin-api/src/main/java/com/lmxdawn/admin/service/auth/AuthPermissionRuleService.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44
import com.lmxdawn.admin.entity.auth.AuthPermissionRule;
55

66
import java.util.List;
7+
import java.util.Map;
78

89
public interface AuthPermissionRuleService {
910

1011

1112
List<AuthPermissionRule> listByIdIn(List<Long> ids);
1213

14+
15+
List<AuthPermissionRule> listAll(Map<String,Object> map);
16+
1317
}

‎admin-api/src/main/java/com/lmxdawn/admin/service/auth/impl/AuthPermissionRuleServiceImpl.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import javax.annotation.Resource;
99
import java.util.List;
10+
import java.util.Map;
1011

1112
/**
1213
*
@@ -17,8 +18,23 @@ public class AuthPermissionRuleServiceImpl implements AuthPermissionRuleService
1718
@Resource
1819
private AuthPermissionRuleDao authPermissionRuleDao;
1920

21+
/**
22+
* 根据多个id查询
23+
* @param ids
24+
* @return
25+
*/
2026
@Override
2127
public List<AuthPermissionRule> listByIdIn(List<Long> ids) {
2228
return authPermissionRuleDao.listByIdIn(ids);
2329
}
30+
31+
/**
32+
* 查询所有
33+
* @param map
34+
* @return
35+
*/
36+
@Override
37+
public List<AuthPermissionRule> listAll(Map<String, Object> map) {
38+
return authPermissionRuleDao.listAll(map);
39+
}
2440
}

‎admin-api/src/main/java/com/lmxdawn/admin/utils/TreeUtils.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.lmxdawn.admin.utils;
2+
3+
/**
4+
* 树形结构工具类
5+
*/
6+
public class TreeUtils {
7+
8+
public static void Merge() {
9+
10+
}
11+
12+
}

‎admin-api/src/main/java/com/lmxdawn/admin/vo/admin/auth/AdminAuthPermissionRuleMergeVO.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.lmxdawn.admin.vo.admin.auth;
2+
3+
import lombok.Data;
4+
5+
import java.util.List;
6+
7+
/**
8+
* 权限列表整合为多维数组的视图
9+
*/
10+
@Data
11+
public class AdminAuthPermissionRuleMergeVO {
12+
13+
private Long id;
14+
private Long pid;
15+
private String name;
16+
private String title;
17+
private Long status;
18+
private String condition;
19+
private Long listorder;
20+
21+
private List<AdminAuthPermissionRuleMergeVO> children;
22+
23+
}

‎admin-api/src/main/resources/mybatis/mapper/AuthPermissionRuleDao.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,25 @@
44
<mapper namespace="com.lmxdawn.admin.dao.auth.AuthPermissionRuleDao" >
55

66
<select id="listByIdIn" resultType="com.lmxdawn.admin.entity.auth.AuthPermissionRule">
7-
SELECT name
7+
SELECT `name`
88
FROM auth_permission_rule
99
where id IN
1010
<foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
1111
#{id}
1212
</foreach>
1313
</select>
1414

15+
<select id="listAll" resultType="com.lmxdawn.admin.entity.auth.AuthPermissionRule">
16+
SELECT `id`,`pid`,`name`,`title`,`status`,`condition`,`listorder`
17+
FROM auth_permission_rule
18+
<where>
19+
<if test="status != null">
20+
AND status = #{status}
21+
</if>
22+
<if test="name != null and '' != name">
23+
AND name LIKE CONCAT(#{name},'%')
24+
</if>
25+
</where>
26+
</select>
27+
1528
</mapper>

‎admin-api/src/test/com/lmxdawn/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package com.lmxdawn.admin.service.auth.impl;
2+
3+
import com.lmxdawn.admin.BaseAdminApplicationTest;
4+
import com.lmxdawn.admin.entity.auth.AuthPermissionRule;
5+
import com.lmxdawn.admin.service.auth.AuthPermissionRuleService;
6+
import org.junit.Test;
7+
8+
import javax.annotation.Resource;
9+
10+
import java.util.HashMap;
11+
import java.util.List;
12+
import java.util.Map;
13+
14+
import static org.junit.Assert.*;
15+
16+
public class AuthPermissionRuleServiceImplTest extends BaseAdminApplicationTest {
17+
18+
@Resource
19+
private AuthPermissionRuleService authPermissionRuleService;
20+
21+
@Test
22+
public void listByIdIn() {
23+
}
24+
25+
@Test
26+
public void listAll() {
27+
28+
Map<String,Object> map = new HashMap<>();
29+
map.put("status", 1);
30+
List<AuthPermissionRule> authPermissionRuleList = authPermissionRuleService.listAll(map);
31+
32+
assertTrue(authPermissionRuleList.size() > 0);
33+
}
34+
}

0 commit comments

Comments
 (0)