From c0ab746fd3d5679be6937546876be06ca13021b9 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 13 Mar 2024 12:02:30 +0800
Subject: [PATCH] 通过经纬度查询最近的民警人员
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 02d2ecd..3993f6f 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -24,6 +24,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
import org.springblade.common.cache.DictCache;
@@ -600,8 +601,11 @@
IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
return bean.getGridManByCode(houseCode);
} else {
- IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
- return bean1.getDistictUserByCode(houseCode);
+// IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
+// return bean1.getDistictUserByCode(houseCode);
+ String deptId = AuthUtil.getDeptId();
+ List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ return baseMapper.selectUserByDept(deptIdList);
}
}
@@ -611,7 +615,7 @@
}
@Override
- public List<UserEntity> getUserInfoByDistrictIds(String districtIds) {
+ public List<User> getUserInfoByDistrictIds(String districtIds) {
List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
return baseMapper.getUserInfoByDistrictIds(list);
}
@@ -637,6 +641,9 @@
@Override
public List<User> getUserInfoByPropertyId(String propertyCompanyId, String roleId) {
// 查询物业公司，获取物业公司的机构
+ if(StringUtils.isBlank(propertyCompanyId)){
+ return new ArrayList<>();
+ }
IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getId, propertyCompanyId));
return baseMapper.getUserInfoByPropertyId(one.getDeptId().toString(), roleId);
@@ -807,4 +814,15 @@
public List<User> getUserListByDeptIds(String receiveDept) {
return baseMapper.getUserListByDeptIds(receiveDept);
}
+
+ /**
+ * 通过经纬度查询最近的民警人员
+ * @param longitude
+ * @param latitude
+ * @return
+ */
+ @Override
+ public List<User> getPoliceUser(String longitude, String latitude) {
+ return baseMapper.getPoliceUser( longitude, latitude);
+ }
}
--
Gitblit v1.9.3