fix: 统一所有Controller响应格式为ApiResponse
- PermissionController - RoleController - UserController - ProjectController - SpaceNodeController
This commit is contained in:
chiguyong
parent
d12edef2ce
commit
e6eac0fc56
|
|
@ -2,6 +2,7 @@ package com.ether.pms.auth.controller;
|
|||
|
||||
import com.ether.pms.auth.entity.Permission;
|
||||
import com.ether.pms.auth.service.PermissionService;
|
||||
import com.ether.pms.common.ApiResponse;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
|
@ -17,38 +18,38 @@ public class PermissionController {
|
|||
private final PermissionService permissionService;
|
||||
|
||||
@GetMapping
|
||||
public ResponseEntity<List<Permission>> findAll() {
|
||||
return ResponseEntity.ok(permissionService.findAll());
|
||||
public ResponseEntity<ApiResponse<List<Permission>>> findAll() {
|
||||
return ResponseEntity.ok(ApiResponse.success(permissionService.findAll()));
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public ResponseEntity<Permission> findById(@PathVariable UUID id) {
|
||||
return ResponseEntity.ok(permissionService.findById(id));
|
||||
public ResponseEntity<ApiResponse<Permission>> findById(@PathVariable UUID id) {
|
||||
return ResponseEntity.ok(ApiResponse.success(permissionService.findById(id)));
|
||||
}
|
||||
|
||||
@GetMapping("/type/{type}")
|
||||
public ResponseEntity<List<Permission>> findByType(@PathVariable String type) {
|
||||
return ResponseEntity.ok(permissionService.findByType(type));
|
||||
public ResponseEntity<ApiResponse<List<Permission>>> findByType(@PathVariable String type) {
|
||||
return ResponseEntity.ok(ApiResponse.success(permissionService.findByType(type)));
|
||||
}
|
||||
|
||||
@GetMapping("/menus")
|
||||
public ResponseEntity<List<Permission>> findMenus() {
|
||||
return ResponseEntity.ok(permissionService.findMenuPermissions());
|
||||
public ResponseEntity<ApiResponse<List<Permission>>> findMenus() {
|
||||
return ResponseEntity.ok(ApiResponse.success(permissionService.findMenuPermissions()));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public ResponseEntity<Permission> create(@RequestBody Permission permission) {
|
||||
return ResponseEntity.ok(permissionService.create(permission));
|
||||
public ResponseEntity<ApiResponse<Permission>> create(@RequestBody Permission permission) {
|
||||
return ResponseEntity.ok(ApiResponse.success(permissionService.create(permission)));
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
public ResponseEntity<Permission> update(@PathVariable UUID id, @RequestBody Permission permission) {
|
||||
return ResponseEntity.ok(permissionService.update(id, permission));
|
||||
public ResponseEntity<ApiResponse<Permission>> update(@PathVariable UUID id, @RequestBody Permission permission) {
|
||||
return ResponseEntity.ok(ApiResponse.success(permissionService.update(id, permission)));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public ResponseEntity<Void> delete(@PathVariable UUID id) {
|
||||
public ResponseEntity<ApiResponse<Void>> delete(@PathVariable UUID id) {
|
||||
permissionService.delete(id);
|
||||
return ResponseEntity.ok().build();
|
||||
return ResponseEntity.ok(ApiResponse.success());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.ether.pms.auth.controller;
|
|||
|
||||
import com.ether.pms.auth.entity.Role;
|
||||
import com.ether.pms.auth.service.RoleService;
|
||||
import com.ether.pms.common.ApiResponse;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
|
@ -17,41 +18,41 @@ public class RoleController {
|
|||
private final RoleService roleService;
|
||||
|
||||
@GetMapping
|
||||
public ResponseEntity<List<Role>> findAll() {
|
||||
return ResponseEntity.ok(roleService.findAll());
|
||||
public ResponseEntity<ApiResponse<List<Role>>> findAll() {
|
||||
return ResponseEntity.ok(ApiResponse.success(roleService.findAll()));
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public ResponseEntity<Role> findById(@PathVariable UUID id) {
|
||||
return ResponseEntity.ok(roleService.findById(id));
|
||||
public ResponseEntity<ApiResponse<Role>> findById(@PathVariable UUID id) {
|
||||
return ResponseEntity.ok(ApiResponse.success(roleService.findById(id)));
|
||||
}
|
||||
|
||||
@GetMapping("/project/{projectId}")
|
||||
public ResponseEntity<List<Role>> findByProjectId(@PathVariable String projectId) {
|
||||
return ResponseEntity.ok(roleService.findByProjectId(projectId));
|
||||
public ResponseEntity<ApiResponse<List<Role>>> findByProjectId(@PathVariable String projectId) {
|
||||
return ResponseEntity.ok(ApiResponse.success(roleService.findByProjectId(projectId)));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public ResponseEntity<Role> create(@RequestBody Role role) {
|
||||
return ResponseEntity.ok(roleService.create(role));
|
||||
public ResponseEntity<ApiResponse<Role>> create(@RequestBody Role role) {
|
||||
return ResponseEntity.ok(ApiResponse.success(roleService.create(role)));
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
public ResponseEntity<Role> update(@PathVariable UUID id, @RequestBody Role role) {
|
||||
return ResponseEntity.ok(roleService.update(id, role));
|
||||
public ResponseEntity<ApiResponse<Role>> update(@PathVariable UUID id, @RequestBody Role role) {
|
||||
return ResponseEntity.ok(ApiResponse.success(roleService.update(id, role)));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public ResponseEntity<Void> delete(@PathVariable UUID id) {
|
||||
public ResponseEntity<ApiResponse<Void>> delete(@PathVariable UUID id) {
|
||||
roleService.delete(id);
|
||||
return ResponseEntity.ok().build();
|
||||
return ResponseEntity.ok(ApiResponse.success());
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/permissions")
|
||||
public ResponseEntity<Void> assignPermissions(
|
||||
public ResponseEntity<ApiResponse<Void>> assignPermissions(
|
||||
@PathVariable UUID id,
|
||||
@RequestBody List<UUID> permissionIds) {
|
||||
roleService.assignPermissions(id, permissionIds);
|
||||
return ResponseEntity.ok().build();
|
||||
return ResponseEntity.ok(ApiResponse.success());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.ether.pms.auth.controller;
|
|||
|
||||
import com.ether.pms.auth.entity.User;
|
||||
import com.ether.pms.auth.service.UserService;
|
||||
import com.ether.pms.common.ApiResponse;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
|
@ -17,45 +18,45 @@ public class UserController {
|
|||
private final UserService userService;
|
||||
|
||||
@GetMapping
|
||||
public ResponseEntity<List<User>> findAll() {
|
||||
return ResponseEntity.ok(userService.findAll());
|
||||
public ResponseEntity<ApiResponse<List<User>>> findAll() {
|
||||
return ResponseEntity.ok(ApiResponse.success(userService.findAll()));
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public ResponseEntity<User> findById(@PathVariable UUID id) {
|
||||
return ResponseEntity.ok(userService.findById(id));
|
||||
public ResponseEntity<ApiResponse<User>> findById(@PathVariable UUID id) {
|
||||
return ResponseEntity.ok(ApiResponse.success(userService.findById(id)));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public ResponseEntity<User> create(@RequestBody User user) {
|
||||
return ResponseEntity.ok(userService.create(user));
|
||||
public ResponseEntity<ApiResponse<User>> create(@RequestBody User user) {
|
||||
return ResponseEntity.ok(ApiResponse.success(userService.create(user)));
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
public ResponseEntity<User> update(@PathVariable UUID id, @RequestBody User user) {
|
||||
return ResponseEntity.ok(userService.update(id, user));
|
||||
public ResponseEntity<ApiResponse<User>> update(@PathVariable UUID id, @RequestBody User user) {
|
||||
return ResponseEntity.ok(ApiResponse.success(userService.update(id, user)));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public ResponseEntity<Void> delete(@PathVariable UUID id) {
|
||||
public ResponseEntity<ApiResponse<Void>> delete(@PathVariable UUID id) {
|
||||
userService.delete(id);
|
||||
return ResponseEntity.ok().build();
|
||||
return ResponseEntity.ok(ApiResponse.success());
|
||||
}
|
||||
|
||||
@PutMapping("/{id}/password")
|
||||
public ResponseEntity<Void> updatePassword(
|
||||
public ResponseEntity<ApiResponse<Void>> updatePassword(
|
||||
@PathVariable UUID id,
|
||||
@RequestParam String oldPassword,
|
||||
@RequestParam String newPassword) {
|
||||
userService.updatePassword(id, oldPassword, newPassword);
|
||||
return ResponseEntity.ok().build();
|
||||
return ResponseEntity.ok(ApiResponse.success());
|
||||
}
|
||||
|
||||
@PostMapping("/{id}/roles")
|
||||
public ResponseEntity<Void> assignRoles(
|
||||
public ResponseEntity<ApiResponse<Void>> assignRoles(
|
||||
@PathVariable UUID id,
|
||||
@RequestBody List<UUID> roleIds) {
|
||||
userService.assignRoles(id, roleIds);
|
||||
return ResponseEntity.ok().build();
|
||||
return ResponseEntity.ok(ApiResponse.success());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.ether.pms.mdm.controller;
|
|||
|
||||
import com.ether.pms.mdm.entity.Project;
|
||||
import com.ether.pms.mdm.service.ProjectService;
|
||||
import com.ether.pms.common.ApiResponse;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
|
@ -17,33 +18,33 @@ public class ProjectController {
|
|||
private final ProjectService projectService;
|
||||
|
||||
@GetMapping
|
||||
public ResponseEntity<List<Project>> findAll() {
|
||||
return ResponseEntity.ok(projectService.findAll());
|
||||
public ResponseEntity<ApiResponse<List<Project>>> findAll() {
|
||||
return ResponseEntity.ok(ApiResponse.success(projectService.findAll()));
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public ResponseEntity<Project> findById(@PathVariable UUID id) {
|
||||
return ResponseEntity.ok(projectService.findById(id));
|
||||
public ResponseEntity<ApiResponse<Project>> findById(@PathVariable UUID id) {
|
||||
return ResponseEntity.ok(ApiResponse.success(projectService.findById(id)));
|
||||
}
|
||||
|
||||
@GetMapping("/code/{code}")
|
||||
public ResponseEntity<Project> findByCode(@PathVariable String code) {
|
||||
return ResponseEntity.ok(projectService.findByCode(code));
|
||||
public ResponseEntity<ApiResponse<Project>> findByCode(@PathVariable String code) {
|
||||
return ResponseEntity.ok(ApiResponse.success(projectService.findByCode(code)));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public ResponseEntity<Project> create(@RequestBody Project project) {
|
||||
return ResponseEntity.ok(projectService.create(project));
|
||||
public ResponseEntity<ApiResponse<Project>> create(@RequestBody Project project) {
|
||||
return ResponseEntity.ok(ApiResponse.success(projectService.create(project)));
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
public ResponseEntity<Project> update(@PathVariable UUID id, @RequestBody Project project) {
|
||||
return ResponseEntity.ok(projectService.update(id, project));
|
||||
public ResponseEntity<ApiResponse<Project>> update(@PathVariable UUID id, @RequestBody Project project) {
|
||||
return ResponseEntity.ok(ApiResponse.success(projectService.update(id, project)));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public ResponseEntity<Void> delete(@PathVariable UUID id) {
|
||||
public ResponseEntity<ApiResponse<Void>> delete(@PathVariable UUID id) {
|
||||
projectService.delete(id);
|
||||
return ResponseEntity.ok().build();
|
||||
return ResponseEntity.ok(ApiResponse.success());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.ether.pms.mdm.controller;
|
|||
|
||||
import com.ether.pms.mdm.entity.SpaceNode;
|
||||
import com.ether.pms.mdm.service.SpaceNodeService;
|
||||
import com.ether.pms.common.ApiResponse;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
|
@ -17,45 +18,45 @@ public class SpaceNodeController {
|
|||
private final SpaceNodeService spaceNodeService;
|
||||
|
||||
@GetMapping
|
||||
public ResponseEntity<List<SpaceNode>> findAll() {
|
||||
return ResponseEntity.ok(spaceNodeService.findAll());
|
||||
public ResponseEntity<ApiResponse<List<SpaceNode>>> findAll() {
|
||||
return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findAll()));
|
||||
}
|
||||
|
||||
@GetMapping("/{id}")
|
||||
public ResponseEntity<SpaceNode> findById(@PathVariable UUID id) {
|
||||
return ResponseEntity.ok(spaceNodeService.findById(id));
|
||||
public ResponseEntity<ApiResponse<SpaceNode>> findById(@PathVariable UUID id) {
|
||||
return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findById(id)));
|
||||
}
|
||||
|
||||
@GetMapping("/project/{projectCode}")
|
||||
public ResponseEntity<List<SpaceNode>> findByProject(@PathVariable String projectCode) {
|
||||
return ResponseEntity.ok(spaceNodeService.findByProject(projectCode));
|
||||
public ResponseEntity<ApiResponse<List<SpaceNode>>> findByProject(@PathVariable String projectCode) {
|
||||
return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findByProject(projectCode)));
|
||||
}
|
||||
|
||||
@GetMapping("/project/{projectCode}/type/{nodeType}")
|
||||
public ResponseEntity<List<SpaceNode>> findByProjectAndType(
|
||||
public ResponseEntity<ApiResponse<List<SpaceNode>>> findByProjectAndType(
|
||||
@PathVariable String projectCode,
|
||||
@PathVariable String nodeType) {
|
||||
return ResponseEntity.ok(spaceNodeService.findByProjectAndType(projectCode, nodeType));
|
||||
return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findByProjectAndType(projectCode, nodeType)));
|
||||
}
|
||||
|
||||
@GetMapping("/parent/{parentCode}")
|
||||
public ResponseEntity<List<SpaceNode>> findByParent(@PathVariable String parentCode) {
|
||||
return ResponseEntity.ok(spaceNodeService.findByParent(parentCode));
|
||||
public ResponseEntity<ApiResponse<List<SpaceNode>>> findByParent(@PathVariable String parentCode) {
|
||||
return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findByParent(parentCode)));
|
||||
}
|
||||
|
||||
@PostMapping
|
||||
public ResponseEntity<SpaceNode> create(@RequestBody SpaceNode spaceNode) {
|
||||
return ResponseEntity.ok(spaceNodeService.create(spaceNode));
|
||||
public ResponseEntity<ApiResponse<SpaceNode>> create(@RequestBody SpaceNode spaceNode) {
|
||||
return ResponseEntity.ok(ApiResponse.success(spaceNodeService.create(spaceNode)));
|
||||
}
|
||||
|
||||
@PutMapping("/{id}")
|
||||
public ResponseEntity<SpaceNode> update(@PathVariable UUID id, @RequestBody SpaceNode spaceNode) {
|
||||
return ResponseEntity.ok(spaceNodeService.update(id, spaceNode));
|
||||
public ResponseEntity<ApiResponse<SpaceNode>> update(@PathVariable UUID id, @RequestBody SpaceNode spaceNode) {
|
||||
return ResponseEntity.ok(ApiResponse.success(spaceNodeService.update(id, spaceNode)));
|
||||
}
|
||||
|
||||
@DeleteMapping("/{id}")
|
||||
public ResponseEntity<Void> delete(@PathVariable UUID id) {
|
||||
public ResponseEntity<ApiResponse<Void>> delete(@PathVariable UUID id) {
|
||||
spaceNodeService.delete(id);
|
||||
return ResponseEntity.ok().build();
|
||||
return ResponseEntity.ok(ApiResponse.success());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue