From ac677f1728c8e02b7e6a1e349d267d4057c4baa6 Mon Sep 17 00:00:00 2001 From: heshunme Date: Fri, 5 Jul 2024 23:35:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AF=B9User=E4=B8=AD=E7=9A=84=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E7=9A=84=E6=97=A0=E5=85=B3=E7=B4=A7=E8=A6=81=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/UserManagement/model/User.java | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/cmh/backend/UserManagement/model/User.java b/src/main/java/org/cmh/backend/UserManagement/model/User.java index 373eaf7..aabf9ad 100644 --- a/src/main/java/org/cmh/backend/UserManagement/model/User.java +++ b/src/main/java/org/cmh/backend/UserManagement/model/User.java @@ -8,32 +8,18 @@ import lombok.Getter; import lombok.Setter; @Entity +@Setter +@Getter 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() { @@ -48,7 +34,6 @@ public class User { this.gender = gender; this.email = email; this.phone = phone; - } @Override From 2f57ff6a4c2cb41c9f686c16592eedfe4d84f96b Mon Sep 17 00:00:00 2001 From: heshunme Date: Fri, 5 Jul 2024 23:35:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86delete=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserManagementController.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java b/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java index ef3e873..40398fe 100644 --- a/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java +++ b/src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java @@ -1,13 +1,16 @@ 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.cmh.backend.UserManagement.service.UserManagementService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; + import java.util.List; @RestController +@RequestMapping("/user") public class UserManagementController { @Autowired private UserManagementService userManagementService; @@ -15,11 +18,11 @@ public class UserManagementController { @CrossOrigin(origins = "http://localhost:5173") @PostMapping("/addUser") public User addUser(@RequestBody User user) { - User user1=userManagementService.registerUser(user); - if(user1 != null){ + User user1 = userManagementService.registerUser(user); + if (user1 != null) { System.out.println(user1); return user1; - }else{ + } else { return null; } } @@ -27,7 +30,7 @@ public class UserManagementController { @CrossOrigin(origins = "http://localhost:5173") @GetMapping("/getAll") public List getAll() { - List userList=userManagementService.findAll(); + List userList = userManagementService.findAll(); return userList; } @@ -42,9 +45,15 @@ public class UserManagementController { @CrossOrigin(origins = "http://localhost:5173") @PostMapping("/delete") @Transactional - public void delete(@RequestBody User user) { + public ResponseEntity delete(@RequestBody User user) { System.out.println(user); - userManagementService.delete(user.getId()); + try{ + userManagementService.delete(user.getId()); + return ResponseEntity.ok("请求成功"); + } + catch (Exception e){ + return ResponseEntity.badRequest().body("删除失败"); + } } } From fca88ffd684854b705ee49d7ac438a2c9e0d1b84 Mon Sep 17 00:00:00 2001 From: heshunme Date: Fri, 5 Jul 2024 23:36:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4OrganizationController?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=97=A0=E6=95=88=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OrganizationController.java | 10 +++------- 1 file changed, 3 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 aecfe90..cfdb051 100644 --- a/src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java +++ b/src/main/java/org/cmh/backend/OrganizationManagement/controller/OrganizationController.java @@ -1,16 +1,12 @@ 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; -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.text.SimpleDateFormat; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -33,14 +29,14 @@ public class OrganizationController { @PostMapping("/addOrganization") public Organization add(@RequestBody Map credentials) { Organization organization = new Organization(); - if(credentials.get("organizationId") != null){ + 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){ + if (Integer.parseInt(credentials.get("parentOrganization")) != 0) { organization.setParentOrganization(organizationService.getById(Long.parseLong(credentials.get("parentOrganization")))); - }else{ + } else { organization.setParentOrganization(null); } organization.setEmail(credentials.get("email")); From a57b4be921df31740531973422ddd86e8456c6d1 Mon Sep 17 00:00:00 2001 From: heshunme Date: Fri, 5 Jul 2024 23:36:52 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4crossOrigin=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=80=BBRequestMapping?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TenantManagementController.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java b/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java index 033d235..66548a4 100644 --- a/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java +++ b/src/main/java/org/cmh/backend/UserManagement/controller/TenantManagementController.java @@ -2,32 +2,31 @@ 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.cmh.backend.UserManagement.service.TenantManagementService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import java.util.List; @RestController +@RequestMapping("/tenant") 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); + Tenant tenant1 = tenantManagementService.registerTenant(tenant); System.out.println(tenant.toString()); return tenant1; } - @CrossOrigin(origins = "http://localhost:5173") @GetMapping("/getAllTenant") public List getAll() { return tenantManagementService.findAll(); } - @CrossOrigin(origins = "http://localhost:5173") @PostMapping("/updateTenant") public Tenant update(@RequestBody Tenant tenant) { System.out.println(tenant); @@ -35,7 +34,6 @@ public class TenantManagementController { return tenant; } - @CrossOrigin(origins = "http://localhost:5173") @PostMapping("/deleteTenant") @Transactional public void delete(@RequestBody User user) {