From 23f449af3694358ee39b2c4441ef6327376eeef4 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 11:25:03 +0800
Subject: [PATCH] e 呼即办新增地图选点地址及数据处理,住户数据处理

---
 src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 135c9dc..3c0870b 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -306,4 +306,52 @@
 		}
 
 	}
+
+	/**
+	 * 住户业主信息处理,将业主人员插入到用户表
+	 * @return
+	 */
+	@Override
+	public Object userHandle() {
+		// 查询所有未入库的业主信息
+		List<HouseholdEntity> householdEntityList = baseMapper.getNotInsertUserHousehold();
+		// 批量入用户库
+		for (HouseholdEntity householdEntity : householdEntityList) {
+			// 根据手机号查询对应账号和手机号的用户信息
+			List<User> userList = userService.getUserListByPhoneOrAccount(householdEntity.getPhoneNumber());
+			if (userList.size()>0){
+				User user = userList.get(0);
+				householdEntity.setAssociatedUserId(user.getId());
+				// 更新
+				updateById(householdEntity);
+				// 判断用户是否包含了居民角色,不包含则需更新
+				if (!user.getRoleId().contains("1717429059648606209")){
+					user.setRoleId(user.getRoleId() + ",1717429059648606209");
+					//更新
+					userService.updateById(user);
+				}
+			}else {
+				// 插入用户信息
+				//如果用户不存在,则新增一个用户
+				User newUser = new User();
+				newUser.setAccount(householdEntity.getPhoneNumber());
+				newUser.setPhone(householdEntity.getPhoneNumber());
+				newUser.setName(householdEntity.getName());
+				newUser.setRealName(householdEntity.getName());
+				// 社区群众部门
+				newUser.setDeptId("1727979636479037441");
+				// 目前暂定居民角色,
+				newUser.setRoleId("1717429059648606209");
+				//默认密码为 123456
+				newUser.setPassword("123456");
+				// 用户新增
+				boolean submit = userService.submit(newUser);
+				// 更新绑定用户信息
+				householdEntity.setAssociatedUserId(newUser.getId());
+				// 更新
+				updateById(householdEntity);
+			}
+		}
+		return null;
+	}
 }

--
Gitblit v1.9.3