From 2cf1565485060fd56e1f1f1cffbba7a4d70d42a6 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 11 四月 2025 11:06:22 +0800
Subject: [PATCH] 优化dnc,设备结构树查询,优化原有代码

---
 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java |   55 +++++++++++++++++++++++++++++++------------------------
 1 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
index 4a23faa..3604d3f 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
@@ -37,7 +37,7 @@
 	 * @param confirmpassword
 	 * @return
 	 */
-	public Result<?> resetPassword(String username, String oldpassword, String newpassword, String confirmpassword);
+    Result<?> resetPassword(String username, String oldpassword, String newpassword, String confirmpassword);
 
 	/**
 	 * 淇敼瀵嗙爜
@@ -45,50 +45,50 @@
 	 * @param sysUser
 	 * @return
 	 */
-	public Result<?> changePassword(SysUser sysUser);
+    Result<?> changePassword(SysUser sysUser);
 
 	/**
 	 * 鍒犻櫎鐢ㄦ埛
 	 * @param userId
 	 * @return
 	 */
-	public boolean deleteUser(String userId);
+    boolean deleteUser(String userId);
 
 	/**
 	 * 鎵归噺鍒犻櫎鐢ㄦ埛
 	 * @param userIds
 	 * @return
 	 */
-	public boolean deleteBatchUsers(String userIds);
+    boolean deleteBatchUsers(String userIds);
 
     /**
      * 鏍规嵁鐢ㄦ埛鍚嶆煡璇�
      * @param username 鐢ㄦ埛鍚�
      * @return SysUser
      */
-	public SysUser getUserByName(String username);
-	
+    SysUser getUserByName(String username);
+
 	/**
 	 * 娣诲姞鐢ㄦ埛鍜岀敤鎴疯鑹插叧绯�
 	 * @param user
 	 * @param roles
 	 */
-	public void addUserWithRole(SysUser user,String roles);
-	
-	
+    void addUserWithRole(SysUser user, String roles);
+
+
 	/**
 	 * 淇敼鐢ㄦ埛鍜岀敤鎴疯鑹插叧绯�
 	 * @param user
 	 * @param roles
 	 */
-	public void editUserWithRole(SysUser user,String roles);
+    void editUserWithRole(SysUser user, String roles);
 
 	/**
 	 * 鑾峰彇鐢ㄦ埛鐨勬巿鏉冭鑹�
 	 * @param username
 	 * @return
 	 */
-	public List<String> getRole(String username);
+    List<String> getRole(String username);
 
 	/**
 	 * 鑾峰彇鏍规嵁鐧诲綍鐢ㄦ埛鐨勮鑹茶幏鍙栧姩鎬侀椤�
@@ -97,15 +97,15 @@
 	 * @param version 鍓嶇UI鐗堟湰
 	 * @return
 	 */
-	public SysRoleIndex getDynamicIndexByUserRole(String username,String version);
-	
+    SysRoleIndex getDynamicIndexByUserRole(String username, String version);
+
 	/**
 	  * 鏌ヨ鐢ㄦ埛淇℃伅鍖呮嫭 閮ㄩ棬淇℃伅
 	 * @param username
 	 * @return
 	 */
 	@Deprecated
-	public SysUserCacheInfo getCacheUser(String username);
+    SysUserCacheInfo getCacheUser(String username);
 
 	/**
 	 * 鏍规嵁閮ㄩ棬Id鏌ヨ
@@ -114,7 +114,7 @@
      * @param username 鐢ㄦ埛璐︽埛鍚嶇О
 	 * @return
 	 */
-	public IPage<SysUser> getUserByDepId(Page<SysUser> page, String departId, String username);
+    IPage<SysUser> getUserByDepId(Page<SysUser> page, String departId, String username);
 
 	/**
 	 * 鏍规嵁閮ㄩ棬Ids鏌ヨ
@@ -123,14 +123,14 @@
      * @param username 鐢ㄦ埛璐︽埛鍚嶇О
 	 * @return
 	 */
-	public IPage<SysUser> getUserByDepIds(Page<SysUser> page, List<String> departIds, String username);
+    IPage<SysUser> getUserByDepIds(Page<SysUser> page, List<String> departIds, String username);
 
 	/**
 	 * 鏍规嵁 userIds鏌ヨ锛屾煡璇㈢敤鎴锋墍灞為儴闂ㄧ殑鍚嶇О锛堝涓儴闂ㄥ悕閫楀彿闅斿紑锛�
 	 * @param userIds
 	 * @return
 	 */
-	public Map<String,String> getDepNamesByUserIds(List<String> userIds);
+    Map<String,String> getDepNamesByUserIds(List<String> userIds);
 
     /**
      * 鏍规嵁閮ㄩ棬 Id 鍜� QueryWrapper 鏌ヨ
@@ -161,7 +161,7 @@
      * @param username 鐢ㄦ埛璐︽埛鍚嶇О
 	 * @return
 	 */
-	public IPage<SysUser> getUserByRoleId(Page<SysUser> page,String roleId, String username);
+    IPage<SysUser> getUserByRoleId(Page<SysUser> page, String roleId, String username);
 
 	/**
 	 * 閫氳繃鐢ㄦ埛鍚嶈幏鍙栫敤鎴疯鑹查泦鍚�
@@ -178,20 +178,20 @@
 	 * @return 鏉冮檺闆嗗悎
 	 */
 	Set<String> getUserPermissionsSet(String username);
-	
+
 	/**
 	 * 鏍规嵁鐢ㄦ埛鍚嶈缃儴闂↖D
 	 * @param username
 	 * @param orgCode
 	 */
 	void updateUserDepart(String username,String orgCode);
-	
+
 	/**
 	 * 鏍规嵁鎵嬫満鍙疯幏鍙栫敤鎴峰悕鍜屽瘑鐮�
      * @param phone 鎵嬫満鍙�
      * @return SysUser
 	 */
-	public SysUser getUserByPhone(String phone);
+    SysUser getUserByPhone(String phone);
 
 
 	/**
@@ -199,7 +199,7 @@
      * @param email 閭
      * @return SysUser
      */
-	public SysUser getUserByEmail(String email);
+    SysUser getUserByEmail(String email);
 
 
 	/**
@@ -215,7 +215,7 @@
 	 * @param departs
 	 */
 	void editUserWithDepart(SysUser user, String departs);
-	
+
 	/**
 	   * 鏍¢獙鐢ㄦ埛鏄惁鏈夋晥
 	 * @param sysUser
@@ -316,7 +316,7 @@
 	 * @param
 	 * @return
 	 */
-	public List<SysUser> getAllUsersByRoleId(String roleId);
+    List<SysUser> getAllUsersByRoleId(String roleId);
 
 	List<String> getUserByRoleCode(String roleCode);
 
@@ -330,4 +330,11 @@
 	 * @return
 	 */
     List<UserSelector> selectOperatorList(String equipmentCode, String productionId, String positionCode);
+
+	/**
+	 * 鏍规嵁鐢ㄦ埛鍚嶆壒閲忚幏鍙栫湡瀹炲鍚嶆槧灏�
+     * @param userNames 鐢ㄦ埛鍚嶅垪琛�
+     * @return 鐢ㄦ埛鍚�->鐪熷疄濮撳悕鐨勬槧灏勶紙涓嶅瓨鍦ㄦ椂鍊间负null锛�
+	 */
+	Map<String, String> getUserRealNamesByUserNames(List<String> userNames);
 }

--
Gitblit v1.9.3