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/house/service/impl/HouseholdServiceImpl.java | 290 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 245 insertions(+), 45 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 1c02b88..90d0d88 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
@@ -19,17 +19,27 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.SysCache;
+import org.springblade.common.node.TreeIntegerNode;
import org.springblade.common.node.TreeStringNode;
+import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.modules.grid.service.IGridService;
+import org.springblade.core.tool.utils.Func;
import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.excel.HouseHoldExcel;
import org.springblade.modules.house.mapper.HouseholdMapper;
import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.house.service.IUserHouseLabelService;
+import org.springblade.modules.house.vo.HouseholdLabelVO;
import org.springblade.modules.house.vo.HouseholdOtherVO;
import org.springblade.modules.house.vo.HouseholdVO;
+import org.springblade.modules.place.entity.PlaceEntity;
+import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.entity.User;
@@ -42,6 +52,7 @@
import org.springframework.util.StopWatch;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 住户 服务实现类
@@ -53,7 +64,7 @@
public class HouseholdServiceImpl extends ServiceImpl<HouseholdMapper, HouseholdEntity> implements IHouseholdService {
@Autowired
- private IGridService gridService;
+ private IUserHouseLabelService userHouseLabelService;
@Autowired
private IDictBizService dictBizService;
@@ -62,28 +73,15 @@
private IUserService userService;
@Autowired
- private IDeptService deptService;
+ private IPlaceService placeService;
@Override
public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
StopWatch stopWatch = new StopWatch();
stopWatch.start();
-// doInsert();
-// 执行业务等
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null!=dept){
- household.setRegionCode(dept.getRegionCode());
- }
- List<HouseholdVO> householdVOS = baseMapper.selectHouseholdPage(page, household);
- // 遍历
- // for (HouseholdVO householdVO : householdVOS) {
- // // 设置对应的网格名称
- // GridVO gridVO = gridService.getGridDetailByHouseCode(householdVO.getHouseCode());
- // if (null!= gridVO){
- // householdVO.setGridName(gridVO.getGridName());
- // }
- // }
- // 返回
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ List<HouseholdVO> householdVOS = baseMapper.selectHouseholdPage(page, household,regionChildCodesList,isAdministrator);
stopWatch.stop();
System.out.println("selectHouseholdPage:" + stopWatch.getTotalTimeMillis());
return page.setRecords(householdVOS);
@@ -143,23 +141,22 @@
* @return
*/
@Override
- public boolean saveOrUpdateHousehold(HouseholdEntity household) {
- // 判断添加人是否房屋业主
-// Long count = count(Wrappers.<HouseholdEntity>lambdaQuery()
-// .eq(HouseholdEntity::getHouseCode, household.getHouseCode())
-// .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
-// .eq(HouseholdEntity::getRelationship, 1));
-// if (count == 0) {
-// return false;
-// }
+ @Transactional(rollbackFor = Exception.class)
+ public boolean saveOrUpdateHousehold(HouseholdVO household) {
boolean flag = false;
household.setUpdateTime(new Date());
household.setUpdateUser(AuthUtil.getUserId());
+ if (!Strings.isBlank(household.getRoleName()) && household.getRoleName().equals("居民")){
+ // 待审核
+ household.setConfirmFlag(0);
+ }
if (null != household.getId()) {
// 更新
flag = updateById(household);
// 更新用户信息
updateUserInfo(household);
+ // 更新标签信息
+ updateUserLabelInfo(household);
} else {
// 新增
household.setCreateTime(new Date());
@@ -167,8 +164,28 @@
flag = save(household);
// 更新用户信息
updateUserInfo(household);
+ // 更新标签信息
+ updateUserLabelInfo(household);
}
return flag;
+ }
+
+ /**
+ * 更新用户标签信息
+ * @param household
+ */
+ public void updateUserLabelInfo(HouseholdVO household) {
+ if (household.getHouseholdLabelList().size()>0){
+ List<HouseholdLabelVO> householdLabelList = household.getHouseholdLabelList();
+ for (HouseholdLabelVO householdLabelVO : householdLabelList) {
+ if (!Strings.isBlank(household.getHouseCode())) {
+ householdLabelVO.setHouseCode(household.getHouseCode());
+ }
+ householdLabelVO.setHouseholdId(household.getId());
+ // 先删除对应绑定的信息
+ userHouseLabelService.saveOrUpdateHouseholdLabel(householdLabelVO);
+ }
+ }
}
/**
@@ -176,25 +193,11 @@
* @param household
*/
public void updateUserInfo(HouseholdEntity household) {
- // 判断用户是否为业主，如果是业主，判断该房屋是否已有业主，如果有则提示已有业主，无法设置为业主，不是业主则不操作
+ // 判断用户是否为业主，如果是业主，则新增
if (null!=household.getRelationship() && household.getRelationship()==1){
// 如果为业主
- // 查询当前房屋是否已有业主
- QueryWrapper<HouseholdEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0)
- .eq("house_code",household.getHouseCode())
- .eq("relationship",1);
- List<HouseholdEntity> list = list(queryWrapper);
- if (list.size()==0){
- // 新增用户
- bindUserHandle(household);
- }else {
- HouseholdEntity householdEntity = list.get(0);
- if (null == householdEntity.getAssociatedUserId()){
- // 新增用户
- bindUserHandle(household);
- }
- }
+ // 新增用户
+ bindUserHandle(household);
}
}
@@ -209,6 +212,12 @@
User userParams = new User();
userParams.setPhone(householdEntity.getPhoneNumber());
User user = userService.getOne(Condition.getQueryWrapper(userParams));
+ if (null==user) {
+ User userParams1 = new User();
+ userParams1.setAccount(householdEntity.getPhoneNumber());
+ userParams1.setIsDeleted(0);
+ user = userService.getOne(Condition.getQueryWrapper(userParams1));
+ }
if (null!=user) {
//如果用户存在，则该用户id绑定场所
householdEntity.setAssociatedUserId(user.getId());
@@ -320,4 +329,195 @@
}
}
+
+ /**
+ * 住户业主信息处理，将业主人员插入到用户表
+ * @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;
+ }
+
+ /**
+ * 住户 删除
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean removeHousehold(String ids) {
+ List<Long> idList = Func.toLongList(ids);
+ // 同时删除当前住户对应的标签
+ removeHouseholdLabel(idList);
+ // 同时删除对应的用户信息
+ removeHouseholdUser(idList);
+ // 删除住户信息
+ boolean removeByIds = removeByIds(idList);
+ // 返回
+ return removeByIds;
+ }
+
+
+ /**
+ * 同时删除对应的用户信息
+ * @param idList
+ */
+ public void removeHouseholdUser(List<Long> idList) {
+ for (Long id : idList) {
+ HouseholdEntity householdEntity = getById(id);
+ // 如果是业主
+ if (householdEntity.getRelationship()==1){
+ // 查询对应的用户
+ User user = userService.getById(householdEntity.getAssociatedUserId());
+ // 判断是否还绑定其他的房屋，如果有，则不操作用户
+ QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0).eq("associated_user_id",user.getId());
+ List<HouseholdEntity> householdEntityList = list(wrapper);
+ if (householdEntityList.size()==1){
+ // 判断角色
+ if (!Strings.isBlank(user.getRoleId())){
+ List<String> stringList = Arrays.asList(user.getRoleId().split(","));
+ // 查询场所
+ QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0).eq("principal_user_id",user.getId());
+ List<PlaceEntity> placeEntityList = placeService.list(queryWrapper);
+ // 即没有房屋和场所了就删除对应的居民角色
+ if (placeEntityList.size()==0) {
+ // 查看当前用户的角色是否只有一个
+ if (stringList.size() > 1) {
+ // 查询是否对应有场所负责人，如果有则不删除，如果没有则删除对应的角色
+ List<String> arrayList = new ArrayList<>();
+ for (String roleId : stringList) {
+ if (!roleId.equals("1717429059648606209")) {
+ arrayList.add(roleId);
+ }
+ }
+ user.setRoleId(StringUtils.join(arrayList, ","));
+ // 更新用户
+ userService.updateById(user);
+ } else {
+ // 删除当前用户
+ userService.removeById(user.getId());
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * 删除住户标签信息
+ * @param idList
+ */
+ public void removeHouseholdLabel(List<Long> idList) {
+ for (Long id : idList) {
+ QueryWrapper<UserHouseLabelEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("household_id",id);
+ userHouseLabelService.remove(wrapper);
+ }
+ }
+
+ @Override
+ public List<HouseholdVO> getAllHouseHold(HouseholdVO household) {
+ return baseMapper.getAllHouseHold(household);
+ }
+
+ /**
+ * 住户列表查询
+ * @param household
+ * @return
+ */
+ @Override
+ public List<HouseholdVO> selectHouseholdList(HouseholdVO household) {
+ List<HouseholdVO> householdVOS = baseMapper.selectHouseholdList(household);
+ // 遍历
+ for (HouseholdVO householdVO : householdVOS) {
+ if (householdVO.getHouseholdLabelList().size() > 0) {
+ List<String> labelNameList = householdVO.getHouseholdLabelList().stream().map(householdLabelVO -> householdLabelVO.getLabelName())
+ .collect(Collectors.toList());
+ householdVO.setLabelName(String.join(",", labelNameList));
+ }
+ }
+ // 返回
+ return householdVOS;
+ }
+
+ @Override
+ public IPage<HouseholdVO> getKeynotePersonnelPage(IPage<HouseholdVO> page, HouseholdVO household) {
+ // StopWatch stopWatch = new StopWatch();
+ // stopWatch.start();
+ // Dept dept = deptService.getById(AuthUtil.getDeptId());
+ // if (null!=dept){
+ // household.setRegionCode(dept.getRegionCode());
+ // }
+ List<HouseholdVO> householdVOS = baseMapper.getKeynotePersonnelPage(page, household);
+ // stopWatch.stop();
+ // System.out.println("selectHouseholdPage:" + stopWatch.getTotalTimeMillis());
+ return page.setRecords(householdVOS);
+ }
+
+ /**
+ * 根据人员标签编号集合查询对应的住户（按颜色区分近多少天没有发过任务的住户）
+ * @param list
+ * @return
+ */
+ @Override
+ public List<HouseholdVO> getHouseholdListByParam(List<Integer> list) {
+ return baseMapper.getHouseholdListByParam(list);
+ }
+
+ @Override
+ public List<TreeIntegerNode> getlabelStatistics(HouseholdVO household) {
+ Map<Integer, TreeIntegerNode> labelTreeList = baseMapper.getlabelStatistics(household);
+ List<TreeIntegerNode> nodeTree = NodeTreeUtil.getNodeTree(labelTreeList);
+ nodeTree.forEach(node -> recursion(node));
+ return nodeTree;
+ }
+
+ private void recursion(TreeIntegerNode node) {
+ if (node.getChildren() != null && node.getChildren().size() > 0) {
+ node.getChildren().forEach(node2 -> recursion(node2));
+ } else {
+ node.setChildren(null);
+ }
+ }
}
--
Gitblit v1.9.3