diff --git a/module-auth/src/main/java/com/ether/pms/auth/controller/PermissionController.java b/module-auth/src/main/java/com/ether/pms/auth/controller/PermissionController.java index 36de4b0..cbf15d7 100644 --- a/module-auth/src/main/java/com/ether/pms/auth/controller/PermissionController.java +++ b/module-auth/src/main/java/com/ether/pms/auth/controller/PermissionController.java @@ -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> findAll() { - return ResponseEntity.ok(permissionService.findAll()); + public ResponseEntity>> findAll() { + return ResponseEntity.ok(ApiResponse.success(permissionService.findAll())); } @GetMapping("/{id}") - public ResponseEntity findById(@PathVariable UUID id) { - return ResponseEntity.ok(permissionService.findById(id)); + public ResponseEntity> findById(@PathVariable UUID id) { + return ResponseEntity.ok(ApiResponse.success(permissionService.findById(id))); } @GetMapping("/type/{type}") - public ResponseEntity> findByType(@PathVariable String type) { - return ResponseEntity.ok(permissionService.findByType(type)); + public ResponseEntity>> findByType(@PathVariable String type) { + return ResponseEntity.ok(ApiResponse.success(permissionService.findByType(type))); } @GetMapping("/menus") - public ResponseEntity> findMenus() { - return ResponseEntity.ok(permissionService.findMenuPermissions()); + public ResponseEntity>> findMenus() { + return ResponseEntity.ok(ApiResponse.success(permissionService.findMenuPermissions())); } @PostMapping - public ResponseEntity create(@RequestBody Permission permission) { - return ResponseEntity.ok(permissionService.create(permission)); + public ResponseEntity> create(@RequestBody Permission permission) { + return ResponseEntity.ok(ApiResponse.success(permissionService.create(permission))); } @PutMapping("/{id}") - public ResponseEntity update(@PathVariable UUID id, @RequestBody Permission permission) { - return ResponseEntity.ok(permissionService.update(id, permission)); + public ResponseEntity> update(@PathVariable UUID id, @RequestBody Permission permission) { + return ResponseEntity.ok(ApiResponse.success(permissionService.update(id, permission))); } @DeleteMapping("/{id}") - public ResponseEntity delete(@PathVariable UUID id) { + public ResponseEntity> delete(@PathVariable UUID id) { permissionService.delete(id); - return ResponseEntity.ok().build(); + return ResponseEntity.ok(ApiResponse.success()); } } diff --git a/module-auth/src/main/java/com/ether/pms/auth/controller/RoleController.java b/module-auth/src/main/java/com/ether/pms/auth/controller/RoleController.java index a56d7c6..18344f7 100644 --- a/module-auth/src/main/java/com/ether/pms/auth/controller/RoleController.java +++ b/module-auth/src/main/java/com/ether/pms/auth/controller/RoleController.java @@ -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> findAll() { - return ResponseEntity.ok(roleService.findAll()); + public ResponseEntity>> findAll() { + return ResponseEntity.ok(ApiResponse.success(roleService.findAll())); } @GetMapping("/{id}") - public ResponseEntity findById(@PathVariable UUID id) { - return ResponseEntity.ok(roleService.findById(id)); + public ResponseEntity> findById(@PathVariable UUID id) { + return ResponseEntity.ok(ApiResponse.success(roleService.findById(id))); } @GetMapping("/project/{projectId}") - public ResponseEntity> findByProjectId(@PathVariable String projectId) { - return ResponseEntity.ok(roleService.findByProjectId(projectId)); + public ResponseEntity>> findByProjectId(@PathVariable String projectId) { + return ResponseEntity.ok(ApiResponse.success(roleService.findByProjectId(projectId))); } @PostMapping - public ResponseEntity create(@RequestBody Role role) { - return ResponseEntity.ok(roleService.create(role)); + public ResponseEntity> create(@RequestBody Role role) { + return ResponseEntity.ok(ApiResponse.success(roleService.create(role))); } @PutMapping("/{id}") - public ResponseEntity update(@PathVariable UUID id, @RequestBody Role role) { - return ResponseEntity.ok(roleService.update(id, role)); + public ResponseEntity> update(@PathVariable UUID id, @RequestBody Role role) { + return ResponseEntity.ok(ApiResponse.success(roleService.update(id, role))); } @DeleteMapping("/{id}") - public ResponseEntity delete(@PathVariable UUID id) { + public ResponseEntity> delete(@PathVariable UUID id) { roleService.delete(id); - return ResponseEntity.ok().build(); + return ResponseEntity.ok(ApiResponse.success()); } @PostMapping("/{id}/permissions") - public ResponseEntity assignPermissions( + public ResponseEntity> assignPermissions( @PathVariable UUID id, @RequestBody List permissionIds) { roleService.assignPermissions(id, permissionIds); - return ResponseEntity.ok().build(); + return ResponseEntity.ok(ApiResponse.success()); } } diff --git a/module-auth/src/main/java/com/ether/pms/auth/controller/UserController.java b/module-auth/src/main/java/com/ether/pms/auth/controller/UserController.java index a241b8b..a93eaa3 100644 --- a/module-auth/src/main/java/com/ether/pms/auth/controller/UserController.java +++ b/module-auth/src/main/java/com/ether/pms/auth/controller/UserController.java @@ -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> findAll() { - return ResponseEntity.ok(userService.findAll()); + public ResponseEntity>> findAll() { + return ResponseEntity.ok(ApiResponse.success(userService.findAll())); } @GetMapping("/{id}") - public ResponseEntity findById(@PathVariable UUID id) { - return ResponseEntity.ok(userService.findById(id)); + public ResponseEntity> findById(@PathVariable UUID id) { + return ResponseEntity.ok(ApiResponse.success(userService.findById(id))); } @PostMapping - public ResponseEntity create(@RequestBody User user) { - return ResponseEntity.ok(userService.create(user)); + public ResponseEntity> create(@RequestBody User user) { + return ResponseEntity.ok(ApiResponse.success(userService.create(user))); } @PutMapping("/{id}") - public ResponseEntity update(@PathVariable UUID id, @RequestBody User user) { - return ResponseEntity.ok(userService.update(id, user)); + public ResponseEntity> update(@PathVariable UUID id, @RequestBody User user) { + return ResponseEntity.ok(ApiResponse.success(userService.update(id, user))); } @DeleteMapping("/{id}") - public ResponseEntity delete(@PathVariable UUID id) { + public ResponseEntity> delete(@PathVariable UUID id) { userService.delete(id); - return ResponseEntity.ok().build(); + return ResponseEntity.ok(ApiResponse.success()); } @PutMapping("/{id}/password") - public ResponseEntity updatePassword( + public ResponseEntity> 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 assignRoles( + public ResponseEntity> assignRoles( @PathVariable UUID id, @RequestBody List roleIds) { userService.assignRoles(id, roleIds); - return ResponseEntity.ok().build(); + return ResponseEntity.ok(ApiResponse.success()); } } diff --git a/module-mdm/src/main/java/com/ether/pms/mdm/controller/ProjectController.java b/module-mdm/src/main/java/com/ether/pms/mdm/controller/ProjectController.java index 4671b48..0b6d786 100644 --- a/module-mdm/src/main/java/com/ether/pms/mdm/controller/ProjectController.java +++ b/module-mdm/src/main/java/com/ether/pms/mdm/controller/ProjectController.java @@ -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> findAll() { - return ResponseEntity.ok(projectService.findAll()); + public ResponseEntity>> findAll() { + return ResponseEntity.ok(ApiResponse.success(projectService.findAll())); } @GetMapping("/{id}") - public ResponseEntity findById(@PathVariable UUID id) { - return ResponseEntity.ok(projectService.findById(id)); + public ResponseEntity> findById(@PathVariable UUID id) { + return ResponseEntity.ok(ApiResponse.success(projectService.findById(id))); } @GetMapping("/code/{code}") - public ResponseEntity findByCode(@PathVariable String code) { - return ResponseEntity.ok(projectService.findByCode(code)); + public ResponseEntity> findByCode(@PathVariable String code) { + return ResponseEntity.ok(ApiResponse.success(projectService.findByCode(code))); } @PostMapping - public ResponseEntity create(@RequestBody Project project) { - return ResponseEntity.ok(projectService.create(project)); + public ResponseEntity> create(@RequestBody Project project) { + return ResponseEntity.ok(ApiResponse.success(projectService.create(project))); } @PutMapping("/{id}") - public ResponseEntity update(@PathVariable UUID id, @RequestBody Project project) { - return ResponseEntity.ok(projectService.update(id, project)); + public ResponseEntity> update(@PathVariable UUID id, @RequestBody Project project) { + return ResponseEntity.ok(ApiResponse.success(projectService.update(id, project))); } @DeleteMapping("/{id}") - public ResponseEntity delete(@PathVariable UUID id) { + public ResponseEntity> delete(@PathVariable UUID id) { projectService.delete(id); - return ResponseEntity.ok().build(); + return ResponseEntity.ok(ApiResponse.success()); } } diff --git a/module-mdm/src/main/java/com/ether/pms/mdm/controller/SpaceNodeController.java b/module-mdm/src/main/java/com/ether/pms/mdm/controller/SpaceNodeController.java index f548816..49731aa 100644 --- a/module-mdm/src/main/java/com/ether/pms/mdm/controller/SpaceNodeController.java +++ b/module-mdm/src/main/java/com/ether/pms/mdm/controller/SpaceNodeController.java @@ -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> findAll() { - return ResponseEntity.ok(spaceNodeService.findAll()); + public ResponseEntity>> findAll() { + return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findAll())); } @GetMapping("/{id}") - public ResponseEntity findById(@PathVariable UUID id) { - return ResponseEntity.ok(spaceNodeService.findById(id)); + public ResponseEntity> findById(@PathVariable UUID id) { + return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findById(id))); } @GetMapping("/project/{projectCode}") - public ResponseEntity> findByProject(@PathVariable String projectCode) { - return ResponseEntity.ok(spaceNodeService.findByProject(projectCode)); + public ResponseEntity>> findByProject(@PathVariable String projectCode) { + return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findByProject(projectCode))); } @GetMapping("/project/{projectCode}/type/{nodeType}") - public ResponseEntity> findByProjectAndType( + public ResponseEntity>> 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> findByParent(@PathVariable String parentCode) { - return ResponseEntity.ok(spaceNodeService.findByParent(parentCode)); + public ResponseEntity>> findByParent(@PathVariable String parentCode) { + return ResponseEntity.ok(ApiResponse.success(spaceNodeService.findByParent(parentCode))); } @PostMapping - public ResponseEntity create(@RequestBody SpaceNode spaceNode) { - return ResponseEntity.ok(spaceNodeService.create(spaceNode)); + public ResponseEntity> create(@RequestBody SpaceNode spaceNode) { + return ResponseEntity.ok(ApiResponse.success(spaceNodeService.create(spaceNode))); } @PutMapping("/{id}") - public ResponseEntity update(@PathVariable UUID id, @RequestBody SpaceNode spaceNode) { - return ResponseEntity.ok(spaceNodeService.update(id, spaceNode)); + public ResponseEntity> update(@PathVariable UUID id, @RequestBody SpaceNode spaceNode) { + return ResponseEntity.ok(ApiResponse.success(spaceNodeService.update(id, spaceNode))); } @DeleteMapping("/{id}") - public ResponseEntity delete(@PathVariable UUID id) { + public ResponseEntity> delete(@PathVariable UUID id) { spaceNodeService.delete(id); - return ResponseEntity.ok().build(); + return ResponseEntity.ok(ApiResponse.success()); } }