Merge remote-tracking branch 'origin/personal/lsd/UserManagement'

# Conflicts:
#	src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java
#	src/main/java/org/cmh/backend/authentication/repository/UserRepository.java
#	src/main/java/org/cmh/backend/authentication/service/UserService.java

pom.xml

@@ -128,6 +128,12 @@
 			<artifactId>spring-boot-testcontainers</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-devtools</artifactId>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter-test</artifactId>

src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java

@@ -0,0 +1,48 @@
+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.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<Tenant> getAll() {
+        List<Tenant> 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 boolean delete(@RequestBody Tenant tenant) {
+        System.out.println(tenant);
+        tenantManagementService.delete(tenant.getName());
+        return true;
+    }
+
+}
+

src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java

@@ -0,0 +1,52 @@
+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<User> getAll() {
+        List<User> 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 boolean delete(@RequestBody User user) {
+        System.out.println(user);
+        userManagementService.delete(user.getAccount());
+        return true;
+    }
+
+}
+

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;
+
+}

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 + '\'' +
+                '}';
+    }
+
+}

src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java

@@ -0,0 +1,15 @@
+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, Long>{
+    Tenant findByName(String name);
+    Tenant save(Tenant tenant);
+
+    List<Tenant> findAll();
+
+    Tenant findTenantById(Long id);
+
+    Tenant deleteByName(String Name);
+}

src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java

@@ -0,0 +1,22 @@
+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, Long> {
+    User findByName(String name);
+    User findByAccountAndPassword(String name,String password);
+    User save(User user);
+
+    List<User> findAll();
+
+    User findUserById(Long id);
+
+    User deleteByAccount(String account);
+
+}

src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java

@@ -0,0 +1,27 @@
+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<Tenant> findAll(){
+        return tenantManagementRepository.findAll();
+    }
+
+    public Tenant update(Tenant tenant){return tenantManagementRepository.save(tenant);}
+
+    public Tenant delete(String name){return tenantManagementRepository.deleteByName(name);}
+}

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<User> findAll(){
+        return userManagementRepository.findAll();
+    }
+
+    public User findUserById(Long id){return userManagementRepository.findUserById(id);}
+
+    public User update(User user){return userManagementRepository.save(user);}
+
+    public User delete(String account){return userManagementRepository.deleteByAccount(account);}
+
+}

src/main/java/org/cmh/backend/authentication/controller/UserController.java

@@ -0,0 +1,39 @@
+package org.cmh.backend.authentication.controller;
+
+import org.cmh.backend.UserManagement.model.User;
+import org.cmh.backend.authentication.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<User> login(@RequestBody Map<String,String> 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 "注册错误";
+    }
+
+
+}