src/main/java/org/cmh/backend/UserManagement/adpter/User2UserHS.java

@@ -1,19 +0,0 @@
-package org.cmh.backend.UserManagement.adpter;
-
-import org.cmh.backend.UserManagement.model.User;
-import org.cmh.backend.authentication.model.UserHS;
-
-public class User2UserHS {
-    public static UserHS convert(User user) {
-        UserHS userHS = new UserHS();
-        userHS.setUsername(user.getAccount());
-        userHS.setPassword(user.getPassword());
-        userHS.setNickname(user.getName());
-        userHS.setDepartment(user.getOrganization());
-        userHS.setGender(user.getGender());
-        userHS.setEmail(user.getEmail());
-        userHS.setPhoneNumber(user.getPhone());
-        return userHS;
-   }
-
-}

src/main/java/org/cmh/backend/UserManagement/adpter/UserHS2User.java

@@ -1,27 +0,0 @@
-package org.cmh.backend.UserManagement.adpter;
-
-import org.cmh.backend.UserManagement.model.User;
-import org.cmh.backend.authentication.model.UserHS;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class UserHS2User {
-    public static User convert(UserHS userHS) {
-        User user = new User();
-        user.setAccount(userHS.getUsername());
-        user.setPassword(userHS.getPassword());
-        user.setName(userHS.getNickname());
-        user.setOrganization(userHS.getDepartment());
-        user.setGender(userHS.getGender());
-        user.setEmail(userHS.getEmail());
-        user.setPhone(userHS.getPhoneNumber());
-        return user;
-    }
-    //不确定这个能不能用XD
-    public static List<User> convertList(List<UserHS> userHSList) {
-        return userHSList.stream()
-                .map(UserHS2User::convert)
-                .collect(Collectors.toList());
-    }
-}

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

@@ -1,19 +1,12 @@
 package org.cmh.backend.UserManagement.controller;
 
 import jakarta.transaction.Transactional;
-import org.cmh.backend.OrganizationManagement.service.OrganizationService;
-import org.cmh.backend.UserManagement.adpter.User2UserHS;
-import org.cmh.backend.UserManagement.adpter.UserHS2User;
-import org.cmh.backend.UserManagement.service.UserManagementService;
 import org.cmh.backend.UserManagement.model.User;
-import org.cmh.backend.authentication.dto.UserProfileResponse;
-import org.cmh.backend.authentication.model.UserHS;
-import org.cmh.backend.authentication.service.UserService;
+import org.cmh.backend.UserManagement.service.UserManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.List;
 
 @RestController
@@ -21,72 +14,47 @@ import java.util.List;
 public class UserManagementController {
     @Autowired
     private UserManagementService userManagementService;
-    @Autowired
-    private OrganizationService organizationService;
-    @Autowired
-    private UserService userService;
 
+    @CrossOrigin(origins = "http://localhost:5173")
     @PostMapping("/addUser")
-    public ResponseEntity<UserProfileResponse> addUser(@RequestBody User user) {
-        UserHS newuser = User2UserHS.convert(user);
-        UserProfileResponse response = new UserProfileResponse(
-                newuser.getUsername(),
-                newuser.getNickname(),
-                newuser.getGender(),
-                newuser.getPhoneNumber(),
-                newuser.getEmail(),
-                newuser.getDepartment(),
-                newuser.getRole(),
-                newuser.getCreatedAt()
-        );
-        if(organizationService.getByName(newuser.getDepartment()) != null){
-            userService.addUser(newuser);
-            return new ResponseEntity<>(response, HttpStatus.OK);
-        }else{
+    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() {
-        //这里getAll??
-        List<UserHS> userHSList = userService.getAll();
-        return UserHS2User.convertList(userHSList);;
+        List<User> userList = userManagementService.findAll();
+        return userList;
     }
 
-
+    @CrossOrigin(origins = "http://localhost:5173")
     @PostMapping("/update")
-    public ResponseEntity<UserProfileResponse> update(@RequestBody User user) {
-        UserHS newuser = User2UserHS.convert(user);
-        UserProfileResponse response = new UserProfileResponse(
-                newuser.getUsername(),
-                newuser.getNickname(),
-                newuser.getGender(),
-                newuser.getPhoneNumber(),
-                newuser.getEmail(),
-                newuser.getDepartment(),
-                newuser.getRole(),
-                newuser.getCreatedAt()
-        );
-        if(organizationService.getByName(newuser.getDepartment()) != null){
-            userService.addUser(newuser);
-            return new ResponseEntity<>(response, HttpStatus.OK);
-        }else{
-            return null;
-        }
+    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) {
-        UserHS userHS = userService.getUserByUsername(user.getName());
-        if(userHS != null){
-            //根据用户名删除用户
-            userService.deleteUser(userHS.getUsername());
+    public ResponseEntity<String> delete(@RequestBody User user) {
+        System.out.println(user);
+        try{
+            userManagementService.delete(user.getId());
+            return ResponseEntity.ok("请求成功");
+        }
+        catch (Exception e){
+            return ResponseEntity.badRequest().body("删除失败");
         }
     }
+
 }