Skip to content

Commit 28c62fc

Browse files
committed
update admin-adminUserModule
1 parent 03f0f40 commit 28c62fc

52 files changed

Lines changed: 1568 additions & 657 deletions

Some content is hidden

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

.gitignore

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
*\target
2-
!.mvn/wrapper/maven-wrapper.jar
3-
4-
### STS ###
5-
.classpath
6-
.project
7-
.settings
8-
*.class
9-
10-
### IntelliJ IDEA ###
11-
.idea
12-
*.iws
13-
*.iml
14-
*.ipr
1+
.idea/
2+
*.classpath
3+
*.project
4+
.settings
5+
.project
6+
.target
7+
.classpath
8+
**/.settings
9+
**/.classpath
10+
**/target/
11+
target/
12+
bin/
13+
*.iml

.idea/workspace.xml

Lines changed: 368 additions & 587 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.quark.admin.base;
2+
3+
import com.quark.admin.dto.QuarkAdminResult;
4+
import com.quark.admin.enums.SqlErrorEnum;
5+
import org.slf4j.Logger;
6+
import org.slf4j.LoggerFactory;
7+
8+
/**
9+
* @Author LHR
10+
* Create By 2017/8/13
11+
*/
12+
public class BaseController {
13+
14+
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
15+
16+
protected QuarkAdminResult restProcessor(ResultProcessor processor){
17+
QuarkAdminResult result = null;
18+
try{
19+
result = processor.process();
20+
}catch (Exception e){
21+
logger.error("Sql Error Log :"+e.getMessage());
22+
result = QuarkAdminResult.error(SqlErrorEnum.RUNTIMEERROR.getErrorMessage());
23+
}
24+
25+
return result;
26+
}
27+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package com.quark.admin.base;
2+
3+
import com.quark.admin.dto.QuarkAdminResult;
4+
5+
@FunctionalInterface
6+
public interface ResultProcessor {
7+
QuarkAdminResult process();
8+
}

quark-admin/src/main/java/com/quark/admin/config/ShiroConfig.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public ShiroFilterFactoryBean shirFilter(SecurityManager securityManager) {
7878

7979
// 设置 SecurityManager
8080
shiroFilterFactoryBean.setSecurityManager(securityManager);
81+
8182
// 如果不设置默认会自动寻找Web工程根目录下的"/login.html"页面
8283
shiroFilterFactoryBean.setLoginUrl("/login");
8384
// 登录成功后要跳转的链接
@@ -86,7 +87,7 @@ public ShiroFilterFactoryBean shirFilter(SecurityManager securityManager) {
8687
shiroFilterFactoryBean.setUnauthorizedUrl("/403");
8788
//拦截器.
8889
Map<String, String> filterChainDefinitionMap = new LinkedHashMap<>();
89-
90+
filterChainDefinitionMap.put("/favicon.ico","anon");//解决弹出favicon.ico下载
9091
filterChainDefinitionMap.put("/logout", "logout");
9192
filterChainDefinitionMap.put("/css/**", "anon");
9293
filterChainDefinitionMap.put("/js/**", "anon");
@@ -101,6 +102,8 @@ public ShiroFilterFactoryBean shirFilter(SecurityManager securityManager) {
101102
filterChainDefinitionMap.put(p.getPerurl(), permission);
102103
}
103104
}
105+
106+
104107
//过滤链定义,从上向下顺序执行,一般将 /**放在最为下边
105108
filterChainDefinitionMap.put("/**", "authc");
106109
shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);
Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
package com.quark.admin.controller;
2+
3+
import com.quark.admin.base.BaseController;
4+
import com.quark.admin.dto.PageResult;
5+
import com.quark.admin.dto.QuarkAdminResult;
6+
import com.quark.admin.enums.SqlErrorEnum;
7+
import com.quark.admin.service.AdminUserService;
8+
import com.quark.common.entity.AdminUser;
9+
import org.springframework.beans.factory.annotation.Autowired;
10+
import org.springframework.data.domain.Page;
11+
import org.springframework.web.bind.annotation.*;
12+
13+
import java.util.List;
14+
import java.util.stream.Stream;
15+
16+
import static java.util.stream.Collectors.toList;
17+
18+
@RestController
19+
@RequestMapping("admins")
20+
public class AdminUserController extends BaseController{
21+
22+
@Autowired
23+
private AdminUserService adminUserService;
24+
25+
/**
26+
* 翻页获取管理员
27+
* @param adminUser
28+
* @param draw:请求次数
29+
* @param start
30+
* @param length
31+
* @return
32+
*/
33+
@GetMapping
34+
public PageResult getAll(AdminUser adminUser, String draw,
35+
@RequestParam(required = false, defaultValue = "1") int start,
36+
@RequestParam(required = false, defaultValue = "10") int length) {
37+
int pageNo = start/length;
38+
Page<AdminUser> page = adminUserService.findByPage(adminUser, pageNo, length);
39+
PageResult<List<AdminUser>> result = new PageResult<>();
40+
result.setDraw(draw);
41+
result.setRecordsFiltered(page.getTotalElements());
42+
result.setRecordsTotal(page.getTotalElements());
43+
result.setData(page.getContent());
44+
return result;
45+
}
46+
47+
@PostMapping("/add")
48+
public QuarkAdminResult addAdmin(AdminUser adminUser){
49+
50+
QuarkAdminResult result = restProcessor(() -> {
51+
if (adminUserService.findByUserName(adminUser.getUsername()) != null)
52+
return QuarkAdminResult.error(SqlErrorEnum.REPEATCOLUMN.getErrorMessage());
53+
adminUserService.saveAdmin(adminUser);
54+
return QuarkAdminResult.ok();
55+
});
56+
57+
return result;
58+
}
59+
60+
@PostMapping("/delete")
61+
public QuarkAdminResult deleteAdmin(@RequestParam(value = "id[]") AdminUser[] id){
62+
63+
QuarkAdminResult result = restProcessor(() -> {
64+
List<AdminUser> collect = Stream.of(id).collect(toList());
65+
adminUserService.deleteInBatch(collect);
66+
return QuarkAdminResult.ok();
67+
});
68+
return result;
69+
}
70+
71+
72+
@PostMapping("/saveAdminRoles")
73+
public QuarkAdminResult saveAdminRoles(Integer uid, Integer[] id){
74+
75+
QuarkAdminResult result = restProcessor(() -> {
76+
adminUserService.saveAdminRoles(uid, id);
77+
return QuarkAdminResult.ok();
78+
});
79+
return result;
80+
}
81+
82+
@PostMapping("/saveAdminEnable")
83+
public QuarkAdminResult saveAdminEnable(@RequestParam(value = "id[]") Integer[] id){
84+
QuarkAdminResult result = restProcessor(() -> {
85+
adminUserService.saveAdminEnable(id);
86+
return QuarkAdminResult.ok();
87+
});
88+
return result;
89+
}
90+
91+
}

quark-admin/src/main/java/com/quark/admin/controller/PageController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public String login(HttpServletRequest request, AdminUser user, Model model) {
6060
}
6161
}
6262

