From 6a31efbd0b3c349f794592d9f8ddf0e92d640a83 Mon Sep 17 00:00:00 2001
From: qinjie <463333974@qq.com>
Date: Wed, 6 Nov 2024 13:04:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/isu/gaswellwatch/controller/UserController.java  | 6 ++++++
 .../java/com/isu/gaswellwatch/service/UserService.java   | 1 +
 .../isu/gaswellwatch/service/impl/UserServiceImpl.java   | 9 +++++++++
 3 files changed, 16 insertions(+)

diff --git a/src/main/java/com/isu/gaswellwatch/controller/UserController.java b/src/main/java/com/isu/gaswellwatch/controller/UserController.java
index 4234f05..1c41979 100644
--- a/src/main/java/com/isu/gaswellwatch/controller/UserController.java
+++ b/src/main/java/com/isu/gaswellwatch/controller/UserController.java
@@ -7,6 +7,7 @@ import com.isu.gaswellwatch.dto.ModifyPasswordDTO;
 import com.isu.gaswellwatch.dto.UserDTO;
 import com.isu.gaswellwatch.dto.UserEditDTO;
 import com.isu.gaswellwatch.entity.Response;
+import com.isu.gaswellwatch.entity.User;
 import com.isu.gaswellwatch.enums.LogType;
 import com.isu.gaswellwatch.service.UserService;
 import com.isu.gaswellwatch.vo.MenuTreeVO;
@@ -48,6 +49,11 @@ public class UserController {
         return Response.succeed();
     }
 
+    @GetMapping("/getUser")
+    public Response<UserVO> getUser(@RequestParam Long id){
+        return Response.succeed(userService.getUser(id));
+    }
+
     @PostMapping("/modifyPassword")
     public Response<String> modifyPassword(@RequestBody @Valid ModifyPasswordDTO modifyPasswordDTO){
         userService.modifyPassword(modifyPasswordDTO);
diff --git a/src/main/java/com/isu/gaswellwatch/service/UserService.java b/src/main/java/com/isu/gaswellwatch/service/UserService.java
index 9355e70..75145fb 100644
--- a/src/main/java/com/isu/gaswellwatch/service/UserService.java
+++ b/src/main/java/com/isu/gaswellwatch/service/UserService.java
@@ -24,6 +24,7 @@ public interface UserService extends IService<User> {
     Page<UserVO> page(Integer currentPage, Integer pageSize, String username, String name, Long roleId, String isEnable);
     void add(UserDTO userDTO);
     void edit(UserEditDTO userEditDTO);
+    UserVO getUser(Long id);
     void delete(Long id);
     void reset(Long id);
     void export(HttpServletResponse response, String username, String name, Long roleId, String isEnable);
diff --git a/src/main/java/com/isu/gaswellwatch/service/impl/UserServiceImpl.java b/src/main/java/com/isu/gaswellwatch/service/impl/UserServiceImpl.java
index 340abc0..13beea2 100644
--- a/src/main/java/com/isu/gaswellwatch/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/isu/gaswellwatch/service/impl/UserServiceImpl.java
@@ -145,6 +145,13 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
         addRelation(userEditDTO.getRoles(), user);
     }
 
+    @Override
+    public UserVO getUser(Long id) {
+        User user = getById(id);
+        if(user == null) return null;
+        return userDao.selectUserInfo(user.getUsername());
+    }
+
     @Override
     public void delete(Long id){
         //如果是超管  不能删除
@@ -157,6 +164,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
         }
     }
 
+
+
     @Override
     public void reset(Long id){
         User byId = getById(id);