Compare commits

...

1 Commits

Author SHA1 Message Date
7a6d2b5c4b recovery 2024-07-05 16:32:33 +08:00
7 changed files with 13 additions and 9 deletions

View File

@ -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());
}
}

View File

@ -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());
}
}

View File

@ -12,4 +12,6 @@ public interface TenantManagementRepository extends JpaRepository<Tenant, Long>{
Tenant findTenantById(Long id);
Tenant deleteByName(String Name);
void deleteById(Long id);
}

View File

@ -19,4 +19,6 @@ public interface UserManagementRepository extends JpaRepository<User, Long> {
User deleteByAccount(String account);
void deleteById(Long id);
}

View File

@ -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);}
}

View File

@ -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);}
}

View File

@ -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")