From a5fac95408a43ad43de9d88c30d06c0918c7bc8f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 29 May 2024 11:14:44 +0800
Subject: [PATCH] 配置调整
---
src/main/java/org/springblade/modules/system/service/IUserService.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index ffccafd..8d065b0 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -25,7 +25,9 @@
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.entity.UserInfo;
import org.springblade.modules.system.entity.UserOauth;
+import org.springblade.modules.system.excel.PoliceUserExcel;
import org.springblade.modules.system.excel.UserExcel;
+import org.springblade.modules.system.vo.UserDetailVO;
import org.springblade.modules.system.vo.UserVO;
import java.util.List;
@@ -70,7 +72,7 @@
* @param tenantId
* @return
*/
- IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
+ IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId);
/**
* 自定义分页
@@ -89,6 +91,15 @@
* @return
*/
User userByAccount(String tenantId, String account);
+
+ /**
+ * 根据账号获取用户
+ *
+ * @param tenantId
+ * @param account
+ * @return
+ */
+ UserInfo userInfo(String tenantId, String account);
/**
* 用户信息
@@ -178,7 +189,7 @@
* @param queryWrapper
* @return
*/
- List<UserExcel> exportUser(Wrapper<User> queryWrapper);
+ List<UserExcel> exportUser(Wrapper<User> queryWrapper, String tenantId);
/**
* 注册用户
@@ -227,4 +238,46 @@
* @return
*/
List<User> getUserListByPhoneOrAccount(String phoneNumber);
+
+ /**
+ * 获取用户信息
+ * @return
+ */
+ UserDetailVO getUserInfo(Long userId);
+
+ /**
+ * 获取用户信息ById
+ *
+ * @param id
+ * @return
+ */
+ UserVO getuserById(Long id);
+
+ /**
+ * 处理漏绑定的user_dept
+ */
+ Object handleUserDept();
+
+ List<User> getUserListByIds(String receiveUser);
+
+ List<User> getUserListByDeptIds(String receiveDept);
+
+ List<User> getUserInfoByPropertyId(String propertyCompanyId,String roleId);
+
+ Object handleUser();
+
+ /**
+ * 导入民警信息
+ * @param data
+ */
+ void importPoliceUser(List<PoliceUserExcel> data);
+
+
+ /**
+ * 查询500M内的民警
+ * @param longitude
+ * @param latitude
+ * @return
+ */
+ List<User> getPoliceUser(String longitude, String latitude, String houseCode);
}
--
Gitblit v1.9.3