Skip to content

Commit af1dc56

Browse files
houkohouko
committed
adminUserController
1 parent cb48290 commit af1dc56

2 files changed

Lines changed: 67 additions & 51 deletions

File tree

‎admin/src/main/java/info/xiaomo/admin/controller/AdminUserController.java‎

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,25 @@ public class AdminUserController extends BaseController {
4242
@Autowired
4343
AdminUserService service;
4444

45+
/**
46+
* 后台账户登录
47+
*
48+
* @param userName userName
49+
* @param password password
50+
* @return result
51+
*/
4552
@RequestMapping(value = "login", method = RequestMethod.POST)
4653
public Map<String, Object> login(@RequestParam String userName, @RequestParam String password) {
47-
HashMap<String, java.lang.Object> result = new HashMap<>();
4854
AdminModel adminModel = service.findAdminUserByUserName(userName);
4955
if (adminModel == null) {
5056
result.put(code, notFound);
57+
return result;
58+
}
59+
if (MD5.encode(password).equals(adminModel.getPassword())) {
60+
result.put(code, success);
61+
result.put("adminUser", adminModel);
5162
} else {
52-
if (MD5.encode(password).equals(adminModel.getPassword())) {
53-
result.put(code, success);
54-
result.put("adminUser", adminModel);
55-
} else {
56-
result.put(code, error);
57-
}
63+
result.put(code, error);
5864
}
5965
return result;
6066
}
@@ -65,60 +71,55 @@ public HashMap<String, Object> register(
6571
@RequestParam String password,
6672
@RequestParam int authLevel
6773
) {
68-
HashMap<String, Object> result = new HashMap<>();
6974
AdminModel adminModel = service.findAdminUserByUserName(userName);
7075
if (adminModel != null) {
7176
result.put(code, error);
77+
return result;
78+
}
79+
adminModel = new AdminModel();
80+
adminModel.setUserName(userName);
81+
adminModel.setPassword(MD5.encode(password));
82+
adminModel.setStatus(authLevel);
83+
AdminModel res = service.addAdminUser(adminModel);
84+
if (res != null) {
85+
result.put(code, success);
86+
result.put("user", adminModel);
7287
} else {
73-
adminModel = new AdminModel();
74-
adminModel.setUserName(userName);
75-
adminModel.setPassword(MD5.encode(password));
76-
adminModel.setStatus(authLevel);
77-
AdminModel res = service.addAdminUser(adminModel);
78-
if (res != null) {
79-
result.put(code, success);
80-
result.put("user", adminModel);
81-
} else {
82-
result.put(code, error);
83-
}
88+
result.put(code, error);
8489
}
8590
return result;
8691
}
8792

8893
@RequestMapping(value = "findById/{id}", method = RequestMethod.GET)
8994
public HashMap<String, Object> findUserById(@PathVariable("id") Long id) {
90-
HashMap<String, Object> result = new HashMap<>();
9195
AdminModel adminModel = service.findAdminUserById(id);
9296
if (adminModel == null) {
9397
result.put(code, notFound);
94-
} else {
95-
9698
result.put(code, success);
97-
result.put("adminUser", adminModel);
9899
}
100+
result.put(code, success);
101+
result.put("adminUser", adminModel);
99102
return result;
100103
}
101104

102105

103106
@RequestMapping(value = "findAll/{start}/{pageSize}", method = RequestMethod.GET)
104107
public HashMap<String, Object> getAll(@PathVariable("start") int start, @PathVariable("pageSize") int page) {
105-
HashMap<String, Object> result = new HashMap<>();
106108
Page<AdminModel> pages = service.getAdminUsers(new PageRequest(start - 1, page));
107109
result.put(code, success);
108110
result.put("adminUsers", pages);
109111
return result;
110112
}
111113

112-
@RequestMapping(value = "deleteById/{id}",method = RequestMethod.GET)
114+
@RequestMapping(value = "deleteById/{id}", method = RequestMethod.GET)
113115
public HashMap<String, Object> deleteUserById(@PathVariable("id") Long id) throws UserNotFoundException {
114-
HashMap<String, Object> result = new HashMap<>();
115116
AdminModel adminModel = service.deleteAdminUserById(id);
116117
if (adminModel == null) {
117118
result.put(code, notFound);
118-
} else {
119-
result.put(code, success);
120-
result.put("adminUser", adminModel);
119+
return result;
121120
}
121+
result.put(code, success);
122+
result.put("adminUser", adminModel);
122123
return result;
123124
}
124125

@@ -128,32 +129,30 @@ public HashMap<String, Object> update(
128129
@RequestParam("password") String password,
129130
@RequestParam("authLevel") int authLevel
130131
) throws UserNotFoundException {
131-
HashMap<String, Object> result = new HashMap<>();
132132
AdminModel adminModel = service.findAdminUserByUserName(userName);
133133
if (adminModel == null) {
134134
result.put(code, notFound);
135-
} else {
136-
adminModel.setUserName(userName);
137-
adminModel.setPassword(password);
138-
adminModel.setAuthLevel(authLevel);
139-
service.updateAdminUser(adminModel);
140-
result.put(code, success);
141-
result.put("adminUser", adminModel);
135+
return result;
142136
}
137+
adminModel.setUserName(userName);
138+
adminModel.setPassword(password);
139+
adminModel.setAuthLevel(authLevel);
140+
service.updateAdminUser(adminModel);
141+
result.put(code, success);
142+
result.put("adminUser", adminModel);
143143
return result;
144144
}
145145

146146
@RequestMapping(value = "forbid/{id}", method = RequestMethod.GET)
147147
public HashMap<String, Object> forbid(@PathVariable("id") Long id) throws UserNotFoundException {
148-
HashMap<String, Object> result = new HashMap<>();
149148
AdminModel model = service.findAdminUserById(id);
150149
if (model == null) {
151150
result.put(code, notFound);
152-
} else {
153-
model = service.forbidAdminUserById(id);
154-
result.put(code, success);
155-
result.put("adminUser", model);
151+
return result;
156152
}
153+
model = service.forbidAdminUserById(id);
154+
result.put(code, success);
155+
result.put("adminUser", model);
157156
return result;
158157
}
159158
}

