From 0cd9d911b8e8634ec04cb82ea07696bb09260b03 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 26 十二月 2023 13:48:06 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
index 3366c8b..11450dd 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/UmsAdminService.java
@@ -1,12 +1,15 @@
package com.ycl.service.user;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.dto.UmsAdminParam;
+import com.ycl.dto.user.UmsUserDto1;
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.user.UmsAdmin;
-import com.ycl.entity.user.UmsResource;
+import com.ycl.entity.user.UmsMenu;
import com.ycl.entity.user.UmsRole;
+import com.ycl.vo.user.UserVO;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +30,8 @@
*/
UmsAdmin register(UmsAdminParam umsAdminParam);
+ void importExcl(UmsAdminParam umsAdminParam);
+
/**
* 鐧诲綍鍔熻兘
* @param username 鐢ㄦ埛鍚�
@@ -34,6 +39,8 @@
* @return 鐢熸垚鐨凧WT鐨則oken
*/
String login(String username,String password);
+
+ String getOAuthToken(String username);
/**
* 鍒锋柊token鐨勫姛鑳�
@@ -70,7 +77,7 @@
/**
* 鑾峰彇鎸囧畾鐢ㄦ埛鐨勫彲璁块棶璧勬簮
*/
- List<UmsResource> getResourceList(Long adminId);
+ List<UmsMenu> getResourceList(Long adminId);
/**
* 淇敼瀵嗙爜
@@ -86,4 +93,32 @@
* 鑾峰彇缂撳瓨鏈嶅姟
*/
UmsAdminCacheService getCacheService();
+
+ /**
+ * 鍒嗛〉
+ * @param pageUserVO
+ * @return
+ */
+ IPage<UmsAdmin> pageUser(UserVO.PageUserVO pageUserVO);
+
+ List<UmsUserDto1> userExp();
+
+ /**
+ * 鎵归噺鍒犻櫎鐢ㄦ埛
+ */
+ boolean deleteBatch(List<Long> ids);
+
+ /**
+ * 鎵归噺淇敼鐘舵��
+ *
+ * @param ids
+ * @param status
+ */
+ boolean updateStatusBatch(List<Long> ids, Integer status);
+
+
+ List<UmsAdmin> getDepartUser(Long departId);
+ String getTargetTo(String ids, String sendType);
+
+ UmsAdmin getByOpenid(String openid);
}
--
Gitblit v1.8.0