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/HouseServiceImpl.java | 325 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 263 insertions(+), 62 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 defb6e2..6c4f708 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
@@ -16,20 +16,26 @@
*/
package org.springblade.modules.house.service.impl;
+import cn.hutool.core.util.IdcardUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
-import org.springblade.common.cache.SysCache;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springblade.common.param.CommonParamSet;
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.core.tool.utils.Func;
+import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
+import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridRangeEntity;
import org.springblade.modules.grid.service.IGridRangeService;
@@ -74,6 +80,8 @@
public class HouseServiceImpl extends ServiceImpl<HouseMapper, HouseEntity> implements IHouseService {
+ private static final Logger logger = LoggerFactory.getLogger(HouseServiceImpl.class);
+
@Autowired
private IGridService gridService;
@@ -93,11 +101,11 @@
public IPage<HouseVO> selectHousePage(IPage<HouseVO> page, HouseVO house) {
// List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
// Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
- CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseVO.class,house);
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseVO.class, house);
List<HouseVO> houseVOS = baseMapper.selectHousePage(page, house,
- commonParamSet.getRegionChildCodesList(),commonParamSet.getGridCodeList(), commonParamSet.getIsAdministrator()
- );
+ commonParamSet.getRegionChildCodesList(), commonParamSet.getGridCodeList(), commonParamSet.getIsAdministrator()
+ );
return page.setRecords(houseVOS);
}
@@ -109,6 +117,14 @@
*/
@Override
public HouseVO getHouseDetail(HouseVO house) {
+ if (ObjectUtils.isEmpty(house)) {
+ logger.error("house是空值", house);
+ return new HouseVO();
+ }
+ if (StringUtils.isBlank(house.getHouseCode()) && ObjectUtils.isEmpty(house.getId())) {
+ logger.error("house.HouseCode是空值", house);
+ return new HouseVO();
+ }
return baseMapper.getHouseDetail(house);
}
@@ -214,7 +230,7 @@
if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
if (houseParam.getRoleName().equals("网格员")) {
// 查询对应的房屋地址code
- stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId(),null);
+ stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId(), null);
}
}
return stringList;
@@ -247,6 +263,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public void saveHouseData(HouseAndHoldExcel houseAndHoldExcel) {
+ IDoorplateAddressService doorplateAddressService = SpringUtils.getBean(IDoorplateAddressService.class);
// 查询库中是否已存在
QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
wrapper.eq("house_code", houseAndHoldExcel.getHouseCode())
@@ -256,9 +273,29 @@
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.getHouseName())) {
+ // 查询地址总表对应的数据
+ QueryWrapper<DoorplateAddressEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("address_code", houseAndHoldExcel.getHouseCode());
+ DoorplateAddressEntity addressEntity = doorplateAddressService.getOne(queryWrapper);
+ if (null != addressEntity) {
+ houseEntity.setHouseName(addressEntity.getAddressName());
+ houseEntity.setAddress(addressEntity.getAddressName());
+ houseEntity.setDistrictCode(addressEntity.getAoiCode());
+ houseEntity.setDistrictName(addressEntity.getAoiName());
+ houseEntity.setLng(addressEntity.getX());
+ houseEntity.setLat(addressEntity.getY());
+ }
+ } else {
+ houseEntity.setHouseName(houseAndHoldExcel.getHouseName());
+ houseEntity.setAddress(houseAndHoldExcel.getHouseName());
+ }
+ if (!Strings.isBlank(houseAndHoldExcel.getDistrictName())) {
+ houseEntity.setDistrictName(houseAndHoldExcel.getDistrictName());
+ }
+ if (!Strings.isBlank(houseAndHoldExcel.getUnit())) {
+ houseEntity.setUnit(houseAndHoldExcel.getUnit());
+ }
if (!Strings.isBlank(houseAndHoldExcel.getFloor())) {
houseEntity.setFloor(houseAndHoldExcel.getFloor());
}
@@ -285,14 +322,35 @@
houseEntity.setHouseCode(IdUtils.getIdBy36());
houseEntity.setSource(2);
}
+ // 网格处理
+ importGridHandle(houseAndHoldExcel, houseEntity);
// 新增
save(houseEntity);
- }else {
+ } else {
// 更新
- one.setHouseName(houseAndHoldExcel.getHouseName());
- one.setAddress(houseAndHoldExcel.getHouseName());
- one.setDistrictName(houseAndHoldExcel.getDistrictName());
- one.setUnit(houseAndHoldExcel.getUnit());
+ if (Strings.isBlank(houseAndHoldExcel.getHouseName())) {
+ // 查询地址总表对应的数据
+ QueryWrapper<DoorplateAddressEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("address_code", houseAndHoldExcel.getHouseCode());
+ DoorplateAddressEntity addressEntity = doorplateAddressService.getOne(queryWrapper);
+ if (null != addressEntity) {
+ one.setHouseName(addressEntity.getAddressName());
+ one.setAddress(addressEntity.getAddressName());
+ one.setDistrictCode(addressEntity.getAoiCode());
+ one.setDistrictName(addressEntity.getAoiName());
+ one.setLng(addressEntity.getX());
+ one.setLat(addressEntity.getY());
+ }
+ } else {
+ one.setHouseName(houseAndHoldExcel.getHouseName());
+ one.setAddress(houseAndHoldExcel.getHouseName());
+ }
+ if (!Strings.isBlank(houseAndHoldExcel.getDistrictName())) {
+ one.setDistrictName(houseAndHoldExcel.getDistrictName());
+ }
+ if (!Strings.isBlank(houseAndHoldExcel.getUnit())) {
+ one.setUnit(houseAndHoldExcel.getUnit());
+ }
if (!Strings.isBlank(houseAndHoldExcel.getFloor())) {
one.setFloor(houseAndHoldExcel.getFloor());
}
@@ -300,6 +358,8 @@
one.setBuilding(houseAndHoldExcel.getBuilding());
one.setArea(houseAndHoldExcel.getArea());
one.setPropertyPrice(houseAndHoldExcel.getPropertyPrice());
+ // 网格处理
+ importGridHandle(houseAndHoldExcel, one);
// 更新
updateById(one);
}
@@ -347,9 +407,13 @@
}
// 居民身份证
if (!Strings.isBlank(houseAndHoldExcel.getIdCard())) {
- // 身份证类型为居民身份证
- householdEntity.setCardType(111);
- householdEntity.setIdCard(houseAndHoldExcel.getIdCard());
+ if (IdcardUtil.isValidCard(houseAndHoldExcel.getIdCard())) {
+ // 身份证类型为居民身份证
+ householdEntity.setCardType(111);
+ householdEntity.setIdCard(houseAndHoldExcel.getIdCard());
+ } else {
+ householdEntity.setIdCard(houseAndHoldExcel.getIdCard());
+ }
}
// 党员
if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())) {
@@ -464,9 +528,13 @@
}
// 居民身份证
if (!Strings.isBlank(houseAndHoldExcel.getIdCard())) {
- // 身份证类型为居民身份证
- one.setCardType(111);
- one.setIdCard(houseAndHoldExcel.getIdCard());
+ if (IdcardUtil.isValidCard(houseAndHoldExcel.getIdCard())) {
+ // 身份证类型为居民身份证
+ one.setCardType(111);
+ one.setIdCard(houseAndHoldExcel.getIdCard());
+ } else {
+ one.setIdCard(houseAndHoldExcel.getIdCard());
+ }
}
// 党员
if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())) {
@@ -546,13 +614,42 @@
boolean update = householdService.updateById(one);
if (update) {
// 住户标签处理
- householdLabelHandle(houseAndHoldExcel,one);
+ householdLabelHandle(houseAndHoldExcel, one);
+ }
+ }
+ }
+
+
+ /**
+ * 导入是网格数据绑定处理
+ *
+ * @param houseAndHoldExcel
+ * @param houseEntity
+ */
+ public void importGridHandle(HouseAndHoldExcel houseAndHoldExcel, HouseEntity houseEntity) {
+ if (!Strings.isBlank(houseAndHoldExcel.getCommunityName()) &&
+ !Strings.isBlank(houseAndHoldExcel.getGridName())) {
+ // 查询对应的网格信息
+ GridEntity gridEntity = gridService.getGridInfoByParam(houseAndHoldExcel.getCommunityName(), houseAndHoldExcel.getGridName());
+ if (null != gridEntity) {
+ // 设置场所范围
+ houseEntity.setGridId(gridEntity.getId());
+ houseEntity.setGridCode(gridEntity.getGridCode());
+ // 更新网格范围绑定
+ GridRangeEntity gridRangeEntity = new GridRangeEntity();
+ gridRangeEntity.setGridId(gridEntity.getId());
+ gridRangeEntity.setGridCode(gridEntity.getGridCode());
+ gridRangeEntity.setHouseCode(houseEntity.getHouseCode());
+ UpdateWrapper<GridRangeEntity> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("house_code", houseEntity.getHouseCode());
+ gridRangeService.update(gridRangeEntity, updateWrapper);
}
}
}
/**
* 住户标签处理
+ *
* @param houseAndHoldExcel
* @param householdEntity
*/
@@ -563,17 +660,26 @@
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);
+ // 判断是否已存在关联关系，没有则新增
+ QueryWrapper<UserHouseLabelEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("label_id", one1.getId())
+ .eq("house_code", householdEntity.getHouseCode())
+ .eq("household_id", householdEntity.getId());
+ UserHouseLabelEntity houseLabelEntity = bean.getOne(wrapper);
+ if (null == houseLabelEntity) {
+ 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);
+ }
}
}
}
@@ -676,13 +782,13 @@
*
* @param householdEntity
*/
+ @Transactional(rollbackFor = Exception.class)
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) {
+ List<User> list = userService.getUserListByPhoneOrAccount(householdEntity.getPhoneNumber());
+ if (list.size() > 0) {
+ User user = list.get(0);
//如果用户存在，则该用户id绑定住户
householdEntity.setAssociatedUserId(user.getId());
// 判断用户是否包含了居民角色,不包含则需更新
@@ -715,28 +821,26 @@
@Override
public Map<String, Object> getHouseStatistics(String code, String roleType, String aoiCode, String buildingCode, String unitCode) {
+ HouseVO house = new HouseVO();
+ CommonParamSet commonParamSet = new CommonParamSet<>().invoke(HouseVO.class, house);
Map<String, Object> objectObjectHashMap = new HashMap<>();
- 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, 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);
- objectObjectHashMap.put("result4", result4);
+ Long userId = null;
+ String roleName = SpringUtils.getRequestParam("roleName");
+ if (!Strings.isBlank(roleName) && roleName.equals("mj")){
+ userId = AuthUtil.getUserId();
}
+ List<String> communityCodeList = Func.toStrList(code);
+ Integer result1 = baseMapper.getHouseStatisticsOne(communityCodeList, userId, aoiCode, buildingCode, unitCode, roleType);
+ Integer result2 = baseMapper.getHouseStatisticsTwo(communityCodeList, aoiCode, buildingCode, unitCode, house,
+ commonParamSet.getIsAdministrator(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList());
+ Integer result3 = baseMapper.getHouseStatisticsThree(communityCodeList, userId, aoiCode, buildingCode, unitCode, roleType);
+ Integer result4 = baseMapper.getHouseStatisticsFour(communityCodeList, userId, aoiCode, buildingCode, unitCode, roleType);
+ objectObjectHashMap.put("result1", result1);
+ objectObjectHashMap.put("result2", result2);
+ objectObjectHashMap.put("result3", result3);
+ objectObjectHashMap.put("result4", result4);
return objectObjectHashMap;
}
@@ -765,13 +869,14 @@
commonParamSet.getRegionChildCodesList(),
commonParamSet.getIsAdministrator(),
map.get("code").toString());
- map.put("child",code);
+ map.put("child", code);
}
return list;
}
/**
* 房屋网格处理
+ *
* @return
*/
@Override
@@ -782,7 +887,7 @@
for (HouseEntity houseEntity : houseEntityList) {
String point = "'POINT(" + houseEntity.getLng() + " " + houseEntity.getLat() + ")'";
List<GridEntity> gridEntityList = SpringUtils.getBean(IGridService.class).spatialAnalysis(point);
- if (gridEntityList.size()>0){
+ if (gridEntityList.size() > 0) {
houseEntity.setGridCode(gridEntityList.get(0).getGridCode());
houseEntity.setGridId(gridEntityList.get(0).getId());
// 更新
@@ -795,6 +900,7 @@
/**
* 房屋警格处理
+ *
* @return
*/
@Override
@@ -805,7 +911,7 @@
for (HouseEntity houseEntity : houseEntityList) {
String point = "'POINT(" + houseEntity.getLng() + " " + houseEntity.getLat() + ")'";
List<PoliceAffairsGridEntity> policeAffairsGridEntityList = SpringUtils.getBean(IPoliceAffairsGridService.class).spatialAnalysis(point);
- if (policeAffairsGridEntityList.size()>0){
+ if (policeAffairsGridEntityList.size() > 0) {
houseEntity.setJwGridCode(policeAffairsGridEntityList.get(0).getJwGridCode());
// 更新
updateById(houseEntity);
@@ -816,18 +922,113 @@
/**
* 房屋画像统计-按房屋标签统计
+ *
* @param house
* @return
*/
@Override
- public List<Map<String,Object>> getHouseLabelStatistic(HouseVO house) {
+ public List<Map<String, Object>> getHouseLabelStatistic(HouseVO house) {
CommonParamSet commonParamSet = new CommonParamSet<>().invoke(HouseVO.class, house);
// 按房屋标签统计
- List<Map<String,Object>> list = baseMapper.getHouseLabelStatistic(house,
- commonParamSet.getIsAdministrator(),
- commonParamSet.getRegionChildCodesList(),
- commonParamSet.getGridCodeList());
+ List<String> communityCodeList = Func.toStrList(house.getCode());
+ List<Map<String, Object>> list = baseMapper.getHouseLabelStatistic(house,communityCodeList);
// 返回
return list;
}
+
+ /**
+ * 查询对应的社区编号
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public String getCommunityCode(Long id) {
+ return baseMapper.getCommunityCode(id);
+ }
+
+ /**
+ * 查询所有房屋总数
+ *
+ * @return
+ */
+ @Override
+ public int getAllListTotal() {
+ return baseMapper.getAllListTotal();
+ }
+
+ /**
+ * 查询所有的房屋
+ *
+ * @param i
+ * @param size
+ * @return
+ */
+ @Override
+ public List<HouseVO> getAllList(int i, int size) {
+ return baseMapper.getAllList(i, size);
+ }
+
+ /**
+ * 房屋标签初始化处置-根据有租客的，初始成出租，有业主没租客的初始化成自主，业主都没的就是闲置
+ *
+ * @param house
+ * @return
+ */
+ @Override
+ public boolean initHouseLabelBind(HouseVO house) {
+ IUserHouseLabelService userHouseLabelService = SpringUtils.getBean(IUserHouseLabelService.class);
+ // 查询无房屋状态的房屋数量
+ int total = baseMapper.getNotBindLabelHouseNum(house);
+ int size = 1000;
+ int num = total / size;
+ for (int i = 1; i <= num + 1; i++) {
+ // 查询无房屋状态的房屋列表集合
+ List<HouseVO> houseVOList = baseMapper.getNotBindLabelHouseList((i - 1) * size, size);
+ for (HouseVO houseEntity : houseVOList) {
+ //处理状态
+ UserHouseLabelEntity houseLabelEntity = new UserHouseLabelEntity();
+ houseLabelEntity.setHouseCode(houseEntity.getHouseCode());
+ houseLabelEntity.setLableType(2);
+ houseLabelEntity.setCreateTime(new Date());
+ if (houseEntity.getStatus() == 1) {
+ // 闲置
+ houseLabelEntity.setColor("green");
+ houseLabelEntity.setLabelName("闲置");
+ houseLabelEntity.setLabelId(1037L);
+ }
+ if (houseEntity.getStatus() == 2) {
+ // 自住
+ houseLabelEntity.setColor("blue");
+ houseLabelEntity.setLabelName("自住");
+ houseLabelEntity.setLabelId(1038L);
+ }
+ if (houseEntity.getStatus() == 3) {
+ // 出租
+ houseLabelEntity.setColor("yellow");
+ houseLabelEntity.setLabelName("出租");
+ houseLabelEntity.setLabelId(1039L);
+ }
+ // 查询当前房屋是否已有，有则更新，无则新增
+ QueryWrapper<UserHouseLabelEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("house_code", houseEntity.getHouseCode())
+ .eq("lable_type", 2);
+ UserHouseLabelEntity userHouseLabelEntity = userHouseLabelService.getOne(wrapper);
+ if (null != userHouseLabelEntity) {
+ // 更新
+ houseLabelEntity.setId(userHouseLabelEntity.getId());
+ userHouseLabelService.updateById(houseLabelEntity);
+ } else {
+ // 新增
+ userHouseLabelService.save(houseLabelEntity);
+ }
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public Map<String, Object> getHoseTotalAndAreaTotalByDistrictCode(List<String> aoiCodeList) {
+ return baseMapper.getHoseTotalAndAreaTotalByDistrictCode(aoiCodeList);
+ }
}
--
Gitblit v1.9.3