lostecho/mall-swarm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mall-admin代码改造

Browse Source
This commit is contained in:
macro
2019-04-20 14:04:25 +08:00
parent b5800856fb
commit 5262a232aa
37 changed files with 667 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
mall-admin/src/main/java/com/macro/mall/controller/UmsAdminController.java
View File

@@ -1,6 +1,7 @@
package com.macro.mall.controller;
import com.macro.mall.dto.CommonResult;
import com.macro.mall.common.api.CommonPage;
import com.macro.mall.common.api.CommonResult;
import com.macro.mall.dto.UmsAdminLoginParam;
import com.macro.mall.dto.UmsAdminParam;
import com.macro.mall.model.UmsAdmin;
@@ -39,140 +40,140 @@ public class UmsAdminController {
@ApiOperation(value = "用户注册")
@RequestMapping(value = "/register", method = RequestMethod.POST)
@ResponseBody
public Object register(@RequestBody UmsAdminParam umsAdminParam, BindingResult result) {
public CommonResult<UmsAdmin> register(@RequestBody UmsAdminParam umsAdminParam, BindingResult result) {
UmsAdmin umsAdmin = adminService.register(umsAdminParam);
if (umsAdmin == null) {
new CommonResult().failed();
CommonResult.failed();
}
return new CommonResult().success(umsAdmin);
return CommonResult.success(umsAdmin);
}
@ApiOperation(value = "登录以后返回token")
@RequestMapping(value = "/login", method = RequestMethod.POST)
@ResponseBody
public Object login(@RequestBody UmsAdminLoginParam umsAdminLoginParam, BindingResult result) {
public CommonResult login(@RequestBody UmsAdminLoginParam umsAdminLoginParam, BindingResult result) {
String token = adminService.login(umsAdminLoginParam.getUsername(), umsAdminLoginParam.getPassword());
if (token == null) {
return new CommonResult().validateFailed("用户名或密码错误");
return CommonResult.validateFailed("用户名或密码错误");
}
Map<String, String> tokenMap = new HashMap<>();
tokenMap.put("token", token);
tokenMap.put("tokenHead", tokenHead);
return new CommonResult().success(tokenMap);
return CommonResult.success(tokenMap);
}
@ApiOperation(value = "刷新token")
@RequestMapping(value = "/token/refresh", method = RequestMethod.GET)
@ResponseBody
public Object refreshToken(HttpServletRequest request) {
public CommonResult refreshToken(HttpServletRequest request) {
String token = request.getHeader(tokenHeader);
String refreshToken = adminService.refreshToken(token);
if (refreshToken == null) {
return new CommonResult().failed();
return CommonResult.failed();
}
Map<String, String> tokenMap = new HashMap<>();
tokenMap.put("token", refreshToken);
tokenMap.put("tokenHead", tokenHead);
return new CommonResult().success(tokenMap);
return CommonResult.success(tokenMap);
}
@ApiOperation(value = "获取当前登录用户信息")
@RequestMapping(value = "/info", method = RequestMethod.GET)
@ResponseBody
public Object getAdminInfo(Principal principal) {
String username = principal.getName();
public CommonResult getAdminInfo(Principal principal) {
String username = principal.getName();
UmsAdmin umsAdmin = adminService.getAdminByUsername(username);
Map<String, Object> data = new HashMap<>();
data.put("username", umsAdmin.getUsername());
data.put("roles", new String[]{"TEST"});
data.put("icon", umsAdmin.getIcon());
return new CommonResult().success(data);
return CommonResult.success(data);
}
@ApiOperation(value = "登出功能")
@RequestMapping(value = "/logout", method = RequestMethod.POST)
@ResponseBody
public Object logout() {
return new CommonResult().success(null);
public CommonResult logout() {
return CommonResult.success(null);
}
@ApiOperation("根据用户名或姓名分页获取用户列表")
@RequestMapping(value = "/list",method = RequestMethod.GET)
@RequestMapping(value = "/list", method = RequestMethod.GET)
@ResponseBody
public Object list(@RequestParam(value = "name",required = false) String name,
@RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum){
List<UmsAdmin> adminList = adminService.list(name,pageSize,pageNum);
return new CommonResult().pageSuccess(adminList);
public CommonResult<CommonPage<UmsAdmin>> list(@RequestParam(value = "name", required = false) String name,
@RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
List<UmsAdmin> adminList = adminService.list(name, pageSize, pageNum);
return CommonResult.success(CommonPage.restPage(adminList));
}
@ApiOperation("获取指定用户信息")
@RequestMapping(value = "/{id}",method = RequestMethod.GET)
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ResponseBody
public Object getItem(@PathVariable Long id){
public CommonResult<UmsAdmin> getItem(@PathVariable Long id) {
UmsAdmin admin = adminService.getItem(id);
return new CommonResult().success(admin);
return CommonResult.success(admin);
}
@ApiOperation("修改指定用户信息")
@RequestMapping(value = "/update/{id}",method = RequestMethod.POST)
@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
@ResponseBody
public Object update(@PathVariable Long id,@RequestBody UmsAdmin admin){
int count = adminService.update(id,admin);
if(count>0){
return new CommonResult().success(count);
public CommonResult update(@PathVariable Long id, @RequestBody UmsAdmin admin) {
int count = adminService.update(id, admin);
if (count > 0) {
return CommonResult.success(count);
}
return new CommonResult().failed();
return CommonResult.failed();
}
@ApiOperation("删除指定用户信息")
@RequestMapping(value = "/delete/{id}",method = RequestMethod.POST)
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
@ResponseBody
public Object delete(@PathVariable Long id){
public CommonResult delete(@PathVariable Long id) {
int count = adminService.delete(id);
if(count>0){
return new CommonResult().success(count);
if (count > 0) {
return CommonResult.success(count);
}
return new CommonResult().failed();
return CommonResult.failed();
}
@ApiOperation("给用户分配角色")
@RequestMapping(value = "/role/update",method = RequestMethod.POST)
@RequestMapping(value = "/role/update", method = RequestMethod.POST)
@ResponseBody
public Object updateRole(@RequestParam("adminId") Long adminId,
@RequestParam("roleIds") List<Long> roleIds){
int count = adminService.updateRole(adminId,roleIds);
if(count>=0){
return new CommonResult().success(count);
public CommonResult updateRole(@RequestParam("adminId") Long adminId,
@RequestParam("roleIds") List<Long> roleIds) {
int count = adminService.updateRole(adminId, roleIds);
if (count >= 0) {
return CommonResult.success(count);
}
return new CommonResult().failed();
return CommonResult.failed();
}
@ApiOperation("获取指定用户的角色")
@RequestMapping(value = "/role/{adminId}",method = RequestMethod.GET)
@RequestMapping(value = "/role/{adminId}", method = RequestMethod.GET)
@ResponseBody
public Object getRoleList(@PathVariable Long adminId){
public CommonResult<List<UmsRole>> getRoleList(@PathVariable Long adminId) {
List<UmsRole> roleList = adminService.getRoleList(adminId);
return new CommonResult().success(roleList);
return CommonResult.success(roleList);
}
@ApiOperation("给用户分配+-权限")
@RequestMapping(value = "/permission/update",method = RequestMethod.POST)
@RequestMapping(value = "/permission/update", method = RequestMethod.POST)
@ResponseBody
public Object updatePermission(@RequestParam Long adminId,
@RequestParam("permissionIds") List<Long> permissionIds){
int count = adminService.updatePermission(adminId,permissionIds);
if(count>0){
return new CommonResult().success(count);
public CommonResult updatePermission(@RequestParam Long adminId,
@RequestParam("permissionIds") List<Long> permissionIds) {
int count = adminService.updatePermission(adminId, permissionIds);
if (count > 0) {
return CommonResult.success(count);
}
return new CommonResult().failed();
return CommonResult.failed();
}
@ApiOperation("获取用户所有权限（包括+-权限）")
@RequestMapping(value = "/permission/{adminId}",method = RequestMethod.GET)
@RequestMapping(value = "/permission/{adminId}", method = RequestMethod.GET)
@ResponseBody
public Object getPermissionList(@PathVariable Long adminId){
public CommonResult<List<UmsPermission>> getPermissionList(@PathVariable Long adminId) {
List<UmsPermission> permissionList = adminService.getPermissionList(adminId);
return new CommonResult().success(permissionList);
return CommonResult.success(permissionList);
}
}