From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 155 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 110 insertions(+), 45 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 e309a8a..da13de2 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;
@@ -48,10 +50,10 @@
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
-import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.excel.PoliceUserExcel;
@@ -145,12 +147,13 @@
/**
* 更新警格或网格的绑定
+ *
* @param user
*/
public void updateGridBind(User user) {
// 先删除原有区域的绑定
QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0).like("police_user_id",user.getId());
+ queryWrapper.eq("is_deleted", 0).like("police_user_id", user.getId());
// 删除掉之前已绑定的
List<PoliceAffairsGridEntity> list = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
// 遍历
@@ -158,7 +161,7 @@
List<String> arrayList = new ArrayList<>(Arrays.asList(policeAffairsGridEntity.getPoliceUserId().split(",")));
arrayList.remove(user.getId().toString());
// 更新
- policeAffairsGridEntity.setPoliceUserId(String.join(",",arrayList));
+ policeAffairsGridEntity.setPoliceUserId(String.join(",", arrayList));
// 解决更新报错
policeAffairsGridEntity.setGeom(null);
SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
@@ -168,15 +171,15 @@
for (String deptId : deptIds) {
// 查询对应的机构
Dept dept = SpringUtil.getBean(IDeptService.class).getById(deptId);
- if (null!=dept.getDeptNature()
+ if (null != dept.getDeptNature()
&& !Strings.isBlank(dept.getRegionCode())
- && dept.getDeptNature()==1
- ){
+ && dept.getDeptNature() == 1
+ ) {
QueryWrapper<PoliceAffairsGridEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted",0).eq("jw_grid_code",dept.getRegionCode());
+ wrapper.eq("is_deleted", 0).eq("jw_grid_code", dept.getRegionCode());
PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridService.getOne(wrapper);
// 更新
- if (null!=policeAffairsGridEntity){
+ if (null != policeAffairsGridEntity) {
if (!Strings.isBlank(policeAffairsGridEntity.getPoliceUserId())) {
if (!policeAffairsGridEntity.getPoliceUserId().contains(user.getId().toString())) {
policeAffairsGridEntity.setPoliceUserId(policeAffairsGridEntity.getPoliceUserId() + "," + user.getId());
@@ -185,7 +188,7 @@
// 更新
SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
}
- }else {
+ } else {
policeAffairsGridEntity.setPoliceUserId(user.getId().toString());
// 解决更新报错
policeAffairsGridEntity.setGeom(null);
@@ -212,9 +215,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));
@@ -372,7 +375,7 @@
throw new ServiceException("不能删除本账号!");
}
boolean deleteLogic = deleteLogic(Func.toLongList(userIds));
- if (deleteLogic){
+ if (deleteLogic) {
// 删除警格绑定
removePoliceGridBind(userIds);
}
@@ -381,6 +384,7 @@
/**
* 删除警格绑定
+ *
* @param userIds
*/
public void removePoliceGridBind(String userIds) {
@@ -388,10 +392,10 @@
for (String userId : userIdList) {
// 先删除原有区域的绑定
QueryWrapper<PoliceAffairsGridEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0).like("police_user_id",userId);
+ queryWrapper.eq("is_deleted", 0).like("police_user_id", userId);
// 删除掉之前已绑定的
List<PoliceAffairsGridEntity> list = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
- if (list.size()>0) {
+ if (list.size() > 0) {
// 遍历
for (PoliceAffairsGridEntity policeAffairsGridEntity : list) {
List<String> arrayList = new ArrayList<>(Arrays.asList(policeAffairsGridEntity.getPoliceUserId().split(",")));
@@ -599,14 +603,40 @@
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);
}
}
+ /**
+ * 通过小区id查询物业人员
+ *
+ * @param districtId
+ * @param building
+ * @return
+ */
@Override
public List<UserEntity> getUserInfoByDistrictId(String districtId, String building) {
return baseMapper.getUserInfoByDistrictId(districtId, building);
+ }
+
+ /**
+ * 通过小区id查询用户
+ *
+ * @param districtIds
+ * @param building
+ * @param unit
+ * @param name
+ * @return
+ */
+ @Override
+ public IPage<HouseholdVO> getUserInfoByDistrictIds(String districtIds, String building, String unit, String name, IPage<HouseholdVO> page) {
+ List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
+ List<HouseholdVO> userInfoByDistrictIds = baseMapper.getUserInfoByDistrictIds(list, building, unit, name, page);
+ return page.setRecords(userInfoByDistrictIds);
}
/**
@@ -630,6 +660,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);
@@ -657,6 +690,7 @@
/**
* 导入民警信息
+ *
* @param data
*/
@Override
@@ -665,21 +699,21 @@
for (PoliceUserExcel userExcel : data) {
// 查询用户
List<User> list = getUserListByPhoneOrAccount(userExcel.getPhone());
- if (list.size()>0){
+ if (list.size() > 0) {
User userInfo = list.get(0);
// 判断角色
- if (!userInfo.getRoleId().contains("1727864411451359233")){
+ if (!userInfo.getRoleId().contains("1727864411451359233")) {
userInfo.setRoleId(userInfo.getRoleId() + ",1727864411451359233");
}
// 更新机构
- setDeptId(userInfo,userExcel);
+ setDeptId(userInfo, userExcel);
// 更新
updateById(userInfo);
// 更新用户机构绑定
submitUserDept(userInfo);
// 更新社区民警绑定信息
updateGridBind(userInfo);
- }else {
+ } else {
// 插入用户角色
User user = new User();
user.setTenantId("000000");
@@ -690,7 +724,7 @@
user.setPhone(userExcel.getPhone());
user.setAccount(userExcel.getPhone());
// 更新机构
- setDeptId(user,userExcel);
+ setDeptId(user, userExcel);
// 设置初始密码
user.setPassword("123456");
// 保存
@@ -706,24 +740,24 @@
/**
* 设置机构
*/
- public void setDeptId(User user,PoliceUserExcel userExcel) {
+ 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());
+ queryWrapper.eq("is_deleted", 0)
+ .eq("community_code", userExcel.getCommunityCode())
+ .eq("pcs_name", userExcel.getPoliceStationName());
PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridService.getOne(queryWrapper);
- if (null!=policeAffairsGridEntity){
+ if (null != policeAffairsGridEntity) {
// 查询对应绑定的机构
QueryWrapper<Dept> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted",0)
- .eq("dept_nature",1)
- .eq("region_code",policeAffairsGridEntity.getJwGridCode());
+ 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()){
+ if (null != dept) {
+ if (null != user.getId()) {
DeptNotHandle(user, dept);
- }else {
+ } else {
user.setDeptId(dept.getId().toString());
}
}
@@ -732,26 +766,33 @@
/**
* 机构不为空时处理
+ *
* @param user
* @param dept
*/
public void DeptNotHandle(User user, Dept dept) {
// 更新设置机构
- if (!Strings.isBlank(user.getDeptId())){
+ if (!Strings.isBlank(user.getDeptId())) {
// 查询对应的派出所（去掉）
Dept deptPcs = SpringUtil.getBean(IDeptService.class).getDeptByDeptIds(user.getDeptId());
- if (null!=deptPcs) {
+ if (null != deptPcs) {
// 如果存在需要去掉派出所的机构id
List<String> list = new ArrayList<>(Arrays.asList(user.getDeptId().split(",")));
// 先删除派出所对应的机构ID
- if (list.contains(deptPcs.getId().toString())){
+ if (list.contains(deptPcs.getId().toString())) {
list.remove(deptPcs.getId().toString());
- user.setDeptId(String.join(",",list));
+ user.setDeptId(String.join(",", list));
}
- if (!user.getDeptId().contains(dept.getId().toString())) {
- user.setDeptId(user.getDeptId() + "," + dept.getId());
+ // 删完后可能就没了
+ 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 {
+ } else {
if (!user.getDeptId().contains(dept.getId().toString())) {
user.setDeptId(user.getDeptId() + "," + dept.getId());
}
@@ -761,23 +802,24 @@
/**
* 更新社区民警绑定信息
+ *
* @param userExcel
* @param user
*/
public void updateCommunityInfo(PoliceUserExcel userExcel, User user) {
QueryWrapper<CommunityEntity> wrapper = new QueryWrapper<>();
System.out.println("wrapper = " + userExcel.getCommunityCode());
- wrapper.eq("is_deleted",0).eq("code",userExcel.getCommunityCode());
+ wrapper.eq("is_deleted", 0).eq("code", userExcel.getCommunityCode());
CommunityEntity one = SpringUtil.getBean(ICommunityService.class).getOne(wrapper);
- if (null!=one){
+ if (null != one) {
String userId = user.getId().toString();
- if (!Strings.isBlank(one.getResPoliceUserId())){
- if(!one.getResPoliceUserId().contains(userId)) {
+ if (!Strings.isBlank(one.getResPoliceUserId())) {
+ if (!one.getResPoliceUserId().contains(userId)) {
one.setResPoliceUserId(one.getResPoliceUserId() + "," + userId);
// 更新
SpringUtil.getBean(ICommunityService.class).updateById(one);
}
- }else {
+ } else {
one.setResPoliceUserId(userId);
// 更新
SpringUtil.getBean(ICommunityService.class).updateById(one);
@@ -794,4 +836,27 @@
public List<User> getUserListByDeptIds(String receiveDept) {
return baseMapper.getUserListByDeptIds(receiveDept);
}
+
+ /**
+ * 通过经纬度查询最近的民警人员
+ *
+ * @param longitude
+ * @param latitude
+ * @return
+ */
+ @Override
+ public List<User> getPoliceUser(String longitude, String latitude, String houseCode) {
+ List<User> policeUser = baseMapper.getPoliceUser(longitude, latitude);
+ // 自动生成警单
+// if (StringUtils.isNotBlank(houseCode)) {
+// IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class);
+// PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity();
+// policeAlarmRecordsEntity.setHouseCode(houseCode);
+// if (policeUser != null && policeUser.size() == 1) {
+// policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId());
+// }
+// policeAlarmRecordsService.save(policeAlarmRecordsEntity);
+// }
+ return policeUser;
+ }
}
--
Gitblit v1.9.3