Skip to content

Commit 611e110

Browse files
lmxdawnlmxdawn
committed
新增管理员管理API
1 parent ce7c1af commit 611e110

File tree

55 files changed

+804
-288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+804
-288
lines changed

‎admin-api/src/main/java/com/lmxdawn/admin/aspect/AdminAuthorizeAspect.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.lmxdawn.admin.annotation.AdminAuthRuleAnnotation;
44
import com.lmxdawn.admin.enums.ResultEnum;
55
import com.lmxdawn.admin.exception.JsonException;
6-
import com.lmxdawn.admin.utils.JwtUtil;
6+
import com.lmxdawn.admin.utils.JwtUtils;
77
import io.jsonwebtoken.Claims;
88
import lombok.extern.slf4j.Slf4j;
99
import org.aspectj.lang.JoinPoint;
@@ -49,7 +49,7 @@ public void doAdminAuthVerify(JoinPoint joinPoint) {
4949
}
5050

5151
// 验证 token
52-
Claims claims = JwtUtil.parse(token);
52+
Claims claims = JwtUtils.parse(token);
5353
if (claims == null || !id.equals(String.valueOf(claims.get("admin_id")))) {
5454
throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
5555
}

‎admin-api/src/main/java/com/lmxdawn/admin/config/PageHelperConfig.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.lmxdawn.admin.config;
2+
3+
import com.github.pagehelper.PageHelper;
4+
import org.springframework.context.annotation.Bean;
5+
import org.springframework.context.annotation.Configuration;
6+
7+
import java.util.Properties;
8+
9+
@Configuration
10+
public class PageHelperConfig {
11+
12+
/**
13+
* 注入pagehelper配置
14+
*
15+
* @return
16+
*/
17+
@Bean
18+
public PageHelper getPageHelper() {
19+
PageHelper pageHelper = new PageHelper();
20+
Properties properties = new Properties();
21+
properties.setProperty("helperDialect", "mysql");
22+
properties.setProperty("reasonable", "true");
23+
properties.setProperty("supportMethodsArguments", "true");
24+
properties.setProperty("params", "count=countSql");
25+
pageHelper.setProperties(properties);
26+
return pageHelper;
27+
}
28+
29+
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.lmxdawn.admin.controller;
22

3-
import com.lmxdawn.admin.entity.AuthAdmin;
4-
import com.lmxdawn.admin.service.admin.AuthAdminService;
5-
import com.lmxdawn.admin.utils.ResultVOUtil;
3+
import com.lmxdawn.admin.entity.auth.AuthAdmin;
4+
import com.lmxdawn.admin.service.auth.AuthAdminService;
5+
import com.lmxdawn.admin.utils.ResultVOUtils;
66
import com.lmxdawn.admin.vo.PageSimpleVO;
77
import com.lmxdawn.admin.vo.ResultVO;
88
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,9 +21,9 @@ public ResultVO hello(
2121
@RequestParam(value = "offset") Integer offset
2222
, @RequestParam("offset") Integer limit
2323
) {
24-
PageSimpleVO<AuthAdmin> authAdminPageSimpleVO = authAdminService.findByPage(null, offset, limit);
25-
return ResultVOUtil.error(1, "ssss");
26-
// return ResultVOUtil.success(authAdminPageSimpleVO);
24+
PageSimpleVO<AuthAdmin> authAdminPageSimpleVO = authAdminService.listAdminPage(0,1, null);
25+
return ResultVOUtils.error(1, "ssss");
26+
// return ResultVOUtils.success(authAdminPageSimpleVO);
2727
}
2828

2929
}

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

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
package com.lmxdawn.admin.controller.admin.auth;
2+
3+
import com.lmxdawn.admin.entity.auth.AuthAdmin;
4+
import com.lmxdawn.admin.enums.ResultEnum;
5+
import com.lmxdawn.admin.form.admin.auth.AuthAdminForm;
6+
import com.lmxdawn.admin.service.auth.AuthAdminService;
7+
import com.lmxdawn.admin.service.auth.AuthRoleService;
8+
import com.lmxdawn.admin.utils.ResultVOUtils;
9+
import com.lmxdawn.admin.vo.ResultVO;
10+
import org.springframework.beans.BeanUtils;
11+
import org.springframework.validation.BindingResult;
12+
import org.springframework.web.bind.annotation.*;
13+
14+
import javax.annotation.Resource;
15+
import javax.validation.Valid;
16+
import java.util.Date;
17+
import java.util.HashMap;
18+
import java.util.Map;
19+
20+
/**
21+
* 管理员相关
22+
*/
23+
@RestController
24+
public class AuthAdminController {
25+
26+
@Resource
27+
private AuthAdminService authAdminService;
28+
29+
@Resource
30+
private AuthRoleService authRoleService;
31+
32+
/**
33+
* 获取管理员列表
34+
*/
35+
@GetMapping("/admin/auth/admin/index")
36+
public ResultVO index(@RequestParam(value = "page",defaultValue = "1") Integer page,
37+
@RequestParam(value = "limit",defaultValue = "20") Integer limit,
38+
@RequestParam(value = "status", required = false) Integer status,
39+
@RequestParam(value = "username", required = false) String username,
40+
@RequestParam(value = "role_id", required = false) Long roleId) {
41+
42+
Map<String, Object> map = new HashMap<>();
43+
map.put("status", status);
44+
map.put("username", username);
45+
map.put("role_id", roleId);
46+
47+
return ResultVOUtils.success(authAdminService.listAdminPage(page, limit, map));
48+
49+
}
50+
51+
52+
53+
/**
54+
* 获取角色列表
55+
*/
56+
@GetMapping("/admin/auth/admin/roleList")
57+
public ResultVO roleList(@RequestParam(value = "page",defaultValue = "1") Integer page,
58+
@RequestParam(value = "limit",defaultValue = "50") Integer limit,
59+
Map<String, Object> map) {
60+
61+
return ResultVOUtils.success(authRoleService.listAuthAdminRolePage(page, limit, map));
62+
63+
}
64+
65+
66+
/**
67+
* 新增
68+
* @return
69+
*/
70+
@PostMapping("/admin/auth/admin/save")
71+
public ResultVO save(@RequestBody @Valid AuthAdminForm authAdminForm,
72+
BindingResult bindingResult) {
73+
74+
if (bindingResult.hasErrors()) {
75+
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
76+
}
77+
78+
AuthAdmin authAdmin = new AuthAdmin();
79+
BeanUtils.copyProperties(authAdminForm, authAdmin);
80+
81+
authAdminService.insertAuthAdmin(authAdmin);
82+
return ResultVOUtils.success(authAdmin);
83+
}
84+
85+
86+
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import com.lmxdawn.admin.annotation.AdminAuthRuleAnnotation;
44
import com.lmxdawn.admin.enums.ResultEnum;
5-
import com.lmxdawn.admin.form.admin.LoginForm;
6-
import com.lmxdawn.admin.form.admin.UpdatePasswordForm;
7-
import com.lmxdawn.admin.service.admin.AuthLoginService;
8-
import com.lmxdawn.admin.utils.ResultVOUtil;
5+
import com.lmxdawn.admin.form.admin.auth.LoginForm;
6+
import com.lmxdawn.admin.form.admin.auth.UpdatePasswordForm;
7+
import com.lmxdawn.admin.service.auth.AuthLoginService;
8+
import com.lmxdawn.admin.utils.ResultVOUtils;
99
import com.lmxdawn.admin.vo.ResultVO;
1010
import lombok.extern.slf4j.Slf4j;
1111
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,10 +36,10 @@ public class LoginController {
3636
public ResultVO index(@RequestBody @Valid LoginForm loginForm,
3737
BindingResult bindingResult) {
3838
if (bindingResult.hasErrors()) {
39-
return ResultVOUtil.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
39+
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
4040
}
4141

42-
return ResultVOUtil.success(authLoginService.loginToken(loginForm));
42+
return ResultVOUtils.success(authLoginService.loginToken(loginForm));
4343
}
4444

4545
/**
@@ -52,7 +52,7 @@ public ResultVO userInfo(HttpServletRequest request) {
5252
String adminId = request.getHeader("X-Adminid");
5353
Long id = Long.valueOf(adminId);
5454

55-
return ResultVOUtil.success(authLoginService.findByAdminId(id));
55+
return ResultVOUtils.success(authLoginService.findByAdminId(id));
5656
}
5757

5858
/**
@@ -62,7 +62,7 @@ public ResultVO userInfo(HttpServletRequest request) {
6262
@AdminAuthRuleAnnotation("")
6363
@PostMapping("/admin/auth/login/out")
6464
public ResultVO out(){
65-
return ResultVOUtil.success();
65+
return ResultVOUtils.success();
6666
}
6767

6868
/**
@@ -75,17 +75,17 @@ public ResultVO password(@RequestBody @Valid UpdatePasswordForm updatePasswordFo
7575
BindingResult bindingResult) {
7676
System.out.println(updatePasswordForm);
7777
if (bindingResult.hasErrors()) {
78-
return ResultVOUtil.error(ResultEnum.PARAM_VERIFY_FALL.getCode(),
78+
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL.getCode(),
7979
bindingResult.getFieldError().getDefaultMessage());
8080
}
8181

8282
boolean b = authLoginService.updatePassword(updatePasswordForm);
8383

8484
if (b) {
85-
return ResultVOUtil.success();
85+
return ResultVOUtils.success();
8686
}
8787

88-
return ResultVOUtil.error(ResultEnum.DATA_CHANGE);
88+
return ResultVOUtils.error(ResultEnum.DATA_CHANGE);
8989
}
9090

9191
}

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package com.lmxdawn.admin.dao.auth;
22

3-
import com.lmxdawn.admin.entity.AuthAdmin;
3+
import com.lmxdawn.admin.entity.auth.AuthAdmin;
44
import org.apache.ibatis.annotations.Mapper;
55

6-
import java.util.HashMap;
76
import java.util.List;
87
import java.util.Map;
98

109
@Mapper
1110
public interface AuthAdminDao {
1211

1312
/**
14-
* 查询列表
13+
* 后台业务查询列表
1514
* @return 列表
1615
*/
17-
List<AuthAdmin> findByPage(Map<String,Object> map);
16+
List<AuthAdmin> listAdminPage(Map<String,Object> map);
1817

1918
/**
2019
* 根据id查询
@@ -42,7 +41,7 @@ public interface AuthAdminDao {
4241
* @param authAdmin
4342
* @return
4443
*/
45-
boolean insert(AuthAdmin authAdmin);
44+
boolean insertAuthAdmin(AuthAdmin authAdmin);
4645

4746
/**
4847
* 更新

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.lmxdawn.admin.dao.auth;
22

3-
import com.lmxdawn.admin.entity.AuthPermission;
3+
import com.lmxdawn.admin.entity.auth.AuthPermission;
44
import org.apache.ibatis.annotations.Mapper;
55

66
import java.util.List;
7-
import java.util.Map;
87

98
@Mapper
109
public interface AuthPermissionDao {
@@ -14,6 +13,6 @@ public interface AuthPermissionDao {
1413
* @param roleIds 传入的id
1514
* @return
1615
*/
17-
List<AuthPermission> selectByRoleIdIn(List<Long> roleIds);
16+
List<AuthPermission> listByRoleIdIn(List<Long> roleIds);
1817

1918
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.lmxdawn.admin.dao.auth;
22

3-
import com.lmxdawn.admin.entity.AuthPermissionRule;
3+
import com.lmxdawn.admin.entity.auth.AuthPermissionRule;
44
import org.apache.ibatis.annotations.Mapper;
55

66
import java.util.List;
@@ -14,6 +14,6 @@ public interface AuthPermissionRuleDao {
1414
* @param ids 传入的ids
1515
* @return
1616
*/
17-
List<AuthPermissionRule> selectByIdIn(List<Long> ids);
17+
List<AuthPermissionRule> listByIdIn(List<Long> ids);
1818

1919
}

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.lmxdawn.admin.dao.auth;
22

3-
import com.lmxdawn.admin.entity.AuthRoleAdmin;
3+
import com.lmxdawn.admin.entity.auth.AuthRoleAdmin;
44
import org.apache.ibatis.annotations.Mapper;
55

66
import java.util.List;
@@ -14,6 +14,13 @@ public interface AuthRoleAdminDao {
1414
* @param adminId 传入的 adminId
1515
* @return
1616
*/
17-
List<AuthRoleAdmin> selectByAdminId(Long adminId);
17+
List<AuthRoleAdmin> listByAdminId(Long adminId);
18+
19+
/**
20+
* 根据 role_id 查询 admin_id
21+
* @param roleId 传入的 roleId
22+
* @return
23+
*/
24+
List<AuthRoleAdmin> listByRoleId(Long roleId);
1825

1926
}

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.lmxdawn.admin.dao.auth;
22

3-
import com.lmxdawn.admin.entity.AuthRole;
3+
import com.lmxdawn.admin.entity.auth.AuthRole;
44
import org.apache.ibatis.annotations.Mapper;
55

66
import java.util.List;
@@ -10,18 +10,17 @@
1010
public interface AuthRoleDao {
1111

1212
/**
13-
* 查询列表
13+
* 后台管理业务查询列表
1414
* @return 列表
1515
*/
16-
List<AuthRole> findByPage(Map<String, Object> map);
17-
16+
List<AuthRole> listAdminPage(Map<String,Object> map);
17+
1818
/**
19-
* 根据id查询
20-
* @param id 传入的id
21-
* @return
19+
* 返回id,name 字段的列表
20+
* @return 列表
2221
*/
23-
AuthRole findById(Long id);
24-
22+
List<AuthRole> listAuthAdminRolePage(Map<String,Object> map);
23+
2524
/**
2625
* 插入
2726
* @param authAdmin

0 commit comments

Comments
 (0)