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 | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 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 0755752..8d065b0 100644 --- a/src/main/java/org/springblade/modules/system/service/IUserService.java +++ b/src/main/java/org/springblade/modules/system/service/IUserService.java @@ -19,7 +19,6 @@ 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; @@ -92,6 +91,15 @@ * @return */ User userByAccount(String tenantId, String account); + + /** + * 根据账号获取用户 + * + * @param tenantId + * @param account + * @return + */ + UserInfo userInfo(String tenantId, String account); /** * 用户信息 @@ -181,7 +189,7 @@ * @param queryWrapper * @return */ - List<UserExcel> exportUser(Wrapper<User> queryWrapper); + List<UserExcel> exportUser(Wrapper<User> queryWrapper, String tenantId); /** * 注册用户 @@ -245,10 +253,6 @@ */ UserVO getuserById(Long id); - List<UserEntity> getUserInfoByCode(String houseCode, String type); - - List<UserEntity> getUserInfoByDistrictId(String districtId, String building); - /** * 处理漏绑定的user_dept */ @@ -268,5 +272,12 @@ */ void importPoliceUser(List<PoliceUserExcel> data); - List<UserEntity> getUserInfoByDistrictIds(String districtIds); + + /** + * 查询500M内的民警 + * @param longitude + * @param latitude + * @return + */ + List<User> getPoliceUser(String longitude, String latitude, String houseCode); } -- Gitblit v1.9.3