From 2b1a74f4faa5a00a294bdc6a6d956c2e009cf467 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 16 Apr 2024 15:32:09 +0800
Subject: [PATCH] 管理员过滤文章
---
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 150 insertions(+), 26 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..e141664 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,7 +16,9 @@
*/
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;
@@ -30,6 +32,8 @@
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.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;
@@ -49,6 +53,8 @@
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.place.excel.PlaceExcel;
+import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.Region;
@@ -247,6 +253,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 +263,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 +312,35 @@
houseEntity.setHouseCode(IdUtils.getIdBy36());
houseEntity.setSource(2);
}
+ // 网格处理
+ importGridHandle(houseAndHoldExcel,houseEntity);
// 新增
save(houseEntity);
}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 +348,8 @@
one.setBuilding(houseAndHoldExcel.getBuilding());
one.setArea(houseAndHoldExcel.getArea());
one.setPropertyPrice(houseAndHoldExcel.getPropertyPrice());
+ // 网格处理
+ importGridHandle(houseAndHoldExcel,one);
// 更新
updateById(one);
}
@@ -347,9 +397,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 +518,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())) {
@@ -551,6 +609,33 @@
}
}
+
+ /**
+ * 导入是网格数据绑定处理
+ * @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
@@ -563,17 +648,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 +770,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());
// 判断用户是否包含了居民角色,不包含则需更新
@@ -830,4 +924,34 @@
// 返回
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);
+ }
}
--
Gitblit v1.9.3