63-
@RequestMapping(value = {"/initPage",""})
63+
@RequestMapping(value = {"/initPage"})
6464
public String InitPage(){
6565
return "init";
6666
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.quark.admin.controller;
2+
3+
import com.quark.admin.dto.QuarkAdminResult;
4+
import com.quark.admin.service.RoleService;
5+
import org.springframework.beans.factory.annotation.Autowired;
6+
import org.springframework.web.bind.annotation.PostMapping;
7+
import org.springframework.web.bind.annotation.RequestMapping;
8+
import org.springframework.web.bind.annotation.RestController;
9+
10+
/**
11+
* @Author LHR
12+
* Create By 2017/8/12
13+
*/
14+
@RestController
15+
@RequestMapping("roles")
16+
public class RoleController {
17+
18+
@Autowired
19+
private RoleService roleService;
20+
21+
22+
@PostMapping("/rolesWithSelected")
23+
public QuarkAdminResult rolesWithSelected(Integer uid){
24+
QuarkAdminResult result = roleService.findRolesAndSelected(uid);
25+
return result;
26+
}
27+
28+
}
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
package com.quark.admin.dto;
2+
3+
import java.io.Serializable;
4+
5+
/**
6+
* 后台翻页响应数据
7+
*
8+
* @Author LHR
9+
* Create By 2017/8/10
10+
*/
11+
public class PageResult<T> implements Serializable {
12+
13+
public PageResult() {
14+
}
15+
16+
private String draw;//表示请求次数
17+
18+
private Long recordsTotal;//总记录数
19+
20+
private Long recordsFiltered;//过滤后的总记录数
21+
22+
private T data;//具体的数据
23+
24+
public String getDraw() {
25+
return draw;
26+
}
27+
28+
public void setDraw(String draw) {
29+
this.draw = draw;
30+
}
31+
32+
public Long getRecordsTotal() {
33+
return recordsTotal;
34+
}
35+
36+
public void setRecordsTotal(Long recordsTotal) {
37+
this.recordsTotal = recordsTotal;
38+
}
39+
40+
public Long getRecordsFiltered() {
41+
return recordsFiltered;
42+
}
43+
44+
public void setRecordsFiltered(Long recordsFiltered) {
45+
this.recordsFiltered = recordsFiltered;
46+
}
47+
48+
public T getData() {
49+
return data;
50+
}
51+
52+
public void setData(T data) {
53+
this.data = data;
54+
}
55+
}
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
package com.quark.admin.dto;
2+
3+
import com.quark.admin.enums.StateEnum;
4+
5+
import java.io.Serializable;
6+
7+
/**
8+
* 后台操作响应数据
9+
*
10+
* @Author LHR
11+
* Create By 2017/8/11
12+
*/
13+
public class QuarkAdminResult implements Serializable {
14+
15+
/**
16+
* 响应业务状态
17+
*/
18+
private Integer status;
19+
20+
/**
21+
* 返回的数据
22+
*/
23+
private Object data;
24+
25+
/**
26+
* 错误信息
27+
*/
28+
private String error;
29+
30+
public Integer getStatus() {
31+
return status;
32+
}
33+
34+
public void setStatus(Integer status) {
35+
this.status = status;
36+
}
37+
38+
public Object getData() {
39+
return data;
40+
}
41+
42+
public void setData(Object data) {
43+
this.data = data;
44+
}
45+
46+
public String getError() {
47+
return error;
48+
}
49+
50+
public void setError(String error) {
51+
this.error = error;
52+
}
53+
54+
/**
55+
* 请求成功携带数据
56+
* @param status
57+
*/
58+
public QuarkAdminResult(Integer status) {
59+
this.status = status;
60+
}
61+
62+
/**
63+
* 请求成功并携带
64+
* @param status
65+
* @param data
66+
*/
67+
public QuarkAdminResult(Integer status, Object data) {
68+
this.status = status;
69+
this.data = data;
70+
}
71+
72+
/**
73+
* 请求失败
74+
* @param status
75+
* @param error
76+
*/
77+
public QuarkAdminResult(Integer status, String error) {
78+
this.status = status;
79+
this.error = error;
80+
}
81+
82+
public static QuarkAdminResult ok(){
83+
return new QuarkAdminResult(StateEnum.SUCCESS.getState());
84+
}
85+
86+
public static QuarkAdminResult ok(Object data){
87+
return new QuarkAdminResult(StateEnum.SUCCESS.getState(),data);
88+
}
89+
90+
public static QuarkAdminResult error(String error){
91+
return new QuarkAdminResult(StateEnum.ERROR.getState(),error);
92+
}
93+
94+
95+
}

0 commit comments

Comments
 (0)