ether
/
ether-pms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 统一所有Controller响应格式为ApiResponse 

- PermissionController
- RoleController
- UserController
- ProjectController
- SpaceNodeController
This commit is contained in:
chiguyong 2026-03-17 23:45:16 +08:00
parent d12edef2ce
commit e6eac0fc56
5 changed files with 75 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
module-auth/src/main/java/com/ether/pms/auth/controller/PermissionController.java
View File

@ -2,6 +2,7 @@ package com.ether.pms.auth.controller;
import com.ether.pms.auth.entity.Permission; import com.ether.pms.auth.entity.Permission;
import com.ether.pms.auth.service.PermissionService; import com.ether.pms.auth.service.PermissionService;
import com.ether.pms.common.ApiResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -17,38 +18,38 @@ public class PermissionController {
private final PermissionService permissionService; private final PermissionService permissionService;
@GetMapping @GetMapping
public ResponseEntity<List<Permission>> findAll() { public ResponseEntity<ApiResponse<List<Permission>>> findAll() {
return ResponseEntity.ok(permissionService.findAll()); return ResponseEntity.ok(ApiResponse.success(permissionService.findAll()));
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public ResponseEntity<Permission> findById(@PathVariable UUID id) { public ResponseEntity<ApiResponse<Permission>> findById(@PathVariable UUID id) {
return ResponseEntity.ok(permissionService.findById(id)); return ResponseEntity.ok(ApiResponse.success(permissionService.findById(id)));
} }
@GetMapping("/type/{type}") @GetMapping("/type/{type}")
public ResponseEntity<List<Permission>> findByType(@PathVariable String type) { public ResponseEntity<ApiResponse<List<Permission>>> findByType(@PathVariable String type) {
return ResponseEntity.ok(permissionService.findByType(type)); return ResponseEntity.ok(ApiResponse.success(permissionService.findByType(type)));
} }
@GetMapping("/menus") @GetMapping("/menus")
public ResponseEntity<List<Permission>> findMenus() { public ResponseEntity<ApiResponse<List<Permission>>> findMenus() {
return ResponseEntity.ok(permissionService.findMenuPermissions()); return ResponseEntity.ok(ApiResponse.success(permissionService.findMenuPermissions()));
} }
@PostMapping @PostMapping
public ResponseEntity<Permission> create(@RequestBody Permission permission) { public ResponseEntity<ApiResponse<Permission>> create(@RequestBody Permission permission) {
return ResponseEntity.ok(permissionService.create(permission)); return ResponseEntity.ok(ApiResponse.success(permissionService.create(permission)));
} }
@PutMapping("/{id}") @PutMapping("/{id}")
public ResponseEntity<Permission> update(@PathVariable UUID id, @RequestBody Permission permission) { public ResponseEntity<ApiResponse<Permission>> update(@PathVariable UUID id, @RequestBody Permission permission) {
return ResponseEntity.ok(permissionService.update(id, permission)); return ResponseEntity.ok(ApiResponse.success(permissionService.update(id, permission)));
} }
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
public ResponseEntity<Void> delete(@PathVariable UUID id) { public ResponseEntity<ApiResponse<Void>> delete(@PathVariable UUID id) {
permissionService.delete(id); permissionService.delete(id);
return ResponseEntity.ok().build(); return ResponseEntity.ok(ApiResponse.success());
} }
} }

29
module-auth/src/main/java/com/ether/pms/auth/controller/RoleController.java
View File

@ -2,6 +2,7 @@ package com.ether.pms.auth.controller;
import com.ether.pms.auth.entity.Role; import com.ether.pms.auth.entity.Role;
import com.ether.pms.auth.service.RoleService; import com.ether.pms.auth.service.RoleService;
import com.ether.pms.common.ApiResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -17,41 +18,41 @@ public class RoleController {
private final RoleService roleService; private final RoleService roleService;
@GetMapping @GetMapping
public ResponseEntity<List<Role>> findAll() { public ResponseEntity<ApiResponse<List<Role>>> findAll() {
return ResponseEntity.ok(roleService.findAll()); return ResponseEntity.ok(ApiResponse.success(roleService.findAll()));
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public ResponseEntity<Role> findById(@PathVariable UUID id) { public ResponseEntity<ApiResponse<Role>> findById(@PathVariable UUID id) {
return ResponseEntity.ok(roleService.findById(id)); return ResponseEntity.ok(ApiResponse.success(roleService.findById(id)));
} }
@GetMapping("/project/{projectId}") @GetMapping("/project/{projectId}")
public ResponseEntity<List<Role>> findByProjectId(@PathVariable String projectId) { public ResponseEntity<ApiResponse<List<Role>>> findByProjectId(@PathVariable String projectId) {
return ResponseEntity.ok(roleService.findByProjectId(projectId)); return ResponseEntity.ok(ApiResponse.success(roleService.findByProjectId(projectId)));
} }
@PostMapping @PostMapping
public ResponseEntity<Role> create(@RequestBody Role role) { public ResponseEntity<ApiResponse<Role>> create(@RequestBody Role role) {
return ResponseEntity.ok(roleService.create(role)); return ResponseEntity.ok(ApiResponse.success(roleService.create(role)));
} }
@PutMapping("/{id}") @PutMapping("/{id}")
public ResponseEntity<Role> update(@PathVariable UUID id, @RequestBody Role role) { public ResponseEntity<ApiResponse<Role>> update(@PathVariable UUID id, @RequestBody Role role) {
return ResponseEntity.ok(roleService.update(id, role)); return ResponseEntity.ok(ApiResponse.success(roleService.update(id, role)));
} }
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
public ResponseEntity<Void> delete(@PathVariable UUID id) { public ResponseEntity<ApiResponse<Void>> delete(@PathVariable UUID id) {
roleService.delete(id); roleService.delete(id);
return ResponseEntity.ok().build(); return ResponseEntity.ok(ApiResponse.success());
} }
@PostMapping("/{id}/permissions") @PostMapping("/{id}/permissions")
public ResponseEntity<Void> assignPermissions( public ResponseEntity<ApiResponse<Void>> assignPermissions(
@PathVariable UUID id, @PathVariable UUID id,
@RequestBody List<UUID> permissionIds) { @RequestBody List<UUID> permissionIds) {
roleService.assignPermissions(id, permissionIds); roleService.assignPermissions(id, permissionIds);
return ResponseEntity.ok().build(); return ResponseEntity.ok(ApiResponse.success());
} }
} }

29
module-auth/src/main/java/com/ether/pms/auth/controller/UserController.java
View File

@ -2,6 +2,7 @@ package com.ether.pms.auth.controller;
import com.ether.pms.auth.entity.User; import com.ether.pms.auth.entity.User;
import com.ether.pms.auth.service.UserService; import com.ether.pms.auth.service.UserService;
import com.ether.pms.common.ApiResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -17,45 +18,45 @@ public class UserController {
private final UserService userService; private final UserService userService;
@GetMapping @GetMapping
public ResponseEntity<List<User>> findAll() { public ResponseEntity<ApiResponse<List<User>>> findAll() {
return ResponseEntity.ok(userService.findAll()); return ResponseEntity.ok(ApiResponse.success(userService.findAll()));
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public ResponseEntity<User> findById(@PathVariable UUID id) { public ResponseEntity<ApiResponse<User>> findById(@PathVariable UUID id) {
return ResponseEntity.ok(userService.findById(id)); return ResponseEntity.ok(ApiResponse.success(userService.findById(id)));
} }
@PostMapping @PostMapping
public ResponseEntity<User> create(@RequestBody User user) { public ResponseEntity<ApiResponse<User>> create(@RequestBody User user) {
return ResponseEntity.ok(userService.create(user)); return ResponseEntity.ok(ApiResponse.success(userService.create(user)));
} }
@PutMapping("/{id}") @PutMapping("/{id}")
public ResponseEntity<User> update(@PathVariable UUID id, @RequestBody User user) { public ResponseEntity<ApiResponse<User>> update(@PathVariable UUID id, @RequestBody User user) {
return ResponseEntity.ok(userService.update(id, user)); return ResponseEntity.ok(ApiResponse.success(userService.update(id, user)));
} }
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
public ResponseEntity<Void> delete(@PathVariable UUID id) { public ResponseEntity<ApiResponse<Void>> delete(@PathVariable UUID id) {
userService.delete(id); userService.delete(id);
return ResponseEntity.ok().build(); return ResponseEntity.ok(ApiResponse.success());
} }
@PutMapping("/{id}/password") @PutMapping("/{id}/password")
public ResponseEntity<Void> updatePassword( public ResponseEntity<ApiResponse<Void>> updatePassword(
@PathVariable UUID id, @PathVariable UUID id,
@RequestParam String oldPassword, @RequestParam String oldPassword,
@RequestParam String newPassword) { @RequestParam String newPassword) {
userService.updatePassword(id, oldPassword, newPassword); userService.updatePassword(id, oldPassword, newPassword);
return ResponseEntity.ok().build(); return ResponseEntity.ok(ApiResponse.success());
} }
@PostMapping("/{id}/roles") @PostMapping("/{id}/roles")
public ResponseEntity<Void> assignRoles( public ResponseEntity<ApiResponse<Void>> assignRoles(
@PathVariable UUID id, @PathVariable UUID id,
@RequestBody List<UUID> roleIds) { @RequestBody List<UUID> roleIds) {
userService.assignRoles(id, roleIds); userService.assignRoles(id, roleIds);
return ResponseEntity.ok().build(); return ResponseEntity.ok(ApiResponse.success());
} }
} }

25
module-mdm/src/main/java/com/ether/pms/mdm/controller/ProjectController.java
View File

@ -2,6 +2,7 @@ package com.ether.pms.mdm.controller;
import com.ether.pms.mdm.entity.Project; import com.ether.pms.mdm.entity.Project;
import com.ether.pms.mdm.service.ProjectService; import com.ether.pms.mdm.service.ProjectService;
import com.ether.pms.common.ApiResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -17,33 +18,33 @@ public class ProjectController {
private final ProjectService projectService; private final ProjectService projectService;
@GetMapping @GetMapping
public ResponseEntity<List<Project>> findAll() { public ResponseEntity<ApiResponse<List<Project>>> findAll() {
return ResponseEntity.ok(projectService.findAll()); return ResponseEntity.ok(ApiResponse.success(projectService.findAll()));
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public ResponseEntity<Project> findById(@PathVariable UUID id) { public ResponseEntity<ApiResponse<Project>> findById(@PathVariable UUID id) {
return ResponseEntity.ok(projectService.findById(id)); return ResponseEntity.ok(ApiResponse.success(projectService.findById(id)));
} }
@GetMapping("/code/{code}") @GetMapping("/code/{code}")
public ResponseEntity<Project> findByCode(@PathVariable String code) { public ResponseEntity<ApiResponse<Project>> findByCode(@PathVariable String code) {
return ResponseEntity.ok(projectService.findByCode(code)); return ResponseEntity.ok(ApiResponse.success(projectService.findByCode(code)));
} }
@PostMapping @PostMapping
public ResponseEntity<Project> create(@RequestBody Project project) { public ResponseEntity<ApiResponse<Project>> create(@RequestBody Project project) {
return ResponseEntity.ok(projectService.create(project)); return ResponseEntity.ok(ApiResponse.success(projectService.create(project)));
} }
@PutMapping("/{id}") @PutMapping("/{id}")
public ResponseEntity<Project> update(@PathVariable UUID id, @RequestBody Project project) { public ResponseEntity<ApiResponse<Project>> update(@PathVariable UUID id, @RequestBody Project project) {
return ResponseEntity.ok(projectService.update(id, project)); return ResponseEntity.ok(ApiResponse.success(projectService.update(id, project)));
} }
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
public ResponseEntity<Void> delete(@PathVariable UUID id) { public ResponseEntity<ApiResponse<Void>> delete(@PathVariable UUID id) {
projectService.delete(id); projectService.delete(id);
return ResponseEntity.ok().build(); return ResponseEntity.ok(ApiResponse.success());
} }
} }

33
module-mdm/src/main/java/com/ether/pms/mdm/controller/SpaceNodeController.java
View File

@ -2,6 +2,7 @@ package com.ether.pms.mdm.controller;
import com.ether.pms.mdm.entity.SpaceNode; import com.ether.pms.mdm.entity.SpaceNode;
import com.ether.pms.mdm.service.SpaceNodeService; import com.ether.pms.mdm.service.SpaceNodeService;
import com.ether.pms.common.ApiResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -17,45 +18,45 @@ public class SpaceNodeController {
private final SpaceNodeService spaceNodeService; private final SpaceNodeService spaceNodeService;
@GetMapping @GetMapping
public ResponseEntity<List<SpaceNode>> findAll() { public ResponseEntity<ApiResponse<List<SpaceNode>>> findAll() {
return ResponseEntity.ok(spaceNodeService.findAll()); return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findAll()));
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public ResponseEntity<SpaceNode> findById(@PathVariable UUID id) { public ResponseEntity<ApiResponse<SpaceNode>> findById(@PathVariable UUID id) {
return ResponseEntity.ok(spaceNodeService.findById(id)); return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findById(id)));
} }
@GetMapping("/project/{projectCode}") @GetMapping("/project/{projectCode}")
public ResponseEntity<List<SpaceNode>> findByProject(@PathVariable String projectCode) { public ResponseEntity<ApiResponse<List<SpaceNode>>> findByProject(@PathVariable String projectCode) {
return ResponseEntity.ok(spaceNodeService.findByProject(projectCode)); return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findByProject(projectCode)));
} }
@GetMapping("/project/{projectCode}/type/{nodeType}") @GetMapping("/project/{projectCode}/type/{nodeType}")
public ResponseEntity<List<SpaceNode>> findByProjectAndType( public ResponseEntity<ApiResponse<List<SpaceNode>>> findByProjectAndType(
@PathVariable String projectCode, @PathVariable String projectCode,
@PathVariable String nodeType) { @PathVariable String nodeType) {
return ResponseEntity.ok(spaceNodeService.findByProjectAndType(projectCode, nodeType)); return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findByProjectAndType(projectCode, nodeType)));
} }
@GetMapping("/parent/{parentCode}") @GetMapping("/parent/{parentCode}")
public ResponseEntity<List<SpaceNode>> findByParent(@PathVariable String parentCode) { public ResponseEntity<ApiResponse<List<SpaceNode>>> findByParent(@PathVariable String parentCode) {
return ResponseEntity.ok(spaceNodeService.findByParent(parentCode)); return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findByParent(parentCode)));
} }
@PostMapping @PostMapping
public ResponseEntity<SpaceNode> create(@RequestBody SpaceNode spaceNode) { public ResponseEntity<ApiResponse<SpaceNode>> create(@RequestBody SpaceNode spaceNode) {
return ResponseEntity.ok(spaceNodeService.create(spaceNode)); return ResponseEntity.ok(ApiResponse.success(spaceNodeService.create(spaceNode)));
} }
@PutMapping("/{id}") @PutMapping("/{id}")
public ResponseEntity<SpaceNode> update(@PathVariable UUID id, @RequestBody SpaceNode spaceNode) { public ResponseEntity<ApiResponse<SpaceNode>> update(@PathVariable UUID id, @RequestBody SpaceNode spaceNode) {
return ResponseEntity.ok(spaceNodeService.update(id, spaceNode)); return ResponseEntity.ok(ApiResponse.success(spaceNodeService.update(id, spaceNode)));
} }
@DeleteMapping("/{id}") @DeleteMapping("/{id}")
public ResponseEntity<Void> delete(@PathVariable UUID id) { public ResponseEntity<ApiResponse<Void>> delete(@PathVariable UUID id) {
spaceNodeService.delete(id); spaceNodeService.delete(id);
return ResponseEntity.ok().build(); return ResponseEntity.ok(ApiResponse.success());
} }
} }