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/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 63 ++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index b4157e5..f87862a 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -30,6 +30,7 @@
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.modules.category.dto.CategoryDTO;
import org.springblade.modules.category.service.ICategoryService;
@@ -38,6 +39,7 @@
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
+import org.springblade.modules.doorplateAddress.excel.ImportDoorplateExcel;
import org.springblade.modules.doorplateAddress.mapper.DoorplateAddressMapper;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
@@ -276,22 +278,23 @@
houseParam.setRoleName(roleName);
}
// 获取网格员对应的地址编号集合
- List<String> addressCodeList = getHouseCodeList(houseParam);
+// List<String> addressCodeList = getHouseCodeList(houseParam);
+ List<String> gridCodeList = getGridCodeList(houseParam);
List<String> communityCodeList = getCommunityCodeList(houseParam);
// 获取网格员对应的网格信息
- getGridInfoByGridman(houseParam);
+// getGridInfoByGridman(houseParam);
// 查小区，场所
if (houseParam.getType() == 1) {
// 根据社区名称查询小区集合
- list = baseMapper.getDistrictList(houseParam, addressCodeList, communityCodeList);
+ list = baseMapper.getDistrictList(houseParam, gridCodeList, communityCodeList);
}
// 查楼栋，街路巷
if (houseParam.getType() == 2) {
- return getBuildLevelData(houseParam, addressCodeList, map);
+ return getBuildLevelData(houseParam, gridCodeList, map);
}
// 查户室
if (houseParam.getType() == 3) {
- return getHouseLevelData(houseParam, addressCodeList, map);
+ return getHouseLevelData(houseParam, gridCodeList, map);
}
return list;
}
@@ -771,6 +774,28 @@
}
/**
+ * 根据角色获取网格编号集合
+ *
+ * @param houseParam
+ * @return
+ */
+ private List<String> getGridCodeList(HouseParam houseParam) {
+ List<String> gridCodeList = new ArrayList<>();
+ String userId = AuthUtil.getUserId().toString();
+ houseParam.setUserId(userId);
+ if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
+ if ((houseParam.getRoleName().equals("wgy") || houseParam.getRoleName().equals("wzcj"))
+ && !userId.equals("1726859808689696770")) {
+ // 查询对应社区编号集合
+ gridCodeList
+ = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, houseParam.getRoleName());
+ }
+ }
+ // 返回
+ return gridCodeList;
+ }
+
+ /**
* 房屋数据处理
*
* @return
@@ -1038,7 +1063,9 @@
// 查询对应的社区code
list = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, roleName);
if (null != list && list.size() > 0) {
- boolean contains = list.contains(doorplateAddressVO.getNeiCode());
+ // 存在一个社区有多个派出所，所以社区有36110200201702 存后面添加两位，对比的时候要删除后面两位
+ List<String> collect = list.stream().map(s -> s.length() > 12 ? s.substring(0, s.length() - 2) : s).collect(Collectors.toList());
+ boolean contains = collect.contains(doorplateAddressVO.getNeiCode());
if (contains) {
doorplateAddressVO.setIsJur(1);
}
@@ -1200,4 +1227,28 @@
// backblastPubRecord.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
// }
}
+
+ @Override
+ public String importDoorplate(List<ImportDoorplateExcel> read) {
+ int i = 1;
+ for (ImportDoorplateExcel importDoorplateExcel : read) {
+ System.out.println("第-" + i + "-条记录");
+ i++;
+ DoorplateAddressEntity copyDoorplateAddress = Objects.requireNonNull(BeanUtil.copy(importDoorplateExcel, DoorplateAddressEntity.class));
+ DoorplateAddressEntity doorplateAddressEntity = baseMapper.selectOne(Wrappers.<DoorplateAddressEntity>lambdaQuery()
+ .eq(DoorplateAddressEntity::getAddressCode, importDoorplateExcel.getAddressCode()));
+ if (null == doorplateAddressEntity) {
+ baseMapper.insert(copyDoorplateAddress);
+ } else {
+ doorplateAddressEntity.setStreetRuCode(copyDoorplateAddress.getStreetRuCode());
+ doorplateAddressEntity.setStreetRuName(copyDoorplateAddress.getStreetRuName());
+ doorplateAddressEntity.setNeiName(copyDoorplateAddress.getNeiName());
+ doorplateAddressEntity.setAoiCode(copyDoorplateAddress.getAoiCode());
+ doorplateAddressEntity.setAoiName(copyDoorplateAddress.getAoiName());
+ baseMapper.update(doorplateAddressEntity, Wrappers.<DoorplateAddressEntity>lambdaQuery()
+ .eq(DoorplateAddressEntity::getAddressCode, importDoorplateExcel.getAddressCode()));
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3