From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/system/service/IUserService.java | 72 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 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..95014b1 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -19,13 +19,17 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Query;
import org.springblade.modules.auth.enums.UserEnum;
+import org.springblade.modules.house.vo.HouseholdVO;
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 +74,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);
/**
* 自定义分页
@@ -107,6 +111,17 @@
* @return
*/
UserInfo userInfo(String tenantId, String account, String password);
+
+ /**
+ * 用户信息
+ *
+ * @param tenantId
+ * @param account
+ * @param password
+ * @param type 登录类型 2：pc 3：app
+ * @return
+ */
+ UserInfo userInfo(String tenantId, String account, String password, Integer type);
/**
* 用户信息
@@ -178,7 +193,7 @@
* @param queryWrapper
* @return
*/
- List<UserExcel> exportUser(Wrapper<User> queryWrapper);
+ List<UserExcel> exportUser(Wrapper<User> queryWrapper, String tenantId);
/**
* 注册用户
@@ -188,6 +203,13 @@
* @return
*/
boolean registerGuest(User user, Long oauthId);
+
+ /**
+ * 注册新用户
+ * @param user
+ * @return
+ */
+ boolean registerUser(UserVO user );
/**
* 配置用户平台
@@ -227,4 +249,50 @@
* @return
*/
List<User> getUserListByPhoneOrAccount(String phoneNumber);
+
+ /**
+ * 获取用户信息
+ * @return
+ */
+ UserDetailVO getUserInfo(Long userId);
+
+ /**
+ * 获取用户信息ById
+ *
+ * @param id
+ * @return
+ */
+ UserVO getuserById(Long id);
+
+ List<UserEntity> getUserInfoByCode(String houseCode, String type);
+
+ List<UserEntity> getUserInfoByDistrictId(String districtId, String building);
+
+ /**
+ * 处理漏绑定的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