From 18f1836e9aa9adef0a6642167571eb4e59d80823 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 14:06:02 +0800
Subject: [PATCH] 主页

---
 user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
index fee7cd5..5d8d92d 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/UserService.java
@@ -4,15 +4,12 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.limslaboratory.pojo.User;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.limslaboratory.vo.NewPersonnelVo;
-import com.yuanchu.limslaboratory.vo.PagePersonnelVo;
-import com.yuanchu.limslaboratory.vo.UpdatePersonnelVo;
-import org.springframework.transaction.annotation.Transactional;
+import com.yuanchu.limslaboratory.pojo.dto.RoleAndMenuDto;
+import com.yuanchu.limslaboratory.pojo.vo.NewPersonnelVo;
+import com.yuanchu.limslaboratory.pojo.vo.UpdatePersonnelVo;
 
-import java.io.Serializable;
-
+import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * <p>
@@ -23,21 +20,67 @@
  * @since 2023-07-07
  */
 public interface UserService extends IService<User> {
-//    閫氳繃鐢ㄦ埛id鑾峰彇鐢ㄦ埛淇℃伅
+    /**
+     * 閫氳繃鐢ㄦ埛id鑾峰彇鐢ㄦ埛淇℃伅
+     * @param userId
+     * @return
+     */
     Map<String, String> selectUserByUserId(int userId);
 
     User AccordingUsernameSelectAll(String account);
 
+    /**
+     * 娣诲姞鐢ㄦ埛
+     * @param newPersonnelVo
+     * @param enterpriseId
+     * @return
+     */
     Integer addNewPersonnel(NewPersonnelVo newPersonnelVo, String enterpriseId);
 
+    /**
+     * 鏇存柊鐢ㄦ埛鍩烘湰淇℃伅
+     * @param updatePersonnelVo
+     * @return
+     */
     Integer updateNewPersonnel(UpdatePersonnelVo updatePersonnelVo);
 
-    IPage<PagePersonnelVo> getNewPersonnelPage(String name, Page page);
+    /**
+     * 鍒嗛〉鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
+     * @param name
+     * @param page
+     * @return
+     */
+    IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status);
 
+    /**
+     * 鐧诲綍鑾峰彇鐢ㄦ埛鍩烘湰淇℃伅涓庣郴缁熻秴鏃舵椂闂存彁閱�
+     * @param token
+     * @return
+     */
     Map<String, Object> getUserInfo(String token);
 
     /**
      * 鏍规嵁Id鏌ヨ鏄惁瀛樺湪璇ョ敤鎴�
      */
     Boolean userIsNull(Integer Id);
+
+    /**
+     * 鏍规嵁鐢ㄦ埛Id鏌ヨ鐢ㄦ埛鍚嶇О
+     * @param userId 鐢ㄦ埛Id
+     * @return
+     */
+    String selectByUserId(Integer userId);
+
+    /**
+     * 鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
+     * @return
+     */
+    List<Map<String,Object>> selectUser();
+
+    /**
+     * 鑾峰彇鎵�鏈夌敤鎴风殑鍚嶇О涓嶪d
+     */
+    List<Map<String, Object>> getUserNameAndId();
+
+    RoleAndMenuDto getUserRoleInfo(String token);
 }

--
Gitblit v1.9.3