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/HouseServiceImpl.java | 513 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 466 insertions(+), 47 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index e6bca35..6399f23 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -18,26 +18,46 @@
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 org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.SysCache;
+import org.springblade.common.utils.IdUtils;
import org.springblade.common.utils.NodeTreeUtil;
+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.BeanUtil;
+import org.springblade.modules.grid.entity.GridRangeEntity;
+import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.house.entity.HouseEntity;
import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.excel.HouseAndHoldExcel;
import org.springblade.modules.house.excel.HouseExcel;
import org.springblade.modules.house.mapper.HouseMapper;
import org.springblade.modules.house.service.IHouseService;
import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.house.service.IUserHouseLabelService;
import org.springblade.modules.house.vo.HouseParam;
import org.springblade.modules.house.vo.HouseTree;
import org.springblade.modules.house.vo.HouseVO;
+import org.springblade.modules.label.entity.LabelEntity;
+import org.springblade.modules.label.service.ILabelService;
+import org.springblade.modules.label.vo.LabelVO;
+import org.springblade.modules.system.entity.Region;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IRegionService;
+import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -56,13 +76,26 @@
@Autowired
private IHouseholdService householdService;
+ @Autowired
+ private IGridRangeService gridRangeService;
+
+ @Autowired
+ private IUserService userService;
+
+ @Autowired
+ private IRegionService regionService;
+
@Override
public IPage<HouseVO> selectHousePage(IPage<HouseVO> page, HouseVO house) {
- return page.setRecords(baseMapper.selectHousePage(page, house));
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
+ List<HouseVO> houseVOS = baseMapper.selectHousePage(page, house, regionChildCodesList, isAdministrator);
+ return page.setRecords(houseVOS);
}
/**
* 房屋自定义详情查询
+ *
* @param house
* @return
*/
@@ -73,27 +106,65 @@
/**
* 房屋自定义新增或修改
+ *
* @param house
* @return
*/
@Override
public boolean saveOrUpdateHouse(HouseEntity house) {
- // 查询是否已存在房屋数据
- QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("house_code",house.getHouseCode());
- HouseEntity one = getOne(wrapper);
- if (null != one){
- house.setId(one.getId());
- // 更新数据
- return updateById(house);
+ boolean flag = false;
+ // 如果没有房屋编号，自己生成
+ if (!Strings.isBlank(house.getHouseCode())) {
+ // 查询是否已存在房屋数据
+ QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("house_code", house.getHouseCode());
+ HouseEntity one = getOne(wrapper);
+ if (null != one) {
+ house.setId(one.getId());
+ // 更新数据
+ return updateById(house);
+ }
+ } else {
+ //自己生成编号
+ // 设置来源( 1：地址总表 2：国控采集)
+ house.setSource(2);
+ // 并生成36位的houseCode
+ house.setHouseCode(IdUtils.getIdBy36());
}
//插入数据
- return save(house);
+ flag = save(house);
+ // 设置网格绑定数据
+ gridBind(house);
+ // 返回
+ return flag;
+ }
+
+ /**
+ * 网格绑定
+ *
+ * @param house
+ */
+ public void gridBind(HouseEntity house) {
+ if (null != house.getGridId()) {
+ // 判断关联关系表是否存在
+ QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("grid_id", house.getGridId()).eq("house_code", house.getHouseCode());
+ GridRangeEntity one = gridRangeService.getOne(wrapper);
+ if (null == one) {
+ // 新增
+ GridRangeEntity gridRangeEntity = new GridRangeEntity();
+ gridRangeEntity.setHouseCode(house.getHouseCode());
+ gridRangeEntity.setGridId(house.getGridId());
+ // 插入
+ gridRangeService.save(gridRangeEntity);
+ }
+ }
}
/**
* 导入房屋数据
+ *
* @param data
* @param isCovered
*/
@@ -113,18 +184,20 @@
/**
* 查询房屋树
+ *
* @param houseParam
* @return
*/
@Override
public List<HouseTree> getHouseTree(HouseParam houseParam) {
List<String> houseCodeList = getHouseCodeList(houseParam);
- return NodeTreeUtil.getHouseTree(baseMapper.getHouseTree(houseParam,houseCodeList));
+ return NodeTreeUtil.getHouseTree(baseMapper.getHouseTree(houseParam, houseCodeList));
}
/**
* 根据角色获取地址编号集合
+ *
* @param houseParam
* @return
*/
@@ -141,6 +214,7 @@
/**
* 人房数据导入
+ *
* @param data
* @param isCovered
*/
@@ -148,7 +222,8 @@
@Transactional(rollbackFor = Exception.class)
public void importHouseAndHold(List<HouseAndHoldExcel> data, Boolean isCovered) {
for (HouseAndHoldExcel houseAndHoldExcel : data) {
-// System.out.println("houseAndHoldExcel = " + houseAndHoldExcel);
+ // System.out.println(houseAndHoldExcel);
+ System.out.println("houseAndHoldExcel = " + houseAndHoldExcel);
// 保存房屋数据--一个一个插入，防止一个表格中存在多个地址编号相同的数据
saveHouseData(houseAndHoldExcel);
// 保存住户数据（包含标签）--一个一个插入，防止一个表格中存在多个地址编号相同的数据
@@ -159,35 +234,49 @@
/**
* 保存房屋数据
+ *
* @param houseAndHoldExcel
*/
@Transactional(rollbackFor = Exception.class)
- public void saveHouseholdData(HouseAndHoldExcel houseAndHoldExcel) {
+ public void saveHouseData(HouseAndHoldExcel houseAndHoldExcel) {
// 查询库中是否已存在
QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("house_code",houseAndHoldExcel.getHouseCode())
- .eq("is_deleted",0);
+ wrapper.eq("house_code", houseAndHoldExcel.getHouseCode())
+ .eq("is_deleted", 0);
HouseEntity one = getOne(wrapper);
// 不存在则插入，存在则不操作
- if (null == one){
+ if (null == one) {
HouseEntity houseEntity = new HouseEntity();
houseEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
houseEntity.setHouseName(houseAndHoldExcel.getHouseName());
houseEntity.setDistrictName(houseAndHoldExcel.getDistrictName());
houseEntity.setUnit(houseAndHoldExcel.getUnit());
- if (!Strings.isBlank(houseAndHoldExcel.getFloor())){
+ if (!Strings.isBlank(houseAndHoldExcel.getFloor())) {
houseEntity.setFloor(houseAndHoldExcel.getFloor());
}
houseEntity.setRoom(houseAndHoldExcel.getRoom());
houseEntity.setBuilding(houseAndHoldExcel.getBuilding());
houseEntity.setArea(houseAndHoldExcel.getArea());
houseEntity.setPropertyPrice(houseAndHoldExcel.getPropertyPrice());
- houseEntity.setServiceDue(houseAndHoldExcel.getServiceDue());
+ if (!Strings.isBlank(houseAndHoldExcel.getServiceDue())) {
+ try {
+ Date date = new SimpleDateFormat("yyyy-MM-dd").parse(houseAndHoldExcel.getServiceDue());
+ houseEntity.setServiceDue(date);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
houseEntity.setRemark(houseAndHoldExcel.getRemark());
houseEntity.setCreateTime(new Date());
houseEntity.setCreateUser(AuthUtil.getUserId().toString());
houseEntity.setUpdateTime(new Date());
houseEntity.setUpdateUser(AuthUtil.getUserId().toString());
+ if (!Strings.isBlank(houseAndHoldExcel.getHouseCode())) {
+ houseEntity.setSource(1);
+ } else {
+ houseEntity.setHouseCode(IdUtils.getIdBy36());
+ houseEntity.setSource(2);
+ }
// 新增
save(houseEntity);
}
@@ -195,62 +284,119 @@
/**
* 保存住户数据
+ *
* @param houseAndHoldExcel
*/
@Transactional(rollbackFor = Exception.class)
- public void saveHouseData(HouseAndHoldExcel houseAndHoldExcel) {
+ public void saveHouseholdData(HouseAndHoldExcel houseAndHoldExcel) {
// 查询库中是否已存在
QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("house_code",houseAndHoldExcel.getHouseCode())
- .eq("is_deleted",0)
- .eq("phone_number",houseAndHoldExcel.getPhoneNumber());
+ wrapper.eq("house_code", houseAndHoldExcel.getHouseCode())
+ .eq("is_deleted", 0)
+ .eq("name", houseAndHoldExcel.getName());
HouseholdEntity one = householdService.getOne(wrapper);
// 不存在则插入，存在则不操作
- if (null == one){
+ if (null == one) {
HouseholdEntity householdEntity = new HouseholdEntity();
householdEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
householdEntity.setName(houseAndHoldExcel.getName());
householdEntity.setPhoneNumber(houseAndHoldExcel.getPhoneNumber());
- if (!Strings.isBlank(houseAndHoldExcel.getRoleType())){
+ if (!Strings.isBlank(houseAndHoldExcel.getRoleType())) {
householdEntity.setRoleType(Integer.parseInt(houseAndHoldExcel.getRoleType()));
}
- if (!Strings.isBlank(houseAndHoldExcel.getRelationship())){
+ // 与角色关系
+ if (!Strings.isBlank(houseAndHoldExcel.getRelationship())) {
householdEntity.setRelationship(Integer.parseInt(houseAndHoldExcel.getRelationship()));
+ // 如果是业主，则需要往用户表插入用户
+ if (householdEntity.getRelationship() == 1) {
+ saveOrUpdateUser(householdEntity);
+ }
}
- if (!Strings.isBlank(houseAndHoldExcel.getIsPrimaryContact())){
+ /// 是否主要联系人
+ if (!Strings.isBlank(houseAndHoldExcel.getIsPrimaryContact())) {
householdEntity.setIsPrimaryContact(Integer.parseInt(houseAndHoldExcel.getIsPrimaryContact()));
}
// 居住状态
- if (!Strings.isBlank(houseAndHoldExcel.getResidentialStatus())){
+ if (!Strings.isBlank(houseAndHoldExcel.getResidentialStatus())) {
householdEntity.setResidentialStatus(Integer.parseInt(houseAndHoldExcel.getResidentialStatus()));
}
// 性别
- if (!Strings.isBlank(houseAndHoldExcel.getGender())){
+ if (!Strings.isBlank(houseAndHoldExcel.getGender())) {
householdEntity.setGender(Short.parseShort(houseAndHoldExcel.getGender()));
}
householdEntity.setIdCard(houseAndHoldExcel.getIdCard());
// 党员
- if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())){
+ if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())) {
householdEntity.setPartyEmber(Integer.parseInt(houseAndHoldExcel.getPartyEmber()));
}
- householdEntity.setHkmtPass(houseAndHoldExcel.getHkmtPass());
- householdEntity.setPassport(houseAndHoldExcel.getPassport());
- if (!Strings.isBlank(houseAndHoldExcel.getEthnicity())){
+ // householdEntity.setHkmtPass(houseAndHoldExcel.getHkmtPass());
+ // householdEntity.setPassport(houseAndHoldExcel.getPassport());
+ // 民族
+ if (!Strings.isBlank(houseAndHoldExcel.getEthnicity())) {
householdEntity.setEthnicity(Integer.parseInt(houseAndHoldExcel.getEthnicity()));
}
- if (!Strings.isBlank(houseAndHoldExcel.getEducation())){
+ // 学历
+ if (!Strings.isBlank(houseAndHoldExcel.getEducation())) {
householdEntity.setEducation(Integer.parseInt(houseAndHoldExcel.getEducation()));
}
+ // 户籍类型
+ if (!Strings.isBlank(houseAndHoldExcel.getResidentType())) {
+ householdEntity.setResidentType(Integer.parseInt(houseAndHoldExcel.getResidentType().trim()));
+ }
+ // 户籍地区县
+ if (!Strings.isBlank(houseAndHoldExcel.getResidentAdcode())) {
+ String adCode = shiftResidentResidentAdCode(houseAndHoldExcel.getResidentProvinceAdcode(),
+ houseAndHoldExcel.getResidentCityAdcode(),
+ houseAndHoldExcel.getResidentAdcode());
+ // 转换行政区code
+ houseAndHoldExcel.setResidentAdcode(adCode);
+ }
householdEntity.setHukouRegistration(houseAndHoldExcel.getHukouRegistration());
- if (!Strings.isBlank(houseAndHoldExcel.getWorkStatus())){
+ // 籍贯地区县
+ if (!Strings.isBlank(houseAndHoldExcel.getNativePlaceAdcode())) {
+ String adCode = shiftResidentResidentAdCode(null,
+ null,
+ houseAndHoldExcel.getNativePlaceAdcode());
+ // 转换行政区code
+ houseAndHoldExcel.setNativePlaceAdcode(adCode);
+ }
+ // 健康状况
+ if (!Strings.isBlank(houseAndHoldExcel.getHealthStatus())) {
+ householdEntity.setHealthStatus(Integer.parseInt(houseAndHoldExcel.getHealthStatus()));
+ }
+ householdEntity.setDiseaseName(houseAndHoldExcel.getDiseaseName());
+ householdEntity.setReligiousBelief(houseAndHoldExcel.getReligiousBelief());
+ // 工作状态
+ if (!Strings.isBlank(houseAndHoldExcel.getWorkStatus())) {
householdEntity.setWorkStatus(Integer.parseInt(houseAndHoldExcel.getWorkStatus()));
}
householdEntity.setEmployer(houseAndHoldExcel.getEmployer());
- if (!Strings.isBlank(houseAndHoldExcel.getMaritalStatus())){
+ householdEntity.setOccupation(houseAndHoldExcel.getOccupation());
+ householdEntity.setCmpyRegAddr(houseAndHoldExcel.getCmpyRegAddr());
+ householdEntity.setGoOutReason(houseAndHoldExcel.getGoOutReason());
+ if (!Strings.isBlank(houseAndHoldExcel.getGoOutTime())) {
+ try {
+ Date date = new SimpleDateFormat("yyyy-MM-dd").parse(houseAndHoldExcel.getGoOutTime());
+ householdEntity.setGoOutTime(date);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ householdEntity.setGoOutWhere(houseAndHoldExcel.getGoOutWhere());
+ householdEntity.setGoOutAddr(houseAndHoldExcel.getGoOutAddr());
+ // 婚姻状态
+ if (!Strings.isBlank(houseAndHoldExcel.getMaritalStatus())) {
householdEntity.setMaritalStatus(Integer.parseInt(houseAndHoldExcel.getMaritalStatus()));
}
householdEntity.setCardNumber(houseAndHoldExcel.getCardNumber());
householdEntity.setOtherContact(houseAndHoldExcel.getOtherContact());
+ if (Strings.isBlank(householdEntity.getHouseCode())) {
+ // 暂时不处理，导入数据目前都有house_code
+ String adCode = shiftResidentHomeAdcode(houseAndHoldExcel.getHomeAdcode());
+ // 转换行政区code
+ houseAndHoldExcel.setHomeAdcode(adCode);
+ }
+ householdEntity.setCurrentAddress(houseAndHoldExcel.getCurrentAddress());
householdEntity.setDisabilityCert(houseAndHoldExcel.getDisabilityCert());
householdEntity.setRemark(houseAndHoldExcel.getRemarks());
householdEntity.setCreateTime(new Date());
@@ -258,28 +404,272 @@
householdEntity.setUpdateTime(new Date());
householdEntity.setUpdateUser(AuthUtil.getUserId());
// 新增
- householdService.save(householdEntity);
+ boolean save = householdService.save(householdEntity);
+ if (save) {
+ String labelId = houseAndHoldExcel.getLabelId();
+ if (StringUtils.isBlank(labelId)) {
+ return;
+ }
+ String[] split = labelId.split(",");
+ IUserHouseLabelService bean = SpringUtils.getBean(IUserHouseLabelService.class);
+ ILabelService bean1 = SpringUtils.getBean(ILabelService.class);
+ for (String s : split) {
+ LabelEntity one1 = bean1.getOne(Wrappers.<LabelEntity>lambdaQuery().eq(LabelEntity::getLabelName, s));
+ if (one1 != null) {
+ UserHouseLabelEntity userHouseLabelEntity = new UserHouseLabelEntity();
+ userHouseLabelEntity.setLabelId(BigDecimal.valueOf(one1.getId()).longValue());
+ userHouseLabelEntity.setHouseholdId(householdEntity.getId());
+ // 设置默认的绿色
+ userHouseLabelEntity.setColor("green");
+ userHouseLabelEntity.setLableType(1);
+ userHouseLabelEntity.setLabelName(s);
+ userHouseLabelEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
+ bean.save(userHouseLabelEntity);
+ }
+ }
+ }
+ } else {
+ // 更新
+ one.setHouseCode(houseAndHoldExcel.getHouseCode());
+ one.setName(houseAndHoldExcel.getName());
+ one.setPhoneNumber(houseAndHoldExcel.getPhoneNumber());
+ if (!Strings.isBlank(houseAndHoldExcel.getRoleType())) {
+ one.setRoleType(Integer.parseInt(houseAndHoldExcel.getRoleType()));
+ }
+ // 与角色关系
+ if (!Strings.isBlank(houseAndHoldExcel.getRelationship())) {
+ one.setRelationship(Integer.parseInt(houseAndHoldExcel.getRelationship()));
+ // 如果是业主，则需要往用户表插入用户
+ if (one.getRelationship() == 1) {
+ saveOrUpdateUser(one);
+ }
+ }
+ /// 是否主要联系人
+ if (!Strings.isBlank(houseAndHoldExcel.getIsPrimaryContact())) {
+ one.setIsPrimaryContact(Integer.parseInt(houseAndHoldExcel.getIsPrimaryContact()));
+ }
+ // 居住状态
+ if (!Strings.isBlank(houseAndHoldExcel.getResidentialStatus())) {
+ one.setResidentialStatus(Integer.parseInt(houseAndHoldExcel.getResidentialStatus()));
+ }
+ // 性别
+ if (!Strings.isBlank(houseAndHoldExcel.getGender())) {
+ one.setGender(Short.parseShort(houseAndHoldExcel.getGender()));
+ }
+ one.setIdCard(houseAndHoldExcel.getIdCard());
+ // 党员
+ if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())) {
+ one.setPartyEmber(Integer.parseInt(houseAndHoldExcel.getPartyEmber()));
+ }
+ // one.setHkmtPass(houseAndHoldExcel.getHkmtPass());
+ // one.setPassport(houseAndHoldExcel.getPassport());
+ // 民族
+ if (!Strings.isBlank(houseAndHoldExcel.getEthnicity())) {
+ one.setEthnicity(Integer.parseInt(houseAndHoldExcel.getEthnicity()));
+ }
+ // 学历
+ if (!Strings.isBlank(houseAndHoldExcel.getEducation())) {
+ one.setEducation(Integer.parseInt(houseAndHoldExcel.getEducation()));
+ }
+ // 户籍类型
+ if (!Strings.isBlank(houseAndHoldExcel.getResidentType())) {
+ one.setResidentType(Integer.parseInt(houseAndHoldExcel.getResidentType().trim()));
+ }
+ // 户籍地区县
+ if (!Strings.isBlank(houseAndHoldExcel.getResidentAdcode())) {
+ String adCode = shiftResidentResidentAdCode(houseAndHoldExcel.getResidentProvinceAdcode(),
+ houseAndHoldExcel.getResidentCityAdcode(),
+ houseAndHoldExcel.getResidentAdcode());
+ // 转换行政区code
+ houseAndHoldExcel.setResidentAdcode(adCode);
+ }
+ one.setHukouRegistration(houseAndHoldExcel.getHukouRegistration());
+ // 籍贯地区县
+ if (!Strings.isBlank(houseAndHoldExcel.getNativePlaceAdcode())) {
+ String adCode = shiftResidentResidentAdCode(null,
+ null,
+ houseAndHoldExcel.getNativePlaceAdcode());
+ // 转换行政区code
+ houseAndHoldExcel.setNativePlaceAdcode(adCode);
+ }
+ // 健康状况
+ if (!Strings.isBlank(houseAndHoldExcel.getHealthStatus())) {
+ one.setHealthStatus(Integer.parseInt(houseAndHoldExcel.getHealthStatus()));
+ }
+ one.setDiseaseName(houseAndHoldExcel.getDiseaseName());
+ one.setReligiousBelief(houseAndHoldExcel.getReligiousBelief());
+ // 工作状态
+ if (!Strings.isBlank(houseAndHoldExcel.getWorkStatus())) {
+ one.setWorkStatus(Integer.parseInt(houseAndHoldExcel.getWorkStatus()));
+ }
+ one.setEmployer(houseAndHoldExcel.getEmployer());
+ one.setOccupation(houseAndHoldExcel.getOccupation());
+ one.setCmpyRegAddr(houseAndHoldExcel.getCmpyRegAddr());
+ one.setGoOutReason(houseAndHoldExcel.getGoOutReason());
+ if (!Strings.isBlank(houseAndHoldExcel.getGoOutTime())) {
+ try {
+ Date date = new SimpleDateFormat("yyyy-MM-dd").parse(houseAndHoldExcel.getGoOutTime());
+ one.setGoOutTime(date);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ }
+ one.setGoOutWhere(houseAndHoldExcel.getGoOutWhere());
+ one.setGoOutAddr(houseAndHoldExcel.getGoOutAddr());
+ // 婚姻状态
+ if (!Strings.isBlank(houseAndHoldExcel.getMaritalStatus())) {
+ one.setMaritalStatus(Integer.parseInt(houseAndHoldExcel.getMaritalStatus()));
+ }
+ one.setCardNumber(houseAndHoldExcel.getCardNumber());
+ one.setOtherContact(houseAndHoldExcel.getOtherContact());
+ if (Strings.isBlank(one.getHouseCode())) {
+ // 暂时不处理，导入数据目前都有house_code
+ String adCode = shiftResidentHomeAdcode(houseAndHoldExcel.getHomeAdcode());
+ // 转换行政区code
+ houseAndHoldExcel.setHomeAdcode(adCode);
+ }
+ one.setCurrentAddress(houseAndHoldExcel.getCurrentAddress());
+ one.setDisabilityCert(houseAndHoldExcel.getDisabilityCert());
+ one.setRemark(houseAndHoldExcel.getRemarks());
+ one.setUpdateTime(new Date());
+ one.setUpdateUser(AuthUtil.getUserId());
+ // 新增
+ boolean update = householdService.updateById(one);
+ if (update) {
+ String labelId = houseAndHoldExcel.getLabelId();
+ if (StringUtils.isBlank(labelId)) {
+ return;
+ }
+ String[] split = labelId.split(",");
+ IUserHouseLabelService bean = SpringUtils.getBean(IUserHouseLabelService.class);
+ ILabelService bean1 = SpringUtils.getBean(ILabelService.class);
+ for (String s : split) {
+ LabelEntity one1 = bean1.getOne(Wrappers.<LabelEntity>lambdaQuery().eq(LabelEntity::getLabelName, s));
+ if (one1 != null) {
+ UserHouseLabelEntity userHouseLabelEntity = new UserHouseLabelEntity();
+ userHouseLabelEntity.setLabelId(BigDecimal.valueOf(one1.getId()).longValue());
+ userHouseLabelEntity.setHouseholdId(one.getId());
+ userHouseLabelEntity.setLableType(1);
+ userHouseLabelEntity.setLabelName(s);
+ // 设置默认的绿色
+ userHouseLabelEntity.setColor("green");
+ userHouseLabelEntity.setHouseCode(houseAndHoldExcel.getHouseCode());
+ bean.save(userHouseLabelEntity);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * 现居住地街道转换
+ *
+ * @param homeAdcode
+ * @return
+ */
+ public String shiftResidentHomeAdcode(String homeAdcode) {
+ // 只根据区县名称查询
+ QueryWrapper<Region> wrapper = new QueryWrapper<>();
+ wrapper.eq("town_name", homeAdcode);
+ List<Region> list = regionService.list(wrapper);
+ if (list.size() == 1) {
+ return list.get(0).getTownCode();
+ }
+ return "";
+ }
+
+ /**
+ * 根据名称转成code
+ *
+ * @param residentProvinceAdcode 省名称
+ * @param residentCityAdcode 市名称
+ * @param residentAdcode 区县名称
+ */
+ public String shiftResidentResidentAdCode(String residentProvinceAdcode, String residentCityAdcode, String residentAdcode) {
+ if (!Strings.isBlank(residentProvinceAdcode)
+ && !Strings.isBlank(residentCityAdcode)) {
+ // 根据省市县三级查询对应的区县code
+ QueryWrapper<Region> wrapper = new QueryWrapper<>();
+ wrapper.eq("province_name", residentProvinceAdcode)
+ .eq("city_name", residentCityAdcode)
+ .eq("district_name", residentAdcode);
+ List<Region> list = regionService.list(wrapper);
+ if (list.size() > 0) {
+ return list.get(0).getDistrictCode();
+ }
+ } else {
+ // 只根据区县名称查询
+ QueryWrapper<Region> wrapper = new QueryWrapper<>();
+ wrapper.eq("district_name", residentAdcode);
+ List<Region> list = regionService.list(wrapper);
+ if (list.size() == 1) {
+ return list.get(0).getDistrictCode();
+ }
+ }
+ return "";
+ }
+
+ /**
+ * 保存或更新用户（业主）
+ *
+ * @param householdEntity
+ */
+ public void saveOrUpdateUser(HouseholdEntity householdEntity) {
+ if (null != householdEntity.getPhoneNumber() && !householdEntity.getPhoneNumber().equals("")) {
+ //根据手机号查询库里的数据
+ User userParams = new User();
+ userParams.setPhone(householdEntity.getPhoneNumber());
+ User user = userService.getOne(Condition.getQueryWrapper(userParams));
+ if (null != user) {
+ //如果用户存在，则该用户id绑定住户
+ householdEntity.setAssociatedUserId(user.getId());
+ // 判断用户是否包含了居民角色,不包含则需更新
+ 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);
+ //绑定id
+ householdEntity.setAssociatedUserId(newUser.getId());
+ }
}
}
@Override
- public Map<String, Object> getHouseStatistics(String code, String roleType) {
+ public Map<String, Object> getHouseStatistics(String code, String roleType, String aoiCode, String buildingCode, String unitCode) {
Map<String, Object> objectObjectHashMap = new HashMap<>();
- if (roleType.equals("1")) {
- // result1 查询楼栋数 result2 查询房屋套数 result3 查询住户数 result4 查询单元数
- Integer result1 = baseMapper.getHouseStatisticsOne(code, AuthUtil.getUserId());
- Integer result2 = baseMapper.getHouseStatisticsTwo(code, AuthUtil.getUserId());
- Integer result3 = baseMapper.getHouseStatisticsThree(code, AuthUtil.getUserId());
- Integer result4 = baseMapper.getHouseStatisticsFour(code, AuthUtil.getUserId());
+ if (roleType.equals("2")) {
+ // result1 查询楼栋数 result2 查询房屋套数 result3 查询住户数 result4 查询单元数
+ Integer result1 = baseMapper.getHouseStatisticsOne(code, null, aoiCode, buildingCode, unitCode, roleType);
+ Integer result2 = baseMapper.getHouseStatisticsTwo(code, null, aoiCode, buildingCode, unitCode, roleType);
+ Integer result3 = baseMapper.getHouseStatisticsThree(code, null, aoiCode, buildingCode, unitCode, roleType);
+ Integer result4 = baseMapper.getHouseStatisticsFour(code, null, aoiCode, buildingCode, unitCode, roleType);
objectObjectHashMap.put("result1", result1);
objectObjectHashMap.put("result2", result2);
objectObjectHashMap.put("result3", result3);
objectObjectHashMap.put("result4", result4);
} else {
- Integer result1 = baseMapper.getHouseStatisticsOne(code, null);
- Integer result2 = baseMapper.getHouseStatisticsTwo(code, null);
- Integer result3 = baseMapper.getHouseStatisticsThree(code, null);
- Integer result4 = baseMapper.getHouseStatisticsFour(code, null);
+
+ Integer result1 = baseMapper.getHouseStatisticsOne(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
+ Integer result2 = baseMapper.getHouseStatisticsTwo(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
+ Integer result3 = baseMapper.getHouseStatisticsThree(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
+ Integer result4 = baseMapper.getHouseStatisticsFour(code, AuthUtil.getUserId(), aoiCode, buildingCode, unitCode, roleType);
objectObjectHashMap.put("result1", result1);
objectObjectHashMap.put("result2", result2);
objectObjectHashMap.put("result3", result3);
@@ -287,4 +677,33 @@
}
return objectObjectHashMap;
}
+
+ @Override
+ public List<String> getHouseBuilding(String districtCode) {
+ return baseMapper.getHouseBuilding(districtCode);
+ }
+
+ @Override
+ public List<String> getHouseUnit(String districtCode, String building) {
+ return baseMapper.getHouseUnit(districtCode, building);
+ }
+
+ @Override
+ public List<Map<String, Object>> labelStatistics(HouseVO house) {
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
+ return baseMapper.labelStatistics(house, regionChildCodesList, isAdministrator);
+ }
+
+ @Override
+ public List<Map<String, Object>> labelCommunityStatistics(HouseVO house) {
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
+ List<Map<String, Object>> list = baseMapper.labelCommunityStatistics(house, regionChildCodesList);
+ for (Map<String, Object> map : list) {
+ List<LabelVO> code = baseMapper.getlabelCount(house, regionChildCodesList, isAdministrator, map.get("code").toString());
+ map.put("child",code);
+ }
+ return list;
+ }
}
--
Gitblit v1.9.3