From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 200 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 194 insertions(+), 6 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 6e95565..6fa8188 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
@@ -19,10 +19,12 @@
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.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,13 +43,20 @@
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.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;
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;
@@ -144,7 +153,7 @@
@Override
public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
- if (null == deptId && !AuthUtil.isAdministrator()){
+ if (null == deptId && !AuthUtil.isAdministrator()) {
deptId = Long.parseLong(AuthUtil.getDeptId());
}
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
@@ -434,16 +443,195 @@
/**
* 按条件查询用户信息
+ *
* @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);
}
return baseMapper.getUserListByParam(user);
}
+
+ /**
+ * 通过小区Id搜索用户
+ *
+ * @param districtId
+ * @return
+ */
+ @Override
+ public List<User> searchUserByDistrictId(String districtId) {
+ return baseMapper.searchUserByDistrictId(districtId);
+ }
+
+ /**
+ * 根据手机号查询对应账号和手机号的用户信息
+ *
+ * @param phoneNumber
+ * @return
+ */
+ @Override
+ public List<User> getUserListByPhoneOrAccount(String phoneNumber) {
+ return baseMapper.getUserListByPhoneOrAccount(phoneNumber);
+ }
+
+ /**
+ * 获取用户信息
+ *
+ * @return
+ */
+ @Override
+ public UserDetailVO getUserInfo(Long userId) {
+ // 根据用户id 获取用户详情信息
+ UserDetailVO userVO = baseMapper.getUserInfo(userId);
+ 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);
+ }
+ }
+
+ @Override
+ public List<UserEntity> getUserInfoByDistrictId(String districtId, String building) {
+ return baseMapper.getUserInfoByDistrictId(districtId, building);
+ }
+
+ /**
+ * 处理漏绑定的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) {
+ // 查询物业公司，获取物业公司的机构
+ 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");
+ // 更新
+ updateById(userInfo);
+ // 更新社区民警绑定信息
+ updateCommunityInfo(userExcel,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());
+ // 查询机构
+ 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());
+ }
+ user.setPassword("123456");
+ // 保存
+ submit(user);
+ // 更新社区民警绑定信息
+ updateCommunityInfo(userExcel,user);
+ }
+ }
+ }
+
+ /**
+ * 更新社区民警绑定信息
+ * @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