From ebd41b7b2e44dc8b96f177d7bf88d2f5f997b75c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 28 Apr 2024 14:30:07 +0800
Subject: [PATCH] 民警导入修改
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 168 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 93 insertions(+), 75 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 d553a18..0776471 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
@@ -25,6 +25,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
import org.apache.logging.log4j.util.Strings;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
import org.springblade.common.cache.DictCache;
@@ -50,9 +51,11 @@
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;
@@ -82,6 +85,7 @@
private final IUserDeptService userDeptService;
private final IUserOauthService userOauthService;
private final IRoleService roleService;
+ private final IDeptService deptService;
private final BladeTenantProperties tenantProperties;
private final IPoliceAffairsGridService policeAffairsGridService;
@@ -113,8 +117,6 @@
throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
}
boolean save = save(user);
- // 更新警格或网格的绑定
- updateGridBind(user);
// 返回
return save && submitUserDept(user);
}
@@ -140,7 +142,7 @@
user.setPassword(null);
boolean b = updateById(user);
// 更新警格或网格的绑定
- updateGridBind(user);
+// updateGridBind(user);
return b;
}
@@ -271,6 +273,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);
@@ -311,6 +337,36 @@
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;
@@ -444,8 +500,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())));
@@ -602,11 +662,12 @@
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);
}
}
@@ -622,20 +683,7 @@
return baseMapper.getUserInfoByDistrictId(districtId, building);
}
- /**
- * 通过小区id查询用户
- *
- * @param districtIds
- * @param building
- * @param unit
- * @param name
- * @return
- */
- @Override
- public IPage<User> getUserInfoByDistrictIds(String districtIds, String building, String unit, String name, IPage<User> page) {
- List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
- return page.setRecords(baseMapper.getUserInfoByDistrictIds(list, building, unit, name, page));
- }
+
/**
* 处理漏绑定的user_dept
@@ -697,20 +745,21 @@
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");
}
+ // 设置性别
+ setSex(userInfo,userExcel);
// 更新机构
setDeptId(userInfo, userExcel);
// 更新
updateById(userInfo);
// 更新用户机构绑定
submitUserDept(userInfo);
- // 更新社区民警绑定信息
- updateGridBind(userInfo);
} else {
// 插入用户角色
User user = new User();
@@ -721,6 +770,8 @@
user.setRealName(userExcel.getRealName());
user.setPhone(userExcel.getPhone());
user.setAccount(userExcel.getPhone());
+ // 设置性别
+ setSex(user,userExcel);
// 更新机构
setDeptId(user, userExcel);
// 设置初始密码
@@ -729,9 +780,21 @@
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);
}
}
@@ -740,26 +803,8 @@
*/
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);
}
/**
@@ -794,33 +839,6 @@
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);
}
}
}
--
Gitblit v1.9.3