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 | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 155 insertions(+), 19 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 4e0bbba..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
@@ -17,12 +17,14 @@
package org.springblade.modules.system.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
@@ -148,8 +150,23 @@
* @param user
*/
public void updateGridBind(User user) {
+ // 先删除原有区域的绑定
+ QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0).like("police_user_id",user.getId());
+ // 删除掉之前已绑定的
+ List<PoliceAffairsGridEntity> list = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
+ // 遍历
+ for (PoliceAffairsGridEntity policeAffairsGridEntity : list) {
+ List<String> arrayList = new ArrayList<>(Arrays.asList(policeAffairsGridEntity.getPoliceUserId().split(",")));
+ arrayList.remove(user.getId().toString());
+ // 更新
+ policeAffairsGridEntity.setPoliceUserId(String.join(",",arrayList));
+ // 解决更新报错
+ policeAffairsGridEntity.setGeom(null);
+ SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
+ }
// 判断机构类型
- List<String> deptIds = Arrays.asList(user.getDeptId().split(","));
+ List<String> deptIds = new ArrayList<>(Arrays.asList(user.getDeptId().split(",")));
for (String deptId : deptIds) {
// 查询对应的机构
Dept dept = SpringUtil.getBean(IDeptService.class).getById(deptId);
@@ -197,9 +214,9 @@
}
@Override
- public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
- if (null == deptId && !AuthUtil.isAdministrator()) {
- deptId = Long.parseLong(AuthUtil.getDeptId());
+ public IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId) {
+ if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
+ deptId = AuthUtil.getDeptId();
}
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
@@ -356,7 +373,39 @@
if (Func.contains(Func.toLongArray(userIds), AuthUtil.getUserId())) {
throw new ServiceException("不能删除本账号!");
}
- return deleteLogic(Func.toLongList(userIds));
+ boolean deleteLogic = deleteLogic(Func.toLongList(userIds));
+ if (deleteLogic){
+ // 删除警格绑定
+ removePoliceGridBind(userIds);
+ }
+ return deleteLogic;
+ }
+
+ /**
+ * 删除警格绑定
+ * @param userIds
+ */
+ public void removePoliceGridBind(String userIds) {
+ List<String> userIdList = new ArrayList<>(Arrays.asList(userIds.split(",")));
+ for (String userId : userIdList) {
+ // 先删除原有区域的绑定
+ QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0).like("police_user_id",userId);
+ // 删除掉之前已绑定的
+ List<PoliceAffairsGridEntity> list = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
+ if (list.size()>0) {
+ // 遍历
+ for (PoliceAffairsGridEntity policeAffairsGridEntity : list) {
+ List<String> arrayList = new ArrayList<>(Arrays.asList(policeAffairsGridEntity.getPoliceUserId().split(",")));
+ arrayList.remove(userId);
+ // 更新
+ policeAffairsGridEntity.setPoliceUserId(String.join(",", arrayList));
+ // 解决更新报错
+ policeAffairsGridEntity.setGeom(null);
+ SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
+ }
+ }
+ }
}
@Override
@@ -552,14 +601,23 @@
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);
}
}
@Override
public List<UserEntity> getUserInfoByDistrictId(String districtId, String building) {
return baseMapper.getUserInfoByDistrictId(districtId, building);
+ }
+
+ @Override
+ public List<User> getUserInfoByDistrictIds(String districtIds) {
+ List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
+ return baseMapper.getUserInfoByDistrictIds(list);
}
/**
@@ -583,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);
@@ -623,11 +684,15 @@
// 判断角色
if (!userInfo.getRoleId().contains("1727864411451359233")){
userInfo.setRoleId(userInfo.getRoleId() + ",1727864411451359233");
- // 更新
- updateById(userInfo);
- // 更新社区民警绑定信息
- updateCommunityInfo(userExcel,userInfo);
}
+ // 更新机构
+ setDeptId(userInfo,userExcel);
+ // 更新
+ updateById(userInfo);
+ // 更新用户机构绑定
+ submitUserDept(userInfo);
+ // 更新社区民警绑定信息
+ updateGridBind(userInfo);
}else {
// 插入用户角色
User user = new User();
@@ -638,18 +703,78 @@
user.setRealName(userExcel.getRealName());
user.setPhone(userExcel.getPhone());
user.setAccount(userExcel.getPhone());
- // 查询机构
- QueryWrapper<Dept> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0).eq("dept_name",userExcel.getPoliceStationName());
- Dept dept = SpringUtil.getBean(IDeptService.class).getOne(queryWrapper);
- if (null!=dept){
- user.setDeptId(dept.getId().toString());
- }
+ // 更新机构
+ setDeptId(user,userExcel);
+ // 设置初始密码
user.setPassword("123456");
// 保存
submit(user);
+ // 更新用户机构绑定
+ submitUserDept(user);
// 更新社区民警绑定信息
- updateCommunityInfo(userExcel,user);
+ updateGridBind(user);
+ }
+ }
+ }
+
+ /**
+ * 设置机构
+ */
+ public void setDeptId(User user,PoliceUserExcel userExcel) {
+ // 查询机构
+ QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0)
+ .eq("community_code",userExcel.getCommunityCode())
+ .eq("pcs_name",userExcel.getPoliceStationName());
+ PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridService.getOne(queryWrapper);
+ if (null!=policeAffairsGridEntity){
+ // 查询对应绑定的机构
+ QueryWrapper<Dept> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0)
+ .eq("dept_nature",1)
+ .eq("region_code",policeAffairsGridEntity.getJwGridCode());
+ Dept dept = SpringUtil.getBean(IDeptService.class).getOne(wrapper);
+ if (null!=dept){
+ if (null!=user.getId()){
+ DeptNotHandle(user, dept);
+ }else {
+ user.setDeptId(dept.getId().toString());
+ }
+ }
+ }
+ }
+
+ /**
+ * 机构不为空时处理
+ * @param user
+ * @param dept
+ */
+ public void DeptNotHandle(User user, Dept dept) {
+ // 更新设置机构
+ if (!Strings.isBlank(user.getDeptId())){
+ // 查询对应的派出所（去掉）
+ Dept deptPcs = SpringUtil.getBean(IDeptService.class).getDeptByDeptIds(user.getDeptId());
+ if (null!=deptPcs) {
+ // 如果存在需要去掉派出所的机构id
+ List<String> list = new ArrayList<>(Arrays.asList(user.getDeptId().split(",")));
+ // 先删除派出所对应的机构ID
+ if (list.contains(deptPcs.getId().toString())){
+ list.remove(deptPcs.getId().toString());
+ user.setDeptId(String.join(",",list));
+ }
+ // 删完后可能就没了
+ if (!Strings.isBlank(user.getDeptId())) {
+ if (!user.getDeptId().contains(dept.getId().toString())) {
+ user.setDeptId(user.getDeptId() + "," + dept.getId());
+ }
+ }else {
+ // 删完后的
+ user.setDeptId(dept.getId().toString());
+ }
+ }else {
+ if (!user.getDeptId().contains(dept.getId().toString())) {
+ user.setDeptId(user.getDeptId() + "," + dept.getId());
+ }
}
}
}
@@ -689,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