From bdc19166a337a22d6664d715ebe9cbada2a2c210 Mon Sep 17 00:00:00 2001 From: MiLla <18826902282@163.com> Date: Tue, 25 Jun 2024 15:48:19 +0800 Subject: [PATCH 1/9] merge main& solve conflict --- .../org/cmh/backend/Config/CorsConfig.java | 0 .../controller/UserController.java | 57 +++++++++++++++++++ .../backend/authentication/model/User.java | 53 +++++++++++------ .../repository/UserRepository.java | 5 ++ .../authentication/service/UserService.java | 8 +++ 5 files changed, 105 insertions(+), 18 deletions(-) create mode 100644 src/main/java/org/cmh/backend/Config/CorsConfig.java create mode 100644 src/main/java/org/cmh/backend/authentication/controller/UserController.java diff --git a/src/main/java/org/cmh/backend/Config/CorsConfig.java b/src/main/java/org/cmh/backend/Config/CorsConfig.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/org/cmh/backend/authentication/controller/UserController.java b/src/main/java/org/cmh/backend/authentication/controller/UserController.java new file mode 100644 index 0000000..dafa20e --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/controller/UserController.java @@ -0,0 +1,57 @@ +package org.cmh.backend.authentication.controller; + +import org.cmh.backend.authentication.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 +@RequestMapping("/users") +public class UserController { + @Autowired + private UserService userService; + + + @PostMapping("/tmdshabi") + public ResponseEntity login(@RequestBody Map credentials) { + String username = credentials.get("username"); + String password = credentials.get("password"); + System.out.println(username); + System.out.println(password); + System.out.println("hahaha"); + return ResponseEntity.notFound().build(); + } + @PostMapping("/hahaha") + public ResponseEntity hahaha(@RequestBody Map credentials){ + String username = credentials.get("username"); + String password = credentials.get("password"); + System.out.println(username); + System.out.println(password); + System.out.println("hahaha"); + System.out.println("hahaha"); + User user = new User(); + user.setUsername(username); + user.setPassword(password); + return ResponseEntity.ok(user); + } + + @PostMapping("/register") + public ResponseEntity register(@RequestBody Map credentials) { + String username = credentials.get("username"); + String password = credentials.get("password"); + String name = credentials.get("name"); + String organization = credentials.get("organization"); + String gender = credentials.get("gender"); + String email = credentials.get("email"); + String phone = credentials.get("phone"); + String pname = credentials.get("pname");; + User user = new User(username, password, name, organization, gender, email,phone,pname); + if(userService.RegisterUser(user) != null); + return null; + } +} diff --git a/src/main/java/org/cmh/backend/authentication/model/User.java b/src/main/java/org/cmh/backend/authentication/model/User.java index ba9aa53..eca7e54 100644 --- a/src/main/java/org/cmh/backend/authentication/model/User.java +++ b/src/main/java/org/cmh/backend/authentication/model/User.java @@ -4,36 +4,53 @@ 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 username; + @Setter + @Getter private String password; + @Setter + @Getter + private String name; + @Getter + @Setter + private String organization; + private String gender; + @Setter + @Getter + private String email; + @Getter + @Setter + private String phone; + @Getter + @Setter + private String pname; + + public User() { - public Long getId() { - return id; } - public void setId(Long id) { - this.id = id; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { + public User(String username, String password, String name, String organization, String gender, String email, String phone, String pname) { this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { this.password = password; + this.name = name; + this.organization = organization; + this.gender = gender; + this.email = email; + this.phone = phone; + this.pname = pname; } + } \ No newline at end of file diff --git a/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java index 2c5116e..7cbf159 100644 --- a/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java +++ b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java @@ -5,4 +5,9 @@ import org.springframework.data.jpa.repository.JpaRepository; public interface UserRepository extends JpaRepository { User findByUsername(String username); + User findByIdAndUsername(long id, String username); + User findByName(String name); + User findByUsernameAndPassword(String username, String password); + User findByGender(String gender); + User save(User user); } diff --git a/src/main/java/org/cmh/backend/authentication/service/UserService.java b/src/main/java/org/cmh/backend/authentication/service/UserService.java index 30e5134..45f5df4 100644 --- a/src/main/java/org/cmh/backend/authentication/service/UserService.java +++ b/src/main/java/org/cmh/backend/authentication/service/UserService.java @@ -13,4 +13,12 @@ public class UserService { public User getUserByUsername(String username) { return userRepository.findByUsername(username); } + public User getUserByUsernameAndPassword(String username, String password) { + return userRepository.findByUsernameAndPassword(username, password); + } + + public User RegisterUser(User user) { + User savedUser = userRepository.save(user); + return savedUser; + } } -- 2.45.2 From bac47d9749b6ccb819ee76b21c2224b736ab3df8 Mon Sep 17 00:00:00 2001 From: MiLla <18826902282@163.com> Date: Tue, 25 Jun 2024 16:33:30 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BD=86User=E4=B8=ADusern?= =?UTF-8?q?ame=E6=84=8F=E4=B9=89=E4=B8=8D=E5=A4=9F=E6=98=8E=E7=A1=AE?= =?UTF-8?q?=EF=BC=8C=E6=83=B3=E6=94=B9=E6=88=90accout,=E6=AD=A4=E7=89=88?= =?UTF-8?q?=E4=BD=9C=E5=A4=87=E4=BB=BD=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserController.java | 33 ++++++++++--------- .../backend/authentication/model/User.java | 2 ++ 2 files changed, 20 insertions(+), 15 deletions(-) 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 dafa20e..a243730 100644 --- a/src/main/java/org/cmh/backend/authentication/controller/UserController.java +++ b/src/main/java/org/cmh/backend/authentication/controller/UserController.java @@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; +import static org.springframework.http.ResponseEntity.badRequest; import static org.springframework.http.ResponseEntity.ok; @RestController @@ -26,7 +27,7 @@ public class UserController { System.out.println("hahaha"); return ResponseEntity.notFound().build(); } - @PostMapping("/hahaha") + @PostMapping("/checkLogin") public ResponseEntity hahaha(@RequestBody Map credentials){ String username = credentials.get("username"); String password = credentials.get("password"); @@ -37,21 +38,23 @@ public class UserController { User user = new User(); user.setUsername(username); user.setPassword(password); - return ResponseEntity.ok(user); + return ok(user); } - @PostMapping("/register") - public ResponseEntity register(@RequestBody Map credentials) { - String username = credentials.get("username"); - String password = credentials.get("password"); - String name = credentials.get("name"); - String organization = credentials.get("organization"); - String gender = credentials.get("gender"); - String email = credentials.get("email"); - String phone = credentials.get("phone"); - String pname = credentials.get("pname");; - User user = new User(username, password, name, organization, gender, email,phone,pname); - if(userService.RegisterUser(user) != null); - return null; + @PostMapping("/checkRegister") + public String register(@RequestBody User user) { +// String username = user.getUsername(); +// String password = user.getPassword(); +// String name = user.getName(); +// String organization = user.getOrganization(); +// String gender = user.getGender(); +// String email = user.getEmail(); +// String phone = user.getPhone(); +// String pname = user.getPname(); + + if(userService.RegisterUser(user) != null){ + return "注册成功"; + } + return "注册错误"; } } diff --git a/src/main/java/org/cmh/backend/authentication/model/User.java b/src/main/java/org/cmh/backend/authentication/model/User.java index eca7e54..7692661 100644 --- a/src/main/java/org/cmh/backend/authentication/model/User.java +++ b/src/main/java/org/cmh/backend/authentication/model/User.java @@ -27,6 +27,8 @@ public class User { @Getter @Setter private String organization; + @Setter + @Getter private String gender; @Setter @Getter -- 2.45.2 From d9f54774bdddce902618503d1dceae2c120856a3 Mon Sep 17 00:00:00 2001 From: MiLla <18826902282@163.com> Date: Tue, 25 Jun 2024 17:49:31 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserController.java | 21 ++++++++-------- .../backend/authentication/model/User.java | 25 +++++++++++++------ .../repository/UserRepository.java | 7 ++---- .../authentication/service/UserService.java | 10 ++++---- 4 files changed, 35 insertions(+), 28 deletions(-) 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 a243730..4c0e397 100644 --- a/src/main/java/org/cmh/backend/authentication/controller/UserController.java +++ b/src/main/java/org/cmh/backend/authentication/controller/UserController.java @@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; -import static org.springframework.http.ResponseEntity.badRequest; import static org.springframework.http.ResponseEntity.ok; @RestController @@ -20,39 +19,39 @@ public class UserController { @PostMapping("/tmdshabi") public ResponseEntity login(@RequestBody Map credentials) { - String username = credentials.get("username"); + String account = credentials.get("account"); String password = credentials.get("password"); - System.out.println(username); + System.out.println(account); System.out.println(password); System.out.println("hahaha"); return ResponseEntity.notFound().build(); } @PostMapping("/checkLogin") public ResponseEntity hahaha(@RequestBody Map credentials){ - String username = credentials.get("username"); + String account = credentials.get("account"); String password = credentials.get("password"); - System.out.println(username); + System.out.println(account); System.out.println(password); System.out.println("hahaha"); System.out.println("hahaha"); - User user = new User(); - user.setUsername(username); - user.setPassword(password); + User user = userService.getUserByAccountAndPassword(account, password); + System.out.println(user); return ok(user); } @PostMapping("/checkRegister") public String register(@RequestBody User user) { -// String username = user.getUsername(); +// String account = user.getAccount(); // String password = user.getPassword(); // String name = user.getName(); // String organization = user.getOrganization(); // String gender = user.getGender(); // String email = user.getEmail(); // String phone = user.getPhone(); -// String pname = user.getPname(); - if(userService.RegisterUser(user) != null){ + System.out.println(user.toString()); + + if(userService.registerUser(user) != null){ return "注册成功"; } return "注册错误"; diff --git a/src/main/java/org/cmh/backend/authentication/model/User.java b/src/main/java/org/cmh/backend/authentication/model/User.java index 7692661..c67fd82 100644 --- a/src/main/java/org/cmh/backend/authentication/model/User.java +++ b/src/main/java/org/cmh/backend/authentication/model/User.java @@ -17,7 +17,7 @@ public class User { private Long id; @Setter @Getter - private String username; + private String account; @Setter @Getter private String password; @@ -36,23 +36,34 @@ public class User { @Getter @Setter private String phone; - @Getter - @Setter - private String pname; public User() { } - public User(String username, String password, String name, String organization, String gender, String email, String phone, String pname) { - this.username = username; + 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; - this.pname = pname; + + } + + @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/authentication/repository/UserRepository.java b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java index 7cbf159..6eb5343 100644 --- a/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java +++ b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java @@ -4,10 +4,7 @@ import org.cmh.backend.authentication.model.User; import org.springframework.data.jpa.repository.JpaRepository; public interface UserRepository extends JpaRepository { - User findByUsername(String username); - User findByIdAndUsername(long id, String username); - User findByName(String name); - User findByUsernameAndPassword(String username, String password); - User findByGender(String gender); + User findByAccount(String username); + User findByAccountAndPassword(String username, String password); User save(User user); } diff --git a/src/main/java/org/cmh/backend/authentication/service/UserService.java b/src/main/java/org/cmh/backend/authentication/service/UserService.java index 45f5df4..0ae8931 100644 --- a/src/main/java/org/cmh/backend/authentication/service/UserService.java +++ b/src/main/java/org/cmh/backend/authentication/service/UserService.java @@ -10,14 +10,14 @@ public class UserService { @Autowired private UserRepository userRepository; - public User getUserByUsername(String username) { - return userRepository.findByUsername(username); + public User getUserByAccount(String account) { + return userRepository.findByAccount(account); } - public User getUserByUsernameAndPassword(String username, String password) { - return userRepository.findByUsernameAndPassword(username, password); + public User getUserByAccountAndPassword(String account, String password) { + return userRepository.findByAccountAndPassword(account, password); } - public User RegisterUser(User user) { + public User registerUser(User user) { User savedUser = userRepository.save(user); return savedUser; } -- 2.45.2 From 187a5afbc276e4f86801078a3d90d022bb50d1d2 Mon Sep 17 00:00:00 2001 From: MiLla <18826902282@163.com> Date: Fri, 28 Jun 2024 19:12:15 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E7=9A=84=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=AE=A1=E7=90=86=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrganizationController.java | 46 +++++++++++++ .../model/Organization.java | 65 +++++++++++++++++++ .../repository/OrganizationRepository.java | 20 ++++++ .../service/OrganizationService.java | 36 ++++++++++ .../controller/UserController.java | 1 + 5 files changed, 168 insertions(+) create mode 100644 src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java create mode 100644 src/main/java/org/cmh/backend/OrganizationManagement/model/Organization.java create mode 100644 src/main/java/org/cmh/backend/OrganizationManagement/repository/OrganizationRepository.java create mode 100644 src/main/java/org/cmh/backend/OrganizationManagement/service/OrganizationService.java diff --git a/src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java b/src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java new file mode 100644 index 0000000..58410e0 --- /dev/null +++ b/src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java @@ -0,0 +1,46 @@ +package org.cmh.backend.OrganizationManagement.controller; + +import org.cmh.backend.OrganizationManagement.model.Organization; +import org.cmh.backend.OrganizationManagement.service.OrganizationService; +import org.cmh.backend.authentication.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.ArrayList; +import java.util.List; +import java.util.Map; + +import static org.springframework.http.ResponseEntity.ok; + +@RestController +@RequestMapping("/organizations") +public class OrganizationController { + @Autowired + private OrganizationService organizationService; + + @GetMapping("/listAll") + public ResponseEntity> listAll() { + List data = organizationService.listAll(); + System.out.println(data); + return ok(data); + } + + @PostMapping("/add") + public Organization add(@RequestBody Organization organization) { + return organizationService.add(organization); + } + + @PostMapping("/delete") + public String delete(@RequestBody Map credentials) { + long id = Long.parseLong(credentials.get("id")); + organizationService.delete(id); + return "success"; + } + + @PostMapping("/update") + public Organization update(@RequestBody Organization organization) { + return organizationService.update(organization); + } +} diff --git a/src/main/java/org/cmh/backend/OrganizationManagement/model/Organization.java b/src/main/java/org/cmh/backend/OrganizationManagement/model/Organization.java new file mode 100644 index 0000000..116a003 --- /dev/null +++ b/src/main/java/org/cmh/backend/OrganizationManagement/model/Organization.java @@ -0,0 +1,65 @@ +package org.cmh.backend.OrganizationManagement.model; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; + +@Table(name = "organizations") +@Entity +public class Organization { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Setter + @Getter + private long organizationId; // 部门ID，作为数据库表的主键 + @Setter + @Getter + @ManyToOne + @JoinColumn(name = "parent_organization_id") + private Organization parentOrganization; // 上级部门，如果有的话 + @Setter + @Getter + private String organizationName; // 部门名称 + @Setter + @Getter + private int displayOrder; // 显示排序 + @Setter + @Getter + private String leader; // 负责人 + @Setter + @Getter + private String contactPhone; // 联系电话 + @Setter + @Getter + private String email; // 邮箱 + @Setter + @Getter + private boolean organizationStatus; + + public Organization() { + } + + public Organization(Organization organization, String organizationName, int displayOrder, String leader, String contactPhone, String email, boolean organizationStatus) { + this.parentOrganization = organization; + this.organizationName = organizationName; + this.displayOrder = displayOrder; + this.leader = leader; + this.contactPhone = contactPhone; + this.email = email; + this.organizationStatus = organizationStatus; + } + + @Override + public String toString() { + return "Organization{" + + "organizationId=" + organizationId + + ", parentOrganization='" + parentOrganization + '\'' + + ", organizationName='" + organizationName + '\'' + + ", displayOrder=" + displayOrder + + ", leader='" + leader + '\'' + + ", contactPhone='" + contactPhone + '\'' + + ", email='" + email + '\'' + + ", organizationStatus='" + organizationStatus + '\'' + + '}'; + } +} diff --git a/src/main/java/org/cmh/backend/OrganizationManagement/repository/OrganizationRepository.java b/src/main/java/org/cmh/backend/OrganizationManagement/repository/OrganizationRepository.java new file mode 100644 index 0000000..dabb016 --- /dev/null +++ b/src/main/java/org/cmh/backend/OrganizationManagement/repository/OrganizationRepository.java @@ -0,0 +1,20 @@ +package org.cmh.backend.OrganizationManagement.repository; + +import org.aspectj.weaver.ast.Or; +import org.cmh.backend.OrganizationManagement.model.Organization; +import org.cmh.backend.OrganizationManagement.service.OrganizationService; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface OrganizationRepository extends JpaRepository { + + List findAll(); + Organization save(Organization organization); + void deleteById(Long id); + Organization findByOrganizationId(Long id); + Organization findByOrganizationName(String name); + +} diff --git a/src/main/java/org/cmh/backend/OrganizationManagement/service/OrganizationService.java b/src/main/java/org/cmh/backend/OrganizationManagement/service/OrganizationService.java new file mode 100644 index 0000000..f34fd37 --- /dev/null +++ b/src/main/java/org/cmh/backend/OrganizationManagement/service/OrganizationService.java @@ -0,0 +1,36 @@ +package org.cmh.backend.OrganizationManagement.service; + +import org.cmh.backend.OrganizationManagement.model.Organization; +import org.cmh.backend.OrganizationManagement.repository.OrganizationRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class OrganizationService { + @Autowired + private OrganizationRepository organizationRepository; + + public List listAll(){ + return organizationRepository.findAll(); + } + + public Organization add(Organization organization){ + return organizationRepository.save(organization); + } + public Organization update(Organization organization){ + return organizationRepository.save(organization); + } + public String delete(Long id){ + organizationRepository.deleteById(id); + return "success"; + } + public Organization getById(Long organizationId){ + return organizationRepository.findByOrganizationId(organizationId); + } + public Organization getByName(String name){ + return organizationRepository.findByOrganizationName(name); + } + +} 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 4c0e397..3281a80 100644 --- a/src/main/java/org/cmh/backend/authentication/controller/UserController.java +++ b/src/main/java/org/cmh/backend/authentication/controller/UserController.java @@ -35,6 +35,7 @@ public class UserController { System.out.println("hahaha"); System.out.println("hahaha"); User user = userService.getUserByAccountAndPassword(account, password); + //判断逻辑 System.out.println(user); return ok(user); } -- 2.45.2 From ecf466716a851c39594e389d8d3b90113092cf5d Mon Sep 17 00:00:00 2001 From: MiLla <18826902282@163.com> Date: Tue, 2 Jul 2024 15:42:47 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrganizationController.java | 45 ++++++++++++++++--- .../model/Organization.java | 5 +++ 2 files changed, 43 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java b/src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java index 58410e0..d701db8 100644 --- a/src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java +++ b/src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java @@ -1,5 +1,6 @@ package org.cmh.backend.OrganizationManagement.controller; +import org.aspectj.weaver.ast.Or; import org.cmh.backend.OrganizationManagement.model.Organization; import org.cmh.backend.OrganizationManagement.service.OrganizationService; import org.cmh.backend.authentication.model.User; @@ -8,7 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -23,19 +26,42 @@ public class OrganizationController { @GetMapping("/listAll") public ResponseEntity> listAll() { List data = organizationService.listAll(); - System.out.println(data); +// System.out.println(data); return ok(data); } - @PostMapping("/add") - public Organization add(@RequestBody Organization organization) { - return organizationService.add(organization); + @PostMapping("/addOrganization") + public Organization add(@RequestBody Map credentials) { + Organization organization = new Organization(); + if(credentials.get("organizationId") != null){ + organization.setOrganizationId(Long.parseLong(credentials.get("organizationId"))); + } + organization.setOrganizationName(credentials.get("organizationName")); + organization.setOrganizationStatus(Boolean.parseBoolean(credentials.get("organizationStatus"))); + if(Integer.parseInt(credentials.get("parentOrganization")) != 0){ + organization.setParentOrganization(organizationService.getById(Long.parseLong(credentials.get("parentOrganization")))); + }else{ + organization.setParentOrganization(null); + } + organization.setEmail(credentials.get("email")); + organization.setLeader(credentials.get("leader")); + organization.setContactPhone(credentials.get("contactPhone")); + organization.setDisplayOrder(Integer.parseInt(credentials.get("displayOrder"))); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + String currentTime = sdf.format(new Date()); + System.out.println(currentTime); + + organization.setCreatedTime(currentTime); + Organization organizationAdd = organizationService.add(organization); + System.out.println(organizationAdd); + return organizationAdd; } - @PostMapping("/delete") + + @PostMapping("/deleteOrganization") public String delete(@RequestBody Map credentials) { - long id = Long.parseLong(credentials.get("id")); - organizationService.delete(id); + organizationService.delete(Long.valueOf(credentials.get("organizationId"))); return "success"; } @@ -43,4 +69,9 @@ public class OrganizationController { public Organization update(@RequestBody Organization organization) { return organizationService.update(organization); } + + @PostMapping("/getOrganizationById") + public Organization getById(@RequestBody Map credentials) { + return organizationService.getById(Long.valueOf(credentials.get("organizationId"))); + } } diff --git a/src/main/java/org/cmh/backend/OrganizationManagement/model/Organization.java b/src/main/java/org/cmh/backend/OrganizationManagement/model/Organization.java index 116a003..25f7e17 100644 --- a/src/main/java/org/cmh/backend/OrganizationManagement/model/Organization.java +++ b/src/main/java/org/cmh/backend/OrganizationManagement/model/Organization.java @@ -1,9 +1,11 @@ package org.cmh.backend.OrganizationManagement.model; import jakarta.persistence.*; +import lombok.Data; import lombok.Getter; import lombok.Setter; + @Table(name = "organizations") @Entity public class Organization { @@ -35,6 +37,9 @@ public class Organization { @Setter @Getter private boolean organizationStatus; + @Setter + @Getter + private String createdTime; public Organization() { } -- 2.45.2 From 1e874606f3a773eb12beea426b7c4a3ac719da47 Mon Sep 17 00:00:00 2001 From: MiLla <18826902282@163.com> Date: Tue, 2 Jul 2024 15:56:36 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86(=E6=B5=8B=E8=AF=95=E7=94=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrganizationController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java b/src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java index d701db8..aecfe90 100644 --- a/src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java +++ b/src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java @@ -74,4 +74,6 @@ public class OrganizationController { public Organization getById(@RequestBody Map credentials) { return organizationService.getById(Long.valueOf(credentials.get("organizationId"))); } + + //ublic } -- 2.45.2 From 9fb75be5ab58fbeeccf3c04d0f38d99e1b95830a Mon Sep 17 00:00:00 2001 From: MiLla <18826902282@163.com> Date: Thu, 4 Jul 2024 17:33:15 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AuthenticationController.java | 13 ---- .../controller/UserController.java | 60 ---------------- .../backend/authentication/model/User.java | 69 ------------------- .../repository/UserRepository.java | 10 --- .../service/AuthenticationService.java | 0 .../authentication/service/UserService.java | 24 ------- 6 files changed, 176 deletions(-) delete mode 100644 src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java delete mode 100644 src/main/java/org/cmh/backend/authentication/controller/UserController.java delete mode 100644 src/main/java/org/cmh/backend/authentication/model/User.java delete mode 100644 src/main/java/org/cmh/backend/authentication/repository/UserRepository.java delete mode 100644 src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java delete mode 100644 src/main/java/org/cmh/backend/authentication/service/UserService.java diff --git a/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java b/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java deleted file mode 100644 index 8ec56df..0000000 --- a/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.cmh.backend.authentication.controller; - - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -class AuthenticationController { - @GetMapping("/hello") - public String hello(){ - return "Hello SpringBoot!"; - } -} \ No newline at end of file diff --git a/src/main/java/org/cmh/backend/authentication/controller/UserController.java b/src/main/java/org/cmh/backend/authentication/controller/UserController.java deleted file mode 100644 index 3281a80..0000000 --- a/src/main/java/org/cmh/backend/authentication/controller/UserController.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.cmh.backend.authentication.controller; - -import org.cmh.backend.authentication.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 -@RequestMapping("/users") -public class UserController { - @Autowired - private UserService userService; - - - @PostMapping("/tmdshabi") - public ResponseEntity login(@RequestBody Map credentials) { - String account = credentials.get("account"); - String password = credentials.get("password"); - System.out.println(account); - System.out.println(password); - System.out.println("hahaha"); - return ResponseEntity.notFound().build(); - } - @PostMapping("/checkLogin") - public ResponseEntity hahaha(@RequestBody Map credentials){ - String account = credentials.get("account"); - String password = credentials.get("password"); - System.out.println(account); - System.out.println(password); - System.out.println("hahaha"); - System.out.println("hahaha"); - User user = userService.getUserByAccountAndPassword(account, password); - //判断逻辑 - System.out.println(user); - return ok(user); - } - - @PostMapping("/checkRegister") - public String register(@RequestBody User user) { -// String account = user.getAccount(); -// String password = user.getPassword(); -// String name = user.getName(); -// String organization = user.getOrganization(); -// String gender = user.getGender(); -// String email = user.getEmail(); -// String phone = user.getPhone(); - - System.out.println(user.toString()); - - if(userService.registerUser(user) != null){ - return "注册成功"; - } - return "注册错误"; - } -} diff --git a/src/main/java/org/cmh/backend/authentication/model/User.java b/src/main/java/org/cmh/backend/authentication/model/User.java deleted file mode 100644 index c67fd82..0000000 --- a/src/main/java/org/cmh/backend/authentication/model/User.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.cmh.backend.authentication.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/authentication/repository/UserRepository.java b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java deleted file mode 100644 index 6eb5343..0000000 --- a/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.cmh.backend.authentication.repository; - -import org.cmh.backend.authentication.model.User; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface UserRepository extends JpaRepository { - User findByAccount(String username); - User findByAccountAndPassword(String username, String password); - User save(User user); -} 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 diff --git a/src/main/java/org/cmh/backend/authentication/service/UserService.java b/src/main/java/org/cmh/backend/authentication/service/UserService.java deleted file mode 100644 index 0ae8931..0000000 --- a/src/main/java/org/cmh/backend/authentication/service/UserService.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.cmh.backend.authentication.service; - -import org.cmh.backend.authentication.model.User; -import org.cmh.backend.authentication.repository.UserRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class UserService { - @Autowired - private UserRepository userRepository; - - public User getUserByAccount(String account) { - return userRepository.findByAccount(account); - } - public User getUserByAccountAndPassword(String account, String password) { - return userRepository.findByAccountAndPassword(account, password); - } - - public User registerUser(User user) { - User savedUser = userRepository.save(user); - return savedUser; - } -} -- 2.45.2 From bdba24dc26ea826494f0a8c725cadfe0ad228d19 Mon Sep 17 00:00:00 2001 From: MiLla <18826902282@163.com> Date: Thu, 4 Jul 2024 17:35:47 +0800 Subject: [PATCH 8/9] =?UTF-8?q?Revert=20"=E5=8F=AA=E6=9C=89=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9fb75be5ab58fbeeccf3c04d0f38d99e1b95830a. --- .../controller/AuthenticationController.java | 13 ++++ .../controller/UserController.java | 60 ++++++++++++++++ .../backend/authentication/model/User.java | 69 +++++++++++++++++++ .../repository/UserRepository.java | 10 +++ .../service/AuthenticationService.java | 0 .../authentication/service/UserService.java | 24 +++++++ 6 files changed, 176 insertions(+) create mode 100644 src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java create mode 100644 src/main/java/org/cmh/backend/authentication/controller/UserController.java create mode 100644 src/main/java/org/cmh/backend/authentication/model/User.java create mode 100644 src/main/java/org/cmh/backend/authentication/repository/UserRepository.java create mode 100644 src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java create mode 100644 src/main/java/org/cmh/backend/authentication/service/UserService.java diff --git a/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java b/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java new file mode 100644 index 0000000..8ec56df --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java @@ -0,0 +1,13 @@ +package org.cmh.backend.authentication.controller; + + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +class AuthenticationController { + @GetMapping("/hello") + public String hello(){ + return "Hello SpringBoot!"; + } +} \ No newline at end of file diff --git a/src/main/java/org/cmh/backend/authentication/controller/UserController.java b/src/main/java/org/cmh/backend/authentication/controller/UserController.java new file mode 100644 index 0000000..3281a80 --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/controller/UserController.java @@ -0,0 +1,60 @@ +package org.cmh.backend.authentication.controller; + +import org.cmh.backend.authentication.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 +@RequestMapping("/users") +public class UserController { + @Autowired + private UserService userService; + + + @PostMapping("/tmdshabi") + public ResponseEntity login(@RequestBody Map credentials) { + String account = credentials.get("account"); + String password = credentials.get("password"); + System.out.println(account); + System.out.println(password); + System.out.println("hahaha"); + return ResponseEntity.notFound().build(); + } + @PostMapping("/checkLogin") + public ResponseEntity hahaha(@RequestBody Map credentials){ + String account = credentials.get("account"); + String password = credentials.get("password"); + System.out.println(account); + System.out.println(password); + System.out.println("hahaha"); + System.out.println("hahaha"); + User user = userService.getUserByAccountAndPassword(account, password); + //判断逻辑 + System.out.println(user); + return ok(user); + } + + @PostMapping("/checkRegister") + public String register(@RequestBody User user) { +// String account = user.getAccount(); +// String password = user.getPassword(); +// String name = user.getName(); +// String organization = user.getOrganization(); +// String gender = user.getGender(); +// String email = user.getEmail(); +// String phone = user.getPhone(); + + System.out.println(user.toString()); + + if(userService.registerUser(user) != null){ + return "注册成功"; + } + return "注册错误"; + } +} diff --git a/src/main/java/org/cmh/backend/authentication/model/User.java b/src/main/java/org/cmh/backend/authentication/model/User.java new file mode 100644 index 0000000..c67fd82 --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/model/User.java @@ -0,0 +1,69 @@ +package org.cmh.backend.authentication.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/authentication/repository/UserRepository.java b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java new file mode 100644 index 0000000..6eb5343 --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java @@ -0,0 +1,10 @@ +package org.cmh.backend.authentication.repository; + +import org.cmh.backend.authentication.model.User; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserRepository extends JpaRepository { + User findByAccount(String username); + User findByAccountAndPassword(String username, String password); + User save(User user); +} diff --git a/src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java b/src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/org/cmh/backend/authentication/service/UserService.java b/src/main/java/org/cmh/backend/authentication/service/UserService.java new file mode 100644 index 0000000..0ae8931 --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/service/UserService.java @@ -0,0 +1,24 @@ +package org.cmh.backend.authentication.service; + +import org.cmh.backend.authentication.model.User; +import org.cmh.backend.authentication.repository.UserRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class UserService { + @Autowired + private UserRepository userRepository; + + public User getUserByAccount(String account) { + return userRepository.findByAccount(account); + } + public User getUserByAccountAndPassword(String account, String password) { + return userRepository.findByAccountAndPassword(account, password); + } + + public User registerUser(User user) { + User savedUser = userRepository.save(user); + return savedUser; + } +} -- 2.45.2 From 54f055dea981ca4a82614eb3ee5c2f36b418ca19 Mon Sep 17 00:00:00 2001 From: MiLla <18826902282@163.com> Date: Thu, 4 Jul 2024 17:37:53 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97.=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.gitkeep} | 0 .../controller/AuthenticationController.java | 13 ---- .../controller/UserController.java | 60 ---------------- .../cmh/backend/authentication/model/.gitkeep | 0 .../backend/authentication/model/User.java | 69 ------------------- .../authentication/repository/.gitkeep | 0 .../repository/UserRepository.java | 10 --- .../backend/authentication/service/.gitkeep | 0 .../authentication/service/UserService.java | 24 ------- 9 files changed, 176 deletions(-) rename src/main/java/org/cmh/backend/authentication/{service/AuthenticationService.java => controller/.gitkeep} (100%) delete mode 100644 src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java delete mode 100644 src/main/java/org/cmh/backend/authentication/controller/UserController.java create mode 100644 src/main/java/org/cmh/backend/authentication/model/.gitkeep delete mode 100644 src/main/java/org/cmh/backend/authentication/model/User.java create mode 100644 src/main/java/org/cmh/backend/authentication/repository/.gitkeep delete mode 100644 src/main/java/org/cmh/backend/authentication/repository/UserRepository.java create mode 100644 src/main/java/org/cmh/backend/authentication/service/.gitkeep delete mode 100644 src/main/java/org/cmh/backend/authentication/service/UserService.java diff --git a/src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java b/src/main/java/org/cmh/backend/authentication/controller/.gitkeep similarity index 100% rename from src/main/java/org/cmh/backend/authentication/service/AuthenticationService.java rename to src/main/java/org/cmh/backend/authentication/controller/.gitkeep diff --git a/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java b/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java deleted file mode 100644 index 8ec56df..0000000 --- a/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.cmh.backend.authentication.controller; - - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -class AuthenticationController { - @GetMapping("/hello") - public String hello(){ - return "Hello SpringBoot!"; - } -} \ No newline at end of file diff --git a/src/main/java/org/cmh/backend/authentication/controller/UserController.java b/src/main/java/org/cmh/backend/authentication/controller/UserController.java deleted file mode 100644 index 3281a80..0000000 --- a/src/main/java/org/cmh/backend/authentication/controller/UserController.java +++ /dev/null @@ -1,60 +0,0 @@ -package org.cmh.backend.authentication.controller; - -import org.cmh.backend.authentication.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 -@RequestMapping("/users") -public class UserController { - @Autowired - private UserService userService; - - - @PostMapping("/tmdshabi") - public ResponseEntity login(@RequestBody Map credentials) { - String account = credentials.get("account"); - String password = credentials.get("password"); - System.out.println(account); - System.out.println(password); - System.out.println("hahaha"); - return ResponseEntity.notFound().build(); - } - @PostMapping("/checkLogin") - public ResponseEntity hahaha(@RequestBody Map credentials){ - String account = credentials.get("account"); - String password = credentials.get("password"); - System.out.println(account); - System.out.println(password); - System.out.println("hahaha"); - System.out.println("hahaha"); - User user = userService.getUserByAccountAndPassword(account, password); - //判断逻辑 - System.out.println(user); - return ok(user); - } - - @PostMapping("/checkRegister") - public String register(@RequestBody User user) { -// String account = user.getAccount(); -// String password = user.getPassword(); -// String name = user.getName(); -// String organization = user.getOrganization(); -// String gender = user.getGender(); -// String email = user.getEmail(); -// String phone = user.getPhone(); - - System.out.println(user.toString()); - - if(userService.registerUser(user) != null){ - return "注册成功"; - } - return "注册错误"; - } -} diff --git a/src/main/java/org/cmh/backend/authentication/model/.gitkeep b/src/main/java/org/cmh/backend/authentication/model/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/org/cmh/backend/authentication/model/User.java b/src/main/java/org/cmh/backend/authentication/model/User.java deleted file mode 100644 index c67fd82..0000000 --- a/src/main/java/org/cmh/backend/authentication/model/User.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.cmh.backend.authentication.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/authentication/repository/.gitkeep b/src/main/java/org/cmh/backend/authentication/repository/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java b/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java deleted file mode 100644 index 6eb5343..0000000 --- a/src/main/java/org/cmh/backend/authentication/repository/UserRepository.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.cmh.backend.authentication.repository; - -import org.cmh.backend.authentication.model.User; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface UserRepository extends JpaRepository { - User findByAccount(String username); - User findByAccountAndPassword(String username, String password); - User save(User user); -} diff --git a/src/main/java/org/cmh/backend/authentication/service/.gitkeep b/src/main/java/org/cmh/backend/authentication/service/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/org/cmh/backend/authentication/service/UserService.java b/src/main/java/org/cmh/backend/authentication/service/UserService.java deleted file mode 100644 index 0ae8931..0000000 --- a/src/main/java/org/cmh/backend/authentication/service/UserService.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.cmh.backend.authentication.service; - -import org.cmh.backend.authentication.model.User; -import org.cmh.backend.authentication.repository.UserRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class UserService { - @Autowired - private UserRepository userRepository; - - public User getUserByAccount(String account) { - return userRepository.findByAccount(account); - } - public User getUserByAccountAndPassword(String account, String password) { - return userRepository.findByAccountAndPassword(account, password); - } - - public User registerUser(User user) { - User savedUser = userRepository.save(user); - return savedUser; - } -} -- 2.45.2