diff --git a/pom.xml b/pom.xml index 39cc9bb..6c0c137 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,12 @@ spring-boot-testcontainers test + + org.springframework.boot + spring-boot-devtools + true + + org.mybatis.spring.boot mybatis-spring-boot-starter-test diff --git a/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java b/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java new file mode 100644 index 0000000..1049378 --- /dev/null +++ b/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java @@ -0,0 +1,47 @@ +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.UserManagement.model.User; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +public class TenantManagementController { + @Autowired + private TenantManagementService tenantManagementService; + + @CrossOrigin(origins = "http://localhost:5173") + @PostMapping("/addTenant") + public Tenant addTenant(@RequestBody Tenant tenant) { + Tenant tenant1=tenantManagementService.registerTenant(tenant); + System.out.println(tenant.toString()); + return tenant1; + } + + @CrossOrigin(origins = "http://localhost:5173") + @GetMapping("/getAllTenant") + public List getAll() { + List tenantList=tenantManagementService.findAll(); + return tenantList; + } + + @CrossOrigin(origins = "http://localhost:5173") + @PostMapping("/updateTenant") + public Tenant update(@RequestBody Tenant tenant) { + System.out.println(tenant); + tenantManagementService.update(tenant); + return tenant; + } + + @CrossOrigin(origins = "http://localhost:5173") + @PostMapping("/deleteTenant") + @Transactional + public void delete(@RequestBody User user) { + tenantManagementService.delete(user.getId()); + } + +} + diff --git a/src/main/java/org/cmh/backend/UserManagement/controller/UserController.java b/src/main/java/org/cmh/backend/UserManagement/controller/UserController.java new file mode 100644 index 0000000..1b43816 --- /dev/null +++ b/src/main/java/org/cmh/backend/UserManagement/controller/UserController.java @@ -0,0 +1,39 @@ +package org.cmh.backend.UserManagement.controller; + +import org.cmh.backend.UserManagement.model.User; +import org.cmh.backend.UserManagement.service.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +import static org.springframework.http.ResponseEntity.ok; + +@RestController +public class UserController { + + @Autowired + private UserService userService; + @CrossOrigin(origins = "http://localhost:5173") + @PostMapping("/checkLogin") + public ResponseEntity login(@RequestBody Map credentials) { + String account = credentials.get("account"); + String password = credentials.get("password"); + + User user = userService.getUserByAccountAndPassword(account, password); + return ok(user); + + } + @CrossOrigin(origins = "http://localhost:5173") + @PostMapping("/checkRegister") + public String register(@RequestBody User user) { + + if(userService.registerUser(user) != null){ + return "注册成功"; + }else + return "注册错误"; + } + + +} diff --git a/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java b/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java new file mode 100644 index 0000000..ef3e873 --- /dev/null +++ b/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java @@ -0,0 +1,51 @@ +package org.cmh.backend.UserManagement.controller; + +import jakarta.transaction.Transactional; +import org.cmh.backend.UserManagement.service.UserManagementService; +import org.cmh.backend.UserManagement.model.User; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import java.util.List; + +@RestController +public class UserManagementController { + @Autowired + private UserManagementService userManagementService; + + @CrossOrigin(origins = "http://localhost:5173") + @PostMapping("/addUser") + public User addUser(@RequestBody User user) { + User user1=userManagementService.registerUser(user); + if(user1 != null){ + System.out.println(user1); + return user1; + }else{ + return null; + } + } + + @CrossOrigin(origins = "http://localhost:5173") + @GetMapping("/getAll") + public List getAll() { + List userList=userManagementService.findAll(); + return userList; + } + + @CrossOrigin(origins = "http://localhost:5173") + @PostMapping("/update") + public User update(@RequestBody User user) { + System.out.println(user); + userManagementService.update(user); + return user; + } + + @CrossOrigin(origins = "http://localhost:5173") + @PostMapping("/delete") + @Transactional + public void delete(@RequestBody User user) { + System.out.println(user); + userManagementService.delete(user.getId()); + } + +} + diff --git a/src/main/java/org/cmh/backend/UserManagement/model/Tenant.java b/src/main/java/org/cmh/backend/UserManagement/model/Tenant.java new file mode 100644 index 0000000..8782fa0 --- /dev/null +++ b/src/main/java/org/cmh/backend/UserManagement/model/Tenant.java @@ -0,0 +1,33 @@ +package org.cmh.backend.UserManagement.model; + + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Table(name="tenant") +@Entity +public class Tenant { + @Id + @Getter + @Setter + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Getter + @Setter + private String contact; + @Getter + @Setter + private String phone; + @Getter + @Setter + private String name; + @Getter + @Setter + private String manager; + @Getter + @Setter + private String symbol; + +} diff --git a/src/main/java/org/cmh/backend/UserManagement/model/User.java b/src/main/java/org/cmh/backend/UserManagement/model/User.java new file mode 100644 index 0000000..373eaf7 --- /dev/null +++ b/src/main/java/org/cmh/backend/UserManagement/model/User.java @@ -0,0 +1,68 @@ +package org.cmh.backend.UserManagement.model; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.Getter; +import lombok.Setter; + +@Entity +public class User { + @Setter + @Getter + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + @Setter + @Getter + private String account; + @Setter + @Getter + private String password; + @Setter + @Getter + private String name; + @Getter + @Setter + private String organization; + @Setter + @Getter + private String gender; + @Setter + @Getter + private String email; + @Getter + @Setter + private String phone; + + public User() { + + } + + public User(String account, String password, String name, String organization, String gender, String email, String phone) { + this.account = account; + this.password = password; + this.name = name; + this.organization = organization; + this.gender = gender; + this.email = email; + this.phone = phone; + + } + + @Override + public String toString() { + return "User{" + + "id=" + id + + ", account='" + account + '\'' + + ", password='" + password + '\'' + + ", name='" + name + '\'' + + ", organization='" + organization + '\'' + + ", gender='" + gender + '\'' + + ", email='" + email + '\'' + + ", phone='" + phone + '\'' + + '}'; + } + +} \ No newline at end of file diff --git a/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java b/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java new file mode 100644 index 0000000..b9e8b5d --- /dev/null +++ b/src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java @@ -0,0 +1,17 @@ +package org.cmh.backend.UserManagement.repository; +import org.cmh.backend.UserManagement.model.Tenant; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +public interface TenantManagementRepository extends JpaRepository{ + Tenant findByName(String name); + Tenant save(Tenant tenant); + + List findAll(); + + 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 new file mode 100644 index 0000000..efcd3ca --- /dev/null +++ b/src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java @@ -0,0 +1,24 @@ +package org.cmh.backend.UserManagement.repository; + + +import org.cmh.backend.UserManagement.model.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface UserManagementRepository extends JpaRepository { + User findByName(String name); + User findByAccountAndPassword(String name,String password); + User save(User user); + + List findAll(); + + User findUserById(Long id); + + User deleteByAccount(String account); + + void deleteById(Long id); + +} diff --git a/src/main/java/org/cmh/backend/UserManagement/repository/UserRepository.java b/src/main/java/org/cmh/backend/UserManagement/repository/UserRepository.java new file mode 100644 index 0000000..899df63 --- /dev/null +++ b/src/main/java/org/cmh/backend/UserManagement/repository/UserRepository.java @@ -0,0 +1,13 @@ +package org.cmh.backend.UserManagement.repository; + +import org.cmh.backend.UserManagement.model.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface UserRepository extends JpaRepository { + User findByName(String name); + User findByAccountAndPassword(String name,String password); + User save(User user); + +} diff --git a/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java b/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java new file mode 100644 index 0000000..f52e511 --- /dev/null +++ b/src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java @@ -0,0 +1,29 @@ +package org.cmh.backend.UserManagement.service; + +import org.cmh.backend.UserManagement.model.Tenant; +import org.cmh.backend.UserManagement.repository.TenantManagementRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +public class TenantManagementService { + + @Autowired + private TenantManagementRepository tenantManagementRepository; + + public Tenant registerTenant(Tenant tenant) { + Tenant savedTenant = tenantManagementRepository.save(tenant); + return savedTenant; + } + + public List findAll(){ + return tenantManagementRepository.findAll(); + } + + 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 new file mode 100644 index 0000000..4f71671 --- /dev/null +++ b/src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java @@ -0,0 +1,31 @@ +package org.cmh.backend.UserManagement.service; + +import org.cmh.backend.UserManagement.repository.UserManagementRepository; +import org.cmh.backend.UserManagement.model.User; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +public class UserManagementService { + + @Autowired + private UserManagementRepository userManagementRepository; + + + public User registerUser(User user) { + User savedUser = userManagementRepository.save(user); + return savedUser; + } + + public List findAll(){ + return userManagementRepository.findAll(); + } + + public User findUserById(Long id){return userManagementRepository.findUserById(id);} + + public User update(User user){return userManagementRepository.save(user);} + + public void delete(Long id){userManagementRepository.deleteById(id);} + +} diff --git a/src/main/java/org/cmh/backend/UserManagement/service/UserService.java b/src/main/java/org/cmh/backend/UserManagement/service/UserService.java new file mode 100644 index 0000000..e3d7c78 --- /dev/null +++ b/src/main/java/org/cmh/backend/UserManagement/service/UserService.java @@ -0,0 +1,24 @@ +package org.cmh.backend.UserManagement.service; + +import org.cmh.backend.UserManagement.model.User; +import org.cmh.backend.UserManagement.repository.UserRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class UserService { + @Autowired + private UserRepository userRepository; + + public User getUserByUsername(String username) { + return userRepository.findByName(username); + } + public User getUserByAccountAndPassword(String name,String password){return userRepository.findByAccountAndPassword(name,password);} + + public User registerUser(User user) { + User savedUser = userRepository.save(user); + return savedUser; + } + + +} diff --git a/src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java b/src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java deleted file mode 100644 index e69de29..0000000