‎admin/src/main/java/info/xiaomo/admin/controller/UserController.java‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,38 +35,55 @@ public class UserController extends BaseController {
3535
@Autowired
3636
private UserService service;
3737

38+
/**
39+
* 根据id 查找用户
40+
*
41+
* @param id id
42+
* @return result
43+
*/
3844
@RequestMapping(value = "findById/{id}", method = RequestMethod.GET)
3945
public HashMap<String, Object> findUserById(@PathVariable("id") Long id) {
40-
HashMap<String, Object> result = new HashMap<>();
4146
UserModel userModel = service.findUserById(id);
4247
if (userModel == null) {
4348
result.put(code, notFound);
44-
} else {
45-
result.put(code, success);
46-
result.put("user", userModel);
49+
return result;
4750
}
51+
result.put(code, success);
52+
result.put("user", userModel);
4853
return result;
4954
}
5055

56+
/**
57+
* 分页查询用户
58+
*
59+
* @param start start
60+
* @param page page
61+
* @return result
62+
*/
5163
@RequestMapping(value = "findAll/{start}/{pageSize}", method = RequestMethod.GET)
5264
public HashMap<String, Object> getAll(@PathVariable("start") int start, @PathVariable("pageSize") int page) {
53-
HashMap<String, Object> result = new HashMap<>();
5465
Page<UserModel> pages = service.getUsers(new PageRequest(start - 1, page));
5566
result.put(code, success);
5667
result.put("users", pages);
5768
return result;
5869
}
5970

71+
/**
72+
* 根据id 删除用户
73+
*
74+
* @param id id
75+
* @return result
76+
* @throws UserNotFoundException
77+
*/
6078
@RequestMapping(value = "deleteById/{id}", method = RequestMethod.GET)
6179
public HashMap<String, Object> deleteUserById(@PathVariable("id") Long id) throws UserNotFoundException {
62-
HashMap<String, Object> result = new HashMap<>();
6380
UserModel userModel = service.deleteUserById(id);
6481
if (userModel == null) {
6582
result.put(code, notFound);
66-
} else {
67-
result.put(code, success);
68-
result.put("user", userModel);
83+
return result;
6984
}
85+
result.put(code, success);
86+
result.put("user", userModel);
7087
return result;
7188
}
7289
}

0 commit comments

Comments
 (0)