From 7a6d2b5c4b4f30f881ce02726d3ac1738c6b8e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lsd=E4=B8=8D=E6=98=AF=E6=B2=99=E9=9B=95?= Date: Fri, 5 Jul 2024 16:32:15 +0800 Subject: [PATCH] recovery --- .../controller/TenantManagementController.java | 7 +++---- .../controller/UserManagementController.java | 5 ++--- .../repository/TenantManagementRepository.java | 2 ++ .../repository/UserManagementRepository.java | 2 ++ .../UserManagement/service/TenantManagementService.java | 2 ++ .../UserManagement/service/UserManagementService.java | 2 +- .../backend/authentication/controller/UserController.java | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java b/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java index f31a1f9..18fc546 100644 --- a/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java +++ b/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java @@ -3,6 +3,7 @@ package org.cmh.backend.UserManagement.controller; import jakarta.transaction.Transactional; import org.cmh.backend.UserManagement.model.Tenant; import org.cmh.backend.UserManagement.service.TenantManagementService; +import org.cmh.backend.authentication.model.User; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -38,10 +39,8 @@ public class TenantManagementController { @CrossOrigin(origins = "http://localhost:5173") @PostMapping("/deleteTenant") @Transactional - public boolean delete(@RequestBody Tenant tenant) { - System.out.println(tenant); - tenantManagementService.delete(tenant.getName()); - return true; + public void delete(@RequestBody User user) { + tenantManagementService.delete(user.getId()); } } diff --git a/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java b/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java index e6ca4a3..ef3e873 100644 --- a/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java +++ b/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java @@ -42,10 +42,9 @@ public class UserManagementController { @CrossOrigin(origins = "http://localhost:5173") @PostMapping("/delete") @Transactional - public boolean delete(@RequestBody User user) { + public void delete(@RequestBody User user) { System.out.println(user); - userManagementService.delete(user.getAccount()); - return true; + userManagementService.delete(user.getId()); } } diff --git a/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java b/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java index 979fa88..b9e8b5d 100644 --- a/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java +++ b/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java @@ -12,4 +12,6 @@ public interface TenantManagementRepository extends JpaRepository{ Tenant findTenantById(Long id); Tenant deleteByName(String Name); + + void deleteById(Long id); } diff --git a/src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java b/src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java index 250e33e..efcd3ca 100644 --- a/src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java +++ b/src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java @@ -19,4 +19,6 @@ public interface UserManagementRepository extends JpaRepository { User deleteByAccount(String account); + void deleteById(Long id); + } diff --git a/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java b/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java index ba77df5..f52e511 100644 --- a/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java +++ b/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java @@ -24,4 +24,6 @@ public class TenantManagementService { public Tenant update(Tenant tenant){return tenantManagementRepository.save(tenant);} public Tenant delete(String name){return tenantManagementRepository.deleteByName(name);} + + public void delete(Long id){tenantManagementRepository.deleteById(id);} } diff --git a/src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java b/src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java index 1bd84b9..4f71671 100644 --- a/src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java +++ b/src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java @@ -26,6 +26,6 @@ public class UserManagementService { public User update(User user){return userManagementRepository.save(user);} - public User delete(String account){return userManagementRepository.deleteByAccount(account);} + public void delete(Long id){userManagementRepository.deleteById(id);} } diff --git a/src/main/java/org/cmh/backend/authentication/controller/UserController.java b/src/main/java/org/cmh/backend/authentication/controller/UserController.java index 0a0700c..1649301 100644 --- a/src/main/java/org/cmh/backend/authentication/controller/UserController.java +++ b/src/main/java/org/cmh/backend/authentication/controller/UserController.java @@ -13,7 +13,7 @@ import static org.springframework.http.ResponseEntity.ok; @RestController public class UserController { - @Autowired + @Autowired private UserService userService; @CrossOrigin(origins = "http://localhost:5173") @PostMapping("/checkLogin")