neu/backend_new
2
0
Fork 0
forked from RyanGoodwill/backend
Code Pull Requests Activity

revert ：取消合并用户管理，因为那是旧的版本

Browse Source 
revert 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
This commit is contained in:
高子兴 2024-07-05 16:34:34 +08:00
parent 3c8eb52ac0
commit e45e84c53a
11 changed files with 0 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

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

48
src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java
View File

@ -1,48 +0,0 @@
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;
}
}

52
src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java
View File

@ -1,52 +0,0 @@
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;
}
}

33
src/main/java/org/cmh/backend/UserManagement/model/Tenant.java
View File

@ -1,33 +0,0 @@
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;
}

68
src/main/java/org/cmh/backend/UserManagement/model/User.java
View File

@ -1,68 +0,0 @@
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 + '\'' +
'}';
}
}

15
src/main/java/org/cmh/backend/UserManagement/repository/TenantManagementRepository.java
View File

@ -1,15 +0,0 @@
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);
}

22
src/main/java/org/cmh/backend/UserManagement/repository/UserManagementRepository.java
View File

@ -1,22 +0,0 @@
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);
}

27
src/main/java/org/cmh/backend/UserManagement/service/TenantManagementService.java
View File

@ -1,27 +0,0 @@
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);}
}

31
src/main/java/org/cmh/backend/UserManagement/service/UserManagementService.java
View File

@ -1,31 +0,0 @@
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);}
}

39
src/main/java/org/cmh/backend/authentication/controller/UserController.java
View File

@ -1,39 +0,0 @@
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 "注册错误";
}
}

0
src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java Normal file
View File