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 | 411 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 394 insertions(+), 17 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 b9b5b09..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,16 @@
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;
import org.springblade.common.cache.ParamCache;
import org.springblade.common.cache.SysCache;
@@ -41,23 +45,28 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.*;
import org.springblade.modules.auth.enums.UserEnum;
+import org.springblade.modules.community.entity.CommunityEntity;
+import org.springblade.modules.community.service.ICommunityService;
+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.IPropertyCompanyService;
import org.springblade.modules.system.entity.*;
+import org.springblade.modules.system.excel.PoliceUserExcel;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.mapper.UserMapper;
-import org.springblade.modules.system.service.IRoleService;
-import org.springblade.modules.system.service.IUserDeptService;
-import org.springblade.modules.system.service.IUserOauthService;
-import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.*;
import org.springblade.modules.system.vo.UserDetailVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
@@ -75,6 +84,7 @@
private final IUserOauthService userOauthService;
private final IRoleService roleService;
private final BladeTenantProperties tenantProperties;
+ private final IPoliceAffairsGridService policeAffairsGridService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -103,7 +113,11 @@
if (userCount > 0L && Func.isEmpty(user.getId())) {
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
- return save(user) && submitUserDept(user);
+ boolean save = save(user);
+ // 更新警格或网格的绑定
+ updateGridBind(user);
+ // 返回
+ return save && submitUserDept(user);
}
@Override
@@ -126,7 +140,64 @@
public boolean updateUserInfo(User user) {
user.setPassword(null);
boolean b = updateById(user);
+ // 更新警格或网格的绑定
+ updateGridBind(user);
return b;
+ }
+
+ /**
+ * 更新警格或网格的绑定
+ *
+ * @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 = new ArrayList<>(Arrays.asList(user.getDeptId().split(",")));
+ for (String deptId : deptIds) {
+ // 查询对应的机构
+ Dept dept = SpringUtil.getBean(IDeptService.class).getById(deptId);
+ if (null != dept.getDeptNature()
+ && !Strings.isBlank(dept.getRegionCode())
+ && dept.getDeptNature() == 1
+ ) {
+ QueryWrapper<PoliceAffairsGridEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted", 0).eq("jw_grid_code", dept.getRegionCode());
+ PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridService.getOne(wrapper);
+ // 更新
+ if (null != policeAffairsGridEntity) {
+ if (!Strings.isBlank(policeAffairsGridEntity.getPoliceUserId())) {
+ if (!policeAffairsGridEntity.getPoliceUserId().contains(user.getId().toString())) {
+ policeAffairsGridEntity.setPoliceUserId(policeAffairsGridEntity.getPoliceUserId() + "," + user.getId());
+ // 解决更新报错
+ policeAffairsGridEntity.setGeom(null);
+ // 更新
+ SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
+ }
+ } else {
+ policeAffairsGridEntity.setPoliceUserId(user.getId().toString());
+ // 解决更新报错
+ policeAffairsGridEntity.setGeom(null);
+ // 更新
+ SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
+ }
+ }
+ }
+ }
}
private boolean submitUserDept(User user) {
@@ -144,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));
@@ -303,7 +374,40 @@
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
@@ -435,12 +539,13 @@
/**
* 按条件查询用户信息
+ *
* @param user
* @return
*/
@Override
public List<UserVO> getUserListByParam(UserVO user) {
- if (!Strings.isBlank(user.getRoleName())){
+ if (!Strings.isBlank(user.getRoleName())) {
// 查询对应的角色id
String roleIds = roleService.getRoleIds("000000", user.getRoleName());
user.setRoleId(roleIds);
@@ -450,36 +555,308 @@
/**
* 通过小区Id搜索用户
+ *
* @param districtId
* @return
*/
@Override
public List<User> searchUserByDistrictId(String districtId) {
- return baseMapper.searchUserByDistrictId( districtId);
+ return baseMapper.searchUserByDistrictId(districtId);
}
/**
* 根据手机号查询对应账号和手机号的用户信息
+ *
* @param phoneNumber
* @return
*/
@Override
public List<User> getUserListByPhoneOrAccount(String phoneNumber) {
- return baseMapper.getUserListByPhoneOrAccount( phoneNumber);
+ return baseMapper.getUserListByPhoneOrAccount(phoneNumber);
}
/**
* 获取用户信息
+ *
* @return
*/
@Override
public UserDetailVO getUserInfo(Long userId) {
// 根据用户id 获取用户详情信息
UserDetailVO userVO = baseMapper.getUserInfo(userId);
- if (null!=userVO){
+ if (null != userVO) {
+ // 设置机构
userVO.setPassword(null);
}
// 返回
return userVO;
}
+
+ @Override
+ public UserVO getuserById(Long id) {
+ return baseMapper.searchUserById(id);
+ }
+
+ @Override
+ public List<UserEntity> getUserInfoByCode(String houseCode, String type) {
+ if (type.equals("0")) {
+ IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
+ return bean.getGridManByCode(houseCode);
+ } else {
+// 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);
+ }
+
+ /**
+ * 处理漏绑定的user_dept
+ */
+ @Override
+ public Object handleUserDept() {
+ // 查询没有匹配的数据
+ List<User> list = baseMapper.getNotBindUserDept();
+ // 遍历处理
+ for (User user : list) {
+ UserDept userDept = new UserDept();
+ userDept.setUserId(user.getId());
+ userDept.setDeptId(Long.parseLong(user.getDeptId()));
+ // 保存
+ userDeptService.save(userDept);
+ }
+ return null;
+ }
+
+ @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);
+ }
+
+ @Override
+ public Object handleUser() {
+ List<User> list = list(Wrappers.<User>lambdaQuery()
+ .eq(User::getDeptId, "1727979636479037441")
+ .eq(User::getRoleId, "1717429059648606209"));
+ IHouseholdService bean = SpringUtil.getBean(IHouseholdService.class);
+ int a = 0;
+ for (User user : list) {
+ System.out.println("查詢處理啊的人：" + user.getId());
+ HouseholdEntity one = bean.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
+ .eq(HouseholdEntity::getAssociatedUserId, user.getId())
+ .eq(HouseholdEntity::getIsDeleted, 0));
+ if (one != null) {
+ a++;
+ }
+ System.out.println("查詢處理啊的人：" + a);
+ }
+ return null;
+ }
+
+ /**
+ * 导入民警信息
+ *
+ * @param data
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void importPoliceUser(List<PoliceUserExcel> data) {
+ for (PoliceUserExcel userExcel : data) {
+ // 查询用户
+ List<User> list = getUserListByPhoneOrAccount(userExcel.getPhone());
+ if (list.size() > 0) {
+ User userInfo = list.get(0);
+ // 判断角色
+ if (!userInfo.getRoleId().contains("1727864411451359233")) {
+ userInfo.setRoleId(userInfo.getRoleId() + ",1727864411451359233");
+ }
+ // 更新机构
+ setDeptId(userInfo, userExcel);
+ // 更新
+ updateById(userInfo);
+ // 更新用户机构绑定
+ submitUserDept(userInfo);
+ // 更新社区民警绑定信息
+ updateGridBind(userInfo);
+ } else {
+ // 插入用户角色
+ User user = new User();
+ user.setTenantId("000000");
+ user.setUserType(1);
+ user.setRoleId("1727864411451359233");
+ user.setName(userExcel.getRealName());
+ user.setRealName(userExcel.getRealName());
+ user.setPhone(userExcel.getPhone());
+ user.setAccount(userExcel.getPhone());
+ // 更新机构
+ setDeptId(user, userExcel);
+ // 设置初始密码
+ user.setPassword("123456");
+ // 保存
+ submit(user);
+ // 更新用户机构绑定
+ submitUserDept(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());
+ }
+ }
+ }
+ }
+
+ /**
+ * 更新社区民警绑定信息
+ *
+ * @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());
+ CommunityEntity one = SpringUtil.getBean(ICommunityService.class).getOne(wrapper);
+ if (null != one) {
+ String userId = user.getId().toString();
+ if (!Strings.isBlank(one.getResPoliceUserId())) {
+ if (!one.getResPoliceUserId().contains(userId)) {
+ one.setResPoliceUserId(one.getResPoliceUserId() + "," + userId);
+ // 更新
+ SpringUtil.getBean(ICommunityService.class).updateById(one);
+ }
+ } else {
+ one.setResPoliceUserId(userId);
+ // 更新
+ SpringUtil.getBean(ICommunityService.class).updateById(one);
+ }
+ }
+ }
+
+ @Override
+ public List<User> getUserListByIds(String receiveUser) {
+ return baseMapper.selectBatchIds(Arrays.asList(receiveUser.split(",")));
+ }
+
+ @Override
+ 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