增加Role、Permission、User之间的assign API

ZhuXS · Sep 25, 2017 · 4ead8f5 · 4ead8f5
1 parent 754f02a
commit 4ead8f5
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 11 deletions.
diff --git a/Server/src/main/java/com/zhuxs/result/controller/AdminController.java b/Server/src/main/java/com/zhuxs/result/controller/AdminController.java
@@ -18,10 +18,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.util.UriComponentsBuilder;
 import scala.App;
 
@@ -37,9 +34,11 @@
 public class AdminController {
     public static final String PATH = "admin";
 
-    public static final String SUBPATH_ROLE = "roles";
-    public static final String SUBPATH_USER = "users";
-    public static final String SUBPATH_PERMISSION = "permissions";
+    public static final String SUBPATH_ROLE = "/roles";
+    public static final String SUBPATH_USER = "/users";
+    public static final String SUBPATH_PERMISSION = "/permissions";
+
+    public static final String PATHVARIABLE_ID = "/{id}";
 
     @Autowired
     private ModelMapper modelMapper;
@@ -92,6 +91,18 @@ public ResponseEntity<List<RoleDto>> listRoles(UriComponentsBuilder uriComponent
         return new ResponseEntity<List<RoleDto>>(roleDtos,headers,HttpStatus.OK);
     }
 
+    @PutMapping(value = SUBPATH_ROLE + PATHVARIABLE_ID + SUBPATH_PERMISSION)
+    public ResponseEntity<RoleDto> updatePermissionsById(@PathVariable long id,@RequestBody List<PermissionDto> permissionDtos,
+                                                      UriComponentsBuilder uriComponentsBuilder){
+        HttpHeaders headers = ApplicationUtil.getHttpHeaders(uriComponentsBuilder,PATH + SUBPATH_ROLE + PATHVARIABLE_ID + SUBPATH_PERMISSION);
+        List<Permission> permissions = permissionDtos.stream()
+                .map(permissionDto -> convertToEntity(permissionDto))
+                .collect(Collectors.toList());
+        Role role = roleService.updatePermissionsById(id,permissions);
+        RoleDto roleDto = convertToDto(role);
+        return new ResponseEntity<RoleDto>(roleDto,headers,HttpStatus.OK);
+    }
+
     @PostMapping(value = SUBPATH_USER)
     public ResponseEntity<UserDto> addUser(@RequestBody UserDto userDto,
                                            UriComponentsBuilder uriComponentsBuilder){
@@ -113,6 +124,18 @@ public  ResponseEntity<List<UserDto>> listUsers(UriComponentsBuilder uriComponen
         return new ResponseEntity<List<UserDto>>(userDtos,headers,HttpStatus.OK);
     }
 
+    @PutMapping(value = SUBPATH_USER + PATHVARIABLE_ID + SUBPATH_ROLE)
+    public ResponseEntity<UserDto> updateRolesById(@PathVariable long id, @RequestBody List<RoleDto> roleDtos,
+                                                UriComponentsBuilder uriComponentsBuilder){
+        HttpHeaders headers = ApplicationUtil.getHttpHeaders(uriComponentsBuilder,SUBPATH_USER + PATHVARIABLE_ID + SUBPATH_ROLE);
+        List<Role> roles = roleDtos.stream()
+                .map(roleDto -> convertToEntity(roleDto))
+                .collect(Collectors.toList());
+        User user = userService.updateRolesById(id,roles);
+        UserDto userDto = convertToDto(user);
+        return new ResponseEntity<UserDto>(userDto,headers,HttpStatus.OK);
+    }
+
     private Permission convertToEntity(PermissionDto permissionDto){
         return modelMapper.map(permissionDto,Permission.class);
     }

diff --git a/Server/src/main/java/com/zhuxs/result/dto/PermissionDto.java b/Server/src/main/java/com/zhuxs/result/dto/PermissionDto.java
@@ -51,7 +51,11 @@ public void setResourceType(ResourceType resourceType) {
         this.resourceType = resourceType;
     }
 
-    public PermissionDto(long id) {
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
         this.id = id;
     }
 

diff --git a/Server/src/main/java/com/zhuxs/result/service/RoleService.java b/Server/src/main/java/com/zhuxs/result/service/RoleService.java
@@ -13,5 +13,5 @@ public interface RoleService {
 
     List<Role> listRoles();
 
-    Role updatePermissionsById(List<Permission> permissions);
+    Role updatePermissionsById(long id,List<Permission> permissions);
 }
diff --git a/Server/src/main/java/com/zhuxs/result/service/UserService.java b/Server/src/main/java/com/zhuxs/result/service/UserService.java
@@ -1,5 +1,6 @@
 package com.zhuxs.result.service;
 
+import com.zhuxs.result.domain.entity.Role;
 import com.zhuxs.result.domain.entity.User;
 import com.zhuxs.result.dto.UserDto;
 
@@ -11,4 +12,5 @@
 public interface UserService {
     User addUser(User user);
     List<User> listUsers();
+    User updateRolesById(long id, List<Role> roles);
 }
diff --git a/Server/src/main/java/com/zhuxs/result/service/impl/RoleServiceImpl.java b/Server/src/main/java/com/zhuxs/result/service/impl/RoleServiceImpl.java
@@ -1,5 +1,7 @@
 package com.zhuxs.result.service.impl;
 
+import com.sun.org.apache.regexp.internal.RE;
+import com.zhuxs.result.Exception.ResultException;
 import com.zhuxs.result.domain.RoleDao;
 import com.zhuxs.result.domain.entity.Permission;
 import com.zhuxs.result.domain.entity.Role;
@@ -29,7 +31,17 @@ public List<Role> listRoles() {
     }
 
     @Override
-    public Role updatePermissionsById(List<Permission> permissions) {
-        return null;
+    public Role updatePermissionsById(long id, List<Permission> permissions){
+        if(!roleDao.exists(id)){
+            throw new ResultException();
+        }
+        try {
+            Role role = roleDao.findOne(id);
+            role.setPermissions(permissions);
+            role = roleDao.save(role);
+            return role;
+        } catch (Exception e){
+            throw new ResultException();
+        }
     }
 }
diff --git a/Server/src/main/java/com/zhuxs/result/service/impl/UserServiceImpl.java b/Server/src/main/java/com/zhuxs/result/service/impl/UserServiceImpl.java
@@ -1,6 +1,8 @@
 package com.zhuxs.result.service.impl;
 
+import com.zhuxs.result.Exception.ResultException;
 import com.zhuxs.result.domain.UserDao;
+import com.zhuxs.result.domain.entity.Role;
 import com.zhuxs.result.domain.entity.User;
 import com.zhuxs.result.dto.UserDto;
 import com.zhuxs.result.service.UserService;
@@ -25,4 +27,19 @@ public List<User> listUsers() {
         List<User> users = userDao.findAll();
         return users;
     }
+
+    @Override
+    public User updateRolesById(long id, List<Role> roles) {
+        if(!userDao.exists(id)){
+            throw new ResultException();
+        }
+        try {
+            User user = userDao.findOne(id);
+            user.setRoles(roles);
+            user = userDao.save(user);
+            return user;
+        }catch (Exception e){
+            throw new ResultException();
+        }
+    }
 }