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/house/service/impl/HouseRentalServiceImpl.java | 365 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 288 insertions(+), 77 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
index 327d8b7..456d393 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
@@ -17,25 +17,39 @@
package org.springblade.modules.house.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.constant.CommonConstant;
+import org.springblade.common.param.CommonParamSet;
+import org.springblade.common.utils.SpringUtils;
+import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.house.entity.HouseRentalEntity;
-import org.springblade.modules.house.entity.HouseTenantEntity;
-import org.springblade.modules.house.service.IHouseTenantService;
+import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.excel.HouseRentalExcel;
+import org.springblade.modules.house.mapper.HouseRentalMapper;
+import org.springblade.modules.house.service.IHouseRentalService;
+import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseRentalStatistics;
import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.house.vo.HouseRentalVO;
-import org.springblade.modules.house.mapper.HouseRentalMapper;
-import org.springblade.modules.house.service.IHouseRentalService;
-import org.springblade.modules.house.vo.HouseTenantVO;
-import org.springblade.modules.house.excel.HouseRentalExcel;
+import org.springblade.modules.house.vo.HouseholdVO;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.entity.UserInfo;
+import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.vo.UserDetailVO;
+import org.springblade.modules.system.vo.UserVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -50,36 +64,54 @@
public class HouseRentalServiceImpl extends ServiceImpl<HouseRentalMapper, HouseRentalEntity> implements IHouseRentalService {
@Autowired
- private IHouseTenantService houseTenantService;
+ private IHouseholdService iHouseholdService;
+
@Autowired
private IGridService gridService;
/**
* 自定义分页查询
+ *
* @param page
* @param houseRental
* @return
*/
@Override
public IPage<HouseRentalTenantVO> selectHouseRentalPage(IPage<HouseRentalTenantVO> page, HouseRentalTenantVO houseRental) {
- List<String> list = new ArrayList<>();
- if (null!=houseRental.getRoleName() && !houseRental.getRoleName().equals("")){
- if (houseRental.getRoleName().equals("网格员")){
- // 查询对应的房屋地址code
- list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
- }
- }
- if (null!=houseRental.getAuditStatus()){
- if (houseRental.getAuditStatus()==0){
+ if (null != houseRental.getAuditStatus()) {
+ if (houseRental.getAuditStatus() == 0) {
houseRental.setAuditStatus(2);
}
}
- return page.setRecords(baseMapper.selectHouseRentalPage(page, houseRental,list));
+ CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(HouseRentalTenantVO.class, houseRental);
+ List<HouseRentalTenantVO> houseRentalTenantVOS = baseMapper.selectHouseRentalPage(page, houseRental,
+ commonParamSet.getGridCodeList(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator());
+ for (HouseRentalTenantVO houseRentalTenantVO : houseRentalTenantVOS) {
+ if (houseRentalTenantVO.getStatus().equals(1)) {
+ houseRentalTenantVO.setStatus(30);
+ }
+ if (houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(0)) {
+ houseRentalTenantVO.setStatus(0);
+ }
+ if (houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(1)) {
+ houseRentalTenantVO.setStatus(1);
+ }
+ if (houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(3)) {
+ houseRentalTenantVO.setStatus(20);
+ }
+ if (houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(2)) {
+ houseRentalTenantVO.setStatus(10);
+ }
+ }
+ return page.setRecords(houseRentalTenantVOS);
}
/**
* 查询房屋出租情况
+ *
* @param code
* @return
*/
@@ -92,38 +124,115 @@
/**
* 自定义房屋出租新增
+ *
* @param houseRentalVO
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean add(HouseRentalVO houseRentalVO) {
+ boolean flag = false;
houseRentalVO.setCreateUser(AuthUtil.getUserId());
houseRentalVO.setCreateTime(new Date());
houseRentalVO.setUpdateUser(AuthUtil.getUserId());
houseRentalVO.setUpdateTime(new Date());
- //保存自身
- boolean save = save(houseRentalVO);
- List<HouseTenantEntity> houseTenantEntities = new ArrayList<>();
- houseRentalVO.getHouseTenantVOList().forEach(e->{
- HouseTenantEntity houseTenant= new HouseTenantEntity();
+ // 网格员新增默认是审核通过
+ houseRentalVO.setAuditStatus(1);
+ // 获取请求头中的角色别名
+ String roleName = SpringUtils.getRequestParam("roleName");
+ // 居民
+ if (!Strings.isBlank(roleName) && roleName.equals("inhabitant")) {
+ // 待审核
+ houseRentalVO.setAuditStatus(0);
+ }
+ //保存自身(租赁)
+ flag = save(houseRentalVO);
+ //保存到住户
+ if (flag){
+ flag = saveHousehold(houseRentalVO, flag);
+ }
+ return flag;
+ }
- houseTenant.setHousingRentalId(houseRentalVO.getId());
- houseTenant.setName(e.getName());
- houseTenant.setPhone(e.getPhone());
- houseTenant.setIdCard(e.getIdCard());
- houseTenant.setDomicile(e.getDomicile());
- houseTenant.setWorkUnit(e.getWorkUnit());
- houseTenantEntities.add(houseTenant);
+ /**
+ * 保存租户信息
+ *
+ * @param houseRentalVO
+ * @param flag
+ * @return
+ */
+ public boolean saveHousehold(HouseRentalVO houseRentalVO, boolean flag) {
+ if (houseRentalVO.getHouseholdVOList().size() > 0) {
+ houseRentalVO.getHouseholdVOList().forEach(e -> {
+ e.setHouseCode(houseRentalVO.getHouseCode());
+ e.setHousingRentalId(houseRentalVO.getId());
+ e.setRelationship(18);
+ e.setResidentialStatus(1);
+ if (!Strings.isBlank(e.getIdCard())){
+ e.setCardType(111);
+ }
+ e.setRoleType(2);
+ // 添加住户
+ iHouseholdService.save(e);
+ // 绑定用户
+ bindUserHandle(e);
+ });
+ }
+ return flag;
+ }
- });
- boolean saveBatch = houseTenantService.saveBatch(houseTenantEntities);
-
- return save&&saveBatch;
+ /**
+ * 租客和用户绑定
+ *
+ * @param
+ */
+ public User bindUserHandle(HouseholdEntity householdEntity) {
+ IUserService userService = SpringUtils.getBean(IUserService.class);
+ IHouseholdService householdService = SpringUtils.getBean(IHouseholdService.class);
+ User newUser = new User();
+ if (null != householdEntity.getPhoneNumber() && !householdEntity.getPhoneNumber().equals("")) {
+ //根据手机号查询库里的数据
+ List<User> list = userService.getUserListByPhoneOrAccount(householdEntity.getPhoneNumber());
+ if (list.size()>0) {
+ User user = list.get(0);
+ //如果用户存在，则该用户id绑定场所
+ householdEntity.setAssociatedUserId(user.getId());
+ //更新住户信息
+ householdService.updateById(householdEntity);
+ newUser = user;
+ // 判断用户是否包含了居民角色,不包含则需更新
+ if (!user.getRoleId().contains("1717429059648606209")) {
+ user.setRoleId(user.getRoleId() + ",1717429059648606209");
+ //更新
+ userService.updateById(user);
+ }
+ } else {
+ //如果用户不存在，则新增一个用户
+ 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);
+ //绑定id
+ householdEntity.setAssociatedUserId(newUser.getId());
+ //更新住户信息
+ householdService.updateById(householdEntity);
+ }
+ }
+ return newUser;
}
/**
* 出租屋 自定义删除
+ *
* @param id
* @return
*/
@@ -132,15 +241,16 @@
// 先删除出租屋信息
boolean b = removeById(id);
// 再删除租户信息
- int i = houseTenantService.removeByHousingRentalId(id);
- if (i>0){
- return true && b;
- }
- return false;
+ boolean update = iHouseholdService.update(Wrappers.<HouseholdEntity>lambdaUpdate()
+ .set(HouseholdEntity::getIsDeleted, 1)
+ .eq(HouseholdEntity::getHousingRentalId, id));
+ // 返回
+ return b;
}
/**
* 出租屋 自定义修改
+ *
* @param houseRental
* @return
*/
@@ -152,81 +262,169 @@
boolean removeFlag = true;
houseRental.setUpdateUser(AuthUtil.getUserId());
houseRental.setUpdateTime(new Date());
+ // 获取请求头中的角色别名
+ String roleName = SpringUtils.getRequestParam("roleName");
+ // 居民
+ if (!Strings.isBlank(roleName) && roleName.equals("inhabitant")) {
+ // 待审核
+ houseRental.setAuditStatus(0);
+ }
//更新自身
boolean update = updateById(houseRental);
// 查询对应已存在的租户
- QueryWrapper<HouseTenantEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("housing_rental_id",houseRental.getId());
- List<HouseTenantEntity> oldList = houseTenantService.list(wrapper);
- List<HouseTenantVO> list = houseRental.getHouseTenantVOList();
+ QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("housing_rental_id", houseRental.getId());
+ List<HouseholdEntity> oldList = iHouseholdService.list(wrapper);
+ List<HouseholdVO> list = houseRental.getHouseholdVOList();
// 申明新增，修改，删除集合
- List<HouseTenantEntity> newList = new ArrayList<>();
- List<HouseTenantEntity> addList = new ArrayList<>();
- List<HouseTenantEntity> updateList = new ArrayList<>();
- List<HouseTenantEntity> removeList = new ArrayList<>();
+ List<HouseholdEntity> newList = new ArrayList<>();
+ List<HouseholdEntity> addList = new ArrayList<>();
+ List<HouseholdEntity> updateList = new ArrayList<>();
+ List<HouseholdEntity> removeList = new ArrayList<>();
// 找出需要新增的，否则组成新集合进行比对
- for (HouseTenantVO houseTenantVO : list) {
- houseTenantVO.setHousingRentalId(houseRental.getId());
- if (null==houseTenantVO.getId()){
- // 新增
- HouseTenantEntity houseTenant= new HouseTenantEntity();
-
- houseTenant.setHousingRentalId(houseRental.getId());
- houseTenant.setName(houseTenantVO.getName());
- houseTenant.setPhone(houseTenantVO.getPhone());
- houseTenant.setIdCard(houseTenantVO.getIdCard());
- houseTenant.setDomicile(houseTenantVO.getDomicile());
- houseTenant.setWorkUnit(houseTenantVO.getWorkUnit());
- addList.add(houseTenant);
- }else {
- newList.add(houseTenantVO);
+ List<String> phoneList = new ArrayList<>();
+ IUserService userService = SpringUtils.getBean(IUserService.class);
+ for (HouseholdEntity householdEntity : list) {
+ if (null == householdEntity.getId()) {
+ User user = new User();
+ // 新增或更新用户
+ user = isSave(userService, householdEntity, user);
+ // 新增住户
+ householdEntity.setHouseCode(houseRental.getHouseCode());
+ householdEntity.setHousingRentalId(houseRental.getId());
+ householdEntity.setRelationship(18);
+ householdEntity.setResidentialStatus(1);
+ householdEntity.setRoleType(2);
+ if (!Strings.isBlank(householdEntity.getIdCard())){
+ householdEntity.setCardType(111);
+ }
+ if (user.getId() != null) {
+ householdEntity.setAssociatedUserId(user.getId());
+ }
+ addList.add(householdEntity);
+ // 添加手机号
+ phoneList.add(householdEntity.getPhoneNumber());
+ } else {
+ newList.add(householdEntity);
}
}
// 遍历去差集，判断是新增还是删除还是更新
// 取旧数据和新提交数据差集--删除
removeList = oldList.stream().filter(vo -> !newList.stream().map(e ->
e.getId()).collect(Collectors.toList()).contains(vo.getId())).collect(Collectors.toList());
+
// 取旧数据和新提交数据交集--更新
updateList = newList.stream().filter(vo -> oldList.stream().map(e ->
e.getId()).collect(Collectors.toList()).contains(vo.getId())).collect(Collectors.toList());
// 批量新增
- if (addList.size()>0) {
- addFlag = houseTenantService.saveBatch(addList);
+ if (addList.size() > 0) {
+ addFlag = iHouseholdService.saveBatch(addList);
}
// 批量修改
- if (updateList.size()>0) {
- updateFlag = houseTenantService.updateBatchById(updateList);
+ if (updateList.size() > 0) {
+ for (HouseholdEntity householdEntity : updateList) {
+ phoneList.add(householdEntity.getPhoneNumber());
+ User user = new User();
+ // 修改用户，用户存在则更新用户，不存在则新增用户
+ user = isSave(userService, householdEntity, user);
+ if (user.getId() != null) {
+ householdEntity.setAssociatedUserId(user.getId());
+ }
+ }
+ updateFlag = iHouseholdService.updateBatchById(updateList);
}
// 批量删除
- if (removeList.size()>0) {
- removeFlag = houseTenantService.removeBatchByIds(removeList);
+ if (removeList.size() > 0) {
+ removeFlag = iHouseholdService.removeBatchByIds(removeList);
+ // 删除用户。判断用户是否有其他角色,
+ for (HouseholdEntity householdEntity : removeList) {
+ if (householdEntity.getAssociatedUserId() != null) {
+ User userVO = userService.getById(householdEntity.getAssociatedUserId());
+ if (userVO.getRoleId().contains("1717429059648606209")) {
+ List<String> stringList = Arrays.asList(userVO.getRoleId().split(","));
+ // 有其他角色
+ if (stringList.size() >= 2) {
+ List<String> collect = stringList.stream().filter(item -> !item.equals("1717429059648606209")).collect(Collectors.toList());
+ userVO.setRoleId(StringUtils.join(collect, ","));
+ userService.updateById(userVO);
+ } else {
+ // 没有其他角色
+ userVO.setRoleId("");
+ boolean b = userService.updateById(userVO);
+ System.out.println(b);
+ }
+ }
+ }
+ }
}
// 返回
return update && addFlag && updateFlag && removeFlag;
}
/**
+ * 保存或更新用户
+ *
+ * @param userService
+ * @param householdEntity
+ * @param user
+ * @return
+ */
+ private User isSave(IUserService userService, HouseholdEntity householdEntity, User user) {
+ boolean save;
+ // 查询该住户是否有账号
+ IUserService userService1 = SpringUtils.getBean(IUserService.class);
+ User user1 = userService1.getOne(Wrappers.<User>lambdaQuery()
+ .eq(User::getAccount, householdEntity.getPhoneNumber())
+ .eq(User::getIsDeleted, 0).last("limit 1"));
+ if (user1 != null) {
+ user = user1;
+ user.setName(householdEntity.getName());
+ user.setRealName(householdEntity.getName());
+ if (StringUtils.isNoneBlank(user.getRoleId())) {
+ boolean contains = user.getRoleId().contains("1717429059648606209");
+ if (!contains) {
+ user.setRoleId(user.getRoleId() + ",1717429059648606209");
+ }
+ } else {
+ user.setRoleId("1717429059648606209");
+ }
+ // 更新用户
+ save = userService.updateById(user);
+ return user;
+ }
+ // 新增用户
+ user.setAccount(householdEntity.getPhoneNumber());
+ user.setUserType(1);
+ user.setPhone(householdEntity.getPhoneNumber());
+ user.setRealName(householdEntity.getName());
+ user.setName(householdEntity.getName());
+ user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
+ user.setRoleId("1717429059648606209");
+ save = userService.save(user);
+ return user;
+ }
+
+ /**
* 获取统计数据
+ *
* @return
*/
@Override
public Object getStatistics(HouseRentalTenantVO houseRental) {
- List<String> list = new ArrayList<>();
- if (null!=houseRental.getRoleName() && !houseRental.getRoleName().equals("")){
- if (houseRental.getRoleName().equals("网格员")){
- // 查询对应的房屋地址code
- list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
- }
- }
+ CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(HouseRentalTenantVO.class, houseRental);
// 查询
- List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental,list);
+ List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental,
+ commonParamSet.getGridCodeList(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator());
// 返回
return statistics;
}
/**
* 出租屋 确认
+ *
* @param houseRental
* @return
*/
@@ -238,9 +436,22 @@
return updateById(houseRental);
}
+ /**
+ * 导出租赁信息
+ *
+ * @param houseRentalVO
+ * @return
+ */
@Override
- public List<HouseRentalExcel> export(HouseRentalVO houseRentalVO) {
+ public List<HouseRentalExcel> export(HouseRentalTenantVO houseRentalVO) {
List<HouseRentalExcel> houseRentalExcels = baseMapper.export(houseRentalVO);
return houseRentalExcels;
}
+
+ @Override
+ public Integer getStatisticsCount(HouseRentalTenantVO houseRental) {
+ CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(HouseRentalTenantVO.class, houseRental);
+ return baseMapper.getStatisticsCount(houseRental, commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList(), commonParamSet.getIsAdministrator());
+ }
}
--
Gitblit v1.9.3