From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 312 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 210 insertions(+), 102 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 259c52c..7688fe5 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,15 +17,17 @@
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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springblade.common.cache.DictCache;
import org.springblade.common.cache.ParamCache;
import org.springblade.common.cache.SysCache;
@@ -33,6 +35,7 @@
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.TenantConstant;
import org.springblade.common.enums.DictEnum;
+import org.springblade.common.utils.SpinLockUtil;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition;
@@ -44,8 +47,6 @@
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;
@@ -62,6 +63,7 @@
import org.springblade.modules.system.vo.UserDetailVO;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.system.wrapper.UserWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -77,13 +79,21 @@
@Service
@AllArgsConstructor
public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implements IUserService {
+
+ private static final Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
+
private static final String GUEST_NAME = "guest";
private final IUserDeptService userDeptService;
private final IUserOauthService userOauthService;
private final IRoleService roleService;
+ private final IDeptService deptService;
private final BladeTenantProperties tenantProperties;
private final IPoliceAffairsGridService policeAffairsGridService;
+
+ @Autowired
+ private SpinLockUtil spinLockUtil;
+
@Override
@Transactional(rollbackFor = Exception.class)
@@ -113,8 +123,6 @@
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
boolean save = save(user);
- // 更新警格或网格的绑定
- updateGridBind(user);
// 返回
return save && submitUserDept(user);
}
@@ -140,18 +148,19 @@
user.setPassword(null);
boolean b = updateById(user);
// 更新警格或网格的绑定
- updateGridBind(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());
+ queryWrapper.eq("is_deleted", 0).like("police_user_id", user.getId());
// 删除掉之前已绑定的
List<PoliceAffairsGridEntity> list = SpringUtil.getBean(IPoliceAffairsGridService.class).list(queryWrapper);
// 遍历
@@ -159,7 +168,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);
@@ -169,15 +178,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());
@@ -186,7 +195,7 @@
// 更新
SpringUtil.getBean(IPoliceAffairsGridService.class).updateById(policeAffairsGridEntity);
}
- }else {
+ } else {
policeAffairsGridEntity.setPoliceUserId(user.getId().toString());
// 解决更新报错
policeAffairsGridEntity.setGeom(null);
@@ -199,18 +208,34 @@
}
private boolean submitUserDept(User user) {
- List<Long> deptIdList = Func.toLongList(user.getDeptId());
- List<UserDept> userDeptList = new ArrayList<>();
- deptIdList.forEach(deptId -> {
- UserDept userDept = new UserDept();
- userDept.setUserId(user.getId());
- userDept.setDeptId(deptId);
- userDeptList.add(userDept);
- });
- userDeptService.remove(Wrappers.<UserDept>update().lambda().eq(UserDept::getUserId, user.getId()));
- boolean b = userDeptService.saveBatch(userDeptList);
- return b;
+ try {
+ // 加锁
+ boolean isLock = spinLockUtil.tryLock(user.getId().toString());
+ boolean result = false;
+ List<Long> deptIdList = Func.toLongList(user.getDeptId());
+ List<UserDept> userDeptList = new ArrayList<>();
+ deptIdList.forEach(deptId -> {
+ UserDept userDept = new UserDept();
+ userDept.setUserId(user.getId());
+ userDept.setDeptId(deptId);
+ userDeptList.add(userDept);
+ });
+ // 是否加锁成功
+ logger.info("是否加锁成功：" + isLock);
+ if (isLock) {
+ // userDeptService.remove(Wrappers.<UserDept>update().lambda().eq(UserDept::getUserId, user.getId()));
+ result = userDeptService.saveBatch(userDeptList);
+ }
+ // 释放锁
+ spinLockUtil.unlock(user.getId().toString());
+ return result;
+ } catch (Exception e) {
+ // 释放锁
+ spinLockUtil.unlock(user.getId().toString());
+ throw new RuntimeException(e);
+ }
}
+
@Override
public IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId) {
@@ -270,6 +295,30 @@
return buildUserInfo(user);
}
+ /**
+ * 用户信息
+ *
+ * @param tenantId
+ * @param account
+ * @param password
+ * @param type 登录类型 2：pc 3：app
+ * @return
+ */
+ @Override
+ public UserInfo userInfo(String tenantId, String account, String password, Integer type) {
+ User user = baseMapper.getUser(tenantId, account, password);
+ return buildUserInfo(user, type);
+ }
+
+ /**
+ * 用户信息
+ *
+ * @param tenantId
+ * @param account
+ * @param password
+ * @param userEnum
+ * @return
+ */
@Override
public UserInfo userInfo(String tenantId, String account, String password, UserEnum userEnum) {
User user = baseMapper.getUser(tenantId, account, password);
@@ -310,6 +359,35 @@
if (ObjectUtil.isNotEmpty(query)) {
detail.set("ext", query.getUserExt());
}
+ }
+ userInfo.setDetail(detail);
+ return userInfo;
+ }
+
+ /**
+ * @param user
+ * @param type 登录类型 2：pc 3：app
+ * @return
+ */
+ private UserInfo buildUserInfo(User user, Integer type) {
+ if (ObjectUtil.isEmpty(user)) {
+ return null;
+ }
+ UserInfo userInfo = new UserInfo();
+ userInfo.setUser(user);
+ if (Func.isNotEmpty(user)) {
+ // 判断登录类型设置对应的角色id
+ user.setRoleId(Strings.join(roleService.getRoleIdStrByRoleIdAndType(user.getRoleId(), type), ','));
+ // 设置角色别名
+ List<String> roleAlias = roleService.getRoleAliases(user.getRoleId());
+ userInfo.setRoles(roleAlias);
+ }
+ // 根据每个用户平台，建立对应的detail表，通过查询将结果集写入到detail字段
+ Kv detail = Kv.create().set("type", null);
+ UserOther userOther = new UserOther();
+ UserOther query = userOther.selectOne(Wrappers.<UserOther>lambdaQuery().eq(UserOther::getUserId, user.getId()));
+ if (ObjectUtil.isNotEmpty(query)) {
+ detail.set("ext", query.getUserExt());
}
userInfo.setDetail(detail);
return userInfo;
@@ -373,7 +451,7 @@
throw new ServiceException("不能删除本账号!");
}
boolean deleteLogic = deleteLogic(Func.toLongList(userIds));
- if (deleteLogic){
+ if (deleteLogic) {
// 删除警格绑定
removePoliceGridBind(userIds);
}
@@ -382,6 +460,7 @@
/**
* 删除警格绑定
+ *
* @param userIds
*/
public void removePoliceGridBind(String userIds) {
@@ -389,10 +468,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(",")));
@@ -442,8 +521,12 @@
}
@Override
- public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
- List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
+ public List<UserExcel> exportUser(Wrapper<User> queryWrapper, String deptId) {
+ if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
+ deptId = AuthUtil.getDeptId();
+ }
+ List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ List<UserExcel> userList = baseMapper.exportUser(queryWrapper, deptIdList);
userList.forEach(user -> {
user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
@@ -474,6 +557,28 @@
userOauth.setTenantId(user.getTenantId());
boolean oauthTemp = userOauthService.updateById(userOauth);
return (userTemp && oauthTemp);
+ }
+
+ @Override
+ public boolean registerUser(UserVO user) {
+ if (StringUtils.isEmpty(user.getAccount())) {
+ throw new ServiceException("账号不能为空!");
+ }
+ if (StringUtils.isEmpty(user.getPassword())) {
+ throw new ServiceException("密码不能为空!");
+ }
+ if (!StringUtils.equals(user.getPassword(), user.getPassword2())) {
+ throw new ServiceException("两次的密码不一致!");
+ }
+ long count = count(Wrappers.<User>lambdaQuery().eq(User::getAccount, user.getAccount()));
+ if (count > 0) {
+ throw new ServiceException("改账号已存在，请更换其他账号!");
+ }
+
+ user.setPassword(DigestUtil.encrypt(user.getPassword()));
+ user.setRoleId("1717429059648606209");
+ boolean oauthTemp = save(user);
+ return (oauthTemp);
}
@Override
@@ -600,24 +705,27 @@
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);
+ IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
+ return bean1.getDistictUserByCode(houseCode);
+ // 通过huosecode 查询物业工作人员
+// 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);
}
- @Override
- public List<User> getUserInfoByDistrictIds(String districtIds) {
- List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
- return baseMapper.getUserInfoByDistrictIds(list);
- }
/**
* 处理漏绑定的user_dept
@@ -640,6 +748,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);
@@ -667,6 +778,7 @@
/**
* 导入民警信息
+ *
* @param data
*/
@Override
@@ -675,21 +787,22 @@
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");
}
+ // 设置性别
+ setSex(userInfo, userExcel);
// 更新机构
- setDeptId(userInfo,userExcel);
+ setDeptId(userInfo, userExcel);
// 更新
updateById(userInfo);
// 更新用户机构绑定
submitUserDept(userInfo);
- // 更新社区民警绑定信息
- updateGridBind(userInfo);
- }else {
+ } else {
// 插入用户角色
User user = new User();
user.setTenantId("000000");
@@ -699,104 +812,76 @@
user.setRealName(userExcel.getRealName());
user.setPhone(userExcel.getPhone());
user.setAccount(userExcel.getPhone());
+ // 设置性别
+ setSex(user, userExcel);
// 更新机构
- setDeptId(user,userExcel);
+ setDeptId(user, userExcel);
// 设置初始密码
user.setPassword("123456");
// 保存
submit(user);
// 更新用户机构绑定
submitUserDept(user);
- // 更新社区民警绑定信息
- updateGridBind(user);
}
+ }
+ }
+
+ /**
+ * 设置性别
+ *
+ * @param user
+ * @param userExcel
+ */
+ private void setSex(User user, PoliceUserExcel userExcel) {
+ if (userExcel.getSex().contains("男")) {
+ user.setSex(1);
+ }
+ if (userExcel.getSex().contains("女")) {
+ user.setSex(2);
}
}
/**
* 设置机构
*/
- 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());
- 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());
- }
- }
- }
+ String deptIds = deptService.getDeptIds("000000", userExcel.getDeptName());
+ user.setDeptId(deptIds);
}
/**
* 机构不为空时处理
+ *
* @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 (!Strings.isBlank(user.getDeptId())) {
if (!user.getDeptId().contains(dept.getId().toString())) {
user.setDeptId(user.getDeptId() + "," + dept.getId());
}
- }else {
+ } else {
// 删完后的
user.setDeptId(dept.getId().toString());
}
- }else {
+ } 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);
}
}
}
@@ -810,4 +895,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