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 |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 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 48fc873..95014b1 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -23,6 +23,7 @@
 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;
@@ -117,6 +118,17 @@
 	 * @param tenantId
 	 * @param account
 	 * @param password
+	 * @param type 登录类型 2：pc 3：app
+	 * @return
+	 */
+	UserInfo userInfo(String tenantId, String account, String password, Integer type);
+
+	/**
+	 * 用户信息
+	 *
+	 * @param tenantId
+	 * @param account
+	 * @param password
 	 * @param userEnum
 	 * @return
 	 */
@@ -181,7 +193,7 @@
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<UserExcel> exportUser(Wrapper<User> queryWrapper);
+	List<UserExcel> exportUser(Wrapper<User> queryWrapper, String tenantId);
 
 	/**
 	 * 注册用户
@@ -191,6 +203,13 @@
 	 * @return
 	 */
 	boolean registerGuest(User user, Long oauthId);
+
+	/**
+	 * 注册新用户
+	 * @param user
+	 * @return
+	 */
+	boolean registerUser(UserVO user );
 
 	/**
 	 * 配置用户平台
@@ -268,5 +287,12 @@
 	 */
 	void importPoliceUser(List<PoliceUserExcel> data);
 
-	List<User> getUserInfoByDistrictIds(String districtIds);
+
+	/**
+	 * 查询500M内的民警
+	 * @param longitude
+	 * @param latitude
+	 * @return
+	 */
+	List<User> getPoliceUser(String longitude, String latitude, String houseCode);
 }

--
Gitblit v1.9.3