From 8f5aeec641d916806553ef9772d55e17e93db150 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 15 Jul 2024 18:28:39 +0800
Subject: [PATCH] 代码优化
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 621 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 464 insertions(+), 157 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 6cb1b6b..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
@@ -21,11 +21,17 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.SysCache;
+import org.springblade.common.constant.CommonConstant;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.node.TreeStringNode;
+import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.ComplexNumberStringComparator;
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;
import org.springblade.modules.community.entity.CommunityEntity;
@@ -33,34 +39,43 @@
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;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.FuncNode;
import org.springblade.modules.grid.entity.GridEntity;
-import org.springblade.modules.grid.entity.GridmanEntity;
+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.grid.service.IGridmanService;
+import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.house.entity.HouseEntity;
+import org.springblade.modules.house.entity.UserHouseLabelEntity;
import org.springblade.modules.house.service.IHouseRentalService;
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.HouseRentalVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
+import org.springblade.modules.place.entity.PlacePoiLabel;
import org.springblade.modules.place.service.IPlaceExtService;
+import org.springblade.modules.place.service.IPlacePoiLabelService;
import org.springblade.modules.place.service.IPlaceService;
-import org.springblade.modules.place.vo.PlaceVO;
-import org.springblade.modules.system.entity.Region;
+import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
+import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.service.IRegionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
@@ -105,6 +120,9 @@
@Autowired
private ICommunityService communityService;
+ @Autowired
+ private IPoliceAffairsGridService policeAffairsGridService;
+
@Override
public IPage<DoorplateAddressVO> selectDoorplateAddressPage(IPage<DoorplateAddressVO> page, DoorplateAddressVO doorplateAddress) {
@@ -114,36 +132,43 @@
/**
* 根据角色获取功能集合数据
*
- * @param type 1：查社区 2:查房屋和场所（居民角色）
- * @param roleName
+ * @param type 1：查社区 2:查房屋和场所（居民角色）--2024/04/10 弃用
+ * @param roleNames --2024/04/10 弃用
* @return
*/
@Override
- public Object getFuncList(Integer type, String roleName) {
+ public Object getFuncList(Integer type, String roleNames) {
HouseParam houseParam = new HouseParam();
String userId = AuthUtil.getUserId().toString();
houseParam.setUserId(userId);
List<String> stringList = new ArrayList<>();
List<String> communityList = new ArrayList<>();
- if (null != roleName && !roleName.equals("")) {
- houseParam.setRoleName(roleName);
- if (roleName.equals("网格员") && !userId.equals("1726859808689696770")) {
- // 查询对应的房屋地址code
- stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
- }
- if (roleName.equals("民警")) {
- // 查询对应的社区编号
- communityList = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
- }
- }
List<TreeStringNode> list = new ArrayList<>();
- if (null != type) {
- // 如果是网格管理员，系统管理员,民警
- if (type == 1) {
+ // 获取请求头中的角色别名
+ String roleName = SpringUtils.getRequestParam("roleName");
+ if (!Strings.isBlank(roleName)) {
+ // 如果是网格管理员，系统管理员,民警,无诈场所采集
+ if (roleName.equals("admin") || roleName.equals("wzcj") ||
+ roleName.equals("wgy") || roleName.equals("mj")) {
+ houseParam.setRoleName(roleName);
+ if ((roleName.equals("wgy") || roleName.equals("wzcj"))
+ && !userId.equals("1726859808689696770")) {
+ // 查询对应的网格code
+// stringList = gridService.getGridListByUserId(AuthUtil.getUserId());
+ stringList = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, roleName);
+ }
+ if (roleName.equals("mj")) {
+ // 查询对应的社区编号
+ communityList = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, roleName);
+ }
// 查询街道
List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam, stringList, communityList);
// 查询社区
List<TreeStringNode> neiList = baseMapper.getRegionListByGroupNei(houseParam, stringList, communityList);
+ // 查询网格
+ if (stringList.size() > 0) {
+ List<GridEntity> list1 = gridService.list(Wrappers.<GridEntity>lambdaQuery().in(GridEntity::getGridCode, stringList));
+ }
// 遍历
for (TreeStringNode treeNode : townList) {
// 遍历
@@ -158,7 +183,7 @@
return townList;
}
// 如果是居民
- if (type == 2 || type == 3) {
+ if (roleName.equals("inhabitant") || roleName.equals("xyzt") || roleName.equals("xyty")) {
return getInhabitantInfo(list);
}
}
@@ -210,7 +235,7 @@
list.add(houseNode);
TreeStringNode placeNode = new TreeStringNode();
- placeNode.setName("场所");
+ placeNode.setName("经营场所");
placeNode.setId("2");
placeNode.setHasChildren(true);
placeNode.setChildren(placeNodeList);
@@ -228,7 +253,7 @@
}
if (placeNodeList.size() > 0) {
TreeStringNode placeNode = new TreeStringNode();
- placeNode.setName("场所");
+ placeNode.setName("经营场所");
placeNode.setId("2");
placeNode.setHasChildren(true);
placeNode.setChildren(placeNodeList);
@@ -248,23 +273,28 @@
public Object getHousesList(HouseParam houseParam) {
List<TreeStringNode> list = new ArrayList<>();
Map<String, Object> map = new HashMap<>(2);
+ String roleName = SpringUtils.getRequestParam("roleName");
+ if (!Strings.isBlank(roleName)) {
+ houseParam.setRoleName(roleName);
+ }
// 获取网格员对应的地址编号集合
- List<String> stringList = 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, stringList, communityCodeList);
+ list = baseMapper.getDistrictList(houseParam, gridCodeList, communityCodeList);
}
// 查楼栋，街路巷
if (houseParam.getType() == 2) {
- return getBuildLevelData(houseParam, map);
+ return getBuildLevelData(houseParam, gridCodeList, map);
}
// 查户室
if (houseParam.getType() == 3) {
- return getHouseLevelData(houseParam, map);
+ return getHouseLevelData(houseParam, gridCodeList, map);
}
return list;
}
@@ -275,22 +305,19 @@
* @param houseParam
*/
private void getGridInfoByGridman(HouseParam houseParam) {
- if (houseParam.getRoleName().equals("网格员")) {
- QueryWrapper<GridmanEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted", 0)
- .eq("user_id", AuthUtil.getUserId());
- List<GridmanEntity> list = gridmanService.list(wrapper);
+ if (houseParam.getRoleName().equals("wgy")) {
+ if (Strings.isBlank(houseParam.getRoleName())) {
+ houseParam.setRoleName(SpringUtils.getRequestParam("roleName"));
+ }
+ // 查询网格员的网格编号集合
+ List<String> gridCodeList
+ = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, houseParam.getRoleName());
+ String communityCode = SpringUtils.getRequestParam("communityCode");
+ List<GridVO> list = gridService.getGridListByComAndList(communityCode, gridCodeList);
if (list.size() > 0) {
- GridmanEntity gridmanEntity = list.get(0);
- GridEntity gridEntity = gridService.getById(gridmanEntity.getGridId());
- // 查询居委会
- Region region = regionService.getById(gridEntity.getCommunityCode());
- if (null != region) {
- houseParam.setCommunityName(region.getName());
- }
- if (!Strings.isBlank(gridEntity.getGridName())) {
- houseParam.setGridName(gridEntity.getGridName());
- }
+ GridVO grid = list.get(0);
+ houseParam.setCommunityName(grid.getCommunityName());
+ houseParam.setGridName(grid.getGridName());
}
}
}
@@ -302,8 +329,7 @@
* @param map
* @return
*/
- private Map<String, Object> getHouseLevelData(HouseParam houseParam, Map<String, Object> map) {
- List<String> stringList = getHouseCodeList(houseParam);
+ private Map<String, Object> getHouseLevelData(HouseParam houseParam, List<String> stringList, Map<String, Object> map) {
// 判断地址类型
if (houseParam.getAddressType() == 1) {
List<FuncNode> aoiList = new ArrayList<>();
@@ -376,7 +402,7 @@
* @param map
* @return
*/
- private Object getBuildLevelData(HouseParam houseParam, Map<String, Object> map) {
+ private Object getBuildLevelData(HouseParam houseParam, List<String> stringList, Map<String, Object> map) {
if (houseParam.getAddressType() == 4) {
// 获取网格员对应的网格信息
getGridInfoByGridman(houseParam);
@@ -387,7 +413,6 @@
// 返回
return map;
} else {
- List<String> stringList = getHouseCodeList(houseParam);
// 判断 code 长度，如果 code 长度大于 12 则为小区查楼栋/商铺，否则则按社区查街路巷
if (houseParam.getCode().length() > 12) {
List<TreeStringNode> aoiList = new ArrayList<>();
@@ -531,8 +556,7 @@
});
// 排序
sortUnit(tempList, list);
-// List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getUnitName())).collect(Collectors.toList());
-// list.addAll(sortList);
+
}
}
@@ -559,7 +583,11 @@
} else if (funcNode.getUnitName().contains("六")) {
funcNode.setSort(6);
} else {
- funcNode.setSort(1);
+ if (!containsNumber(funcNode.getUnitName())) {
+ funcNode.setSort(1);
+ } else {
+ funcNode.setSort(getNumber(funcNode.getUnitName()));
+ }
}
}
// 排序
@@ -569,20 +597,54 @@
}
/**
+ * 判断是否包含数字
+ *
+ * @param str
+ * @return
+ */
+ public static boolean containsNumber(String str) {
+ Pattern pattern = Pattern.compile(".*\\d+.*");
+ Matcher matcher = pattern.matcher(str);
+ return matcher.matches();
+ }
+
+ /**
+ * 取出字符串中的数字
+ *
+ * @param str
+ * @return
+ */
+ public static int getNumber(String str) {
+ StringBuilder sb = new StringBuilder();
+ for (char c : str.toCharArray()) {
+ if (Character.isDigit(c)) {
+ sb.append(c);
+ }
+ }
+ return Integer.parseInt(sb.toString());
+ }
+
+ /**
* 查询房屋及出租详情信息
*
* @param code 门牌地址编号
* @return
*/
@Override
- public Object getHouseRentInfo(String code) {
- // 先查询门牌信息
- DoorplateAddressVO doorplateAddressDetailVO = baseMapper.getDoorplateAddressDetailByCode(code);
+ public Object getHouseRentInfo(String code, Long houseId) {
+ DoorplateAddressVO doorplateAddressDetailVO = new DoorplateAddressVO();
+ if (Strings.isBlank(code) && null != houseId) {
+ // 先查询门牌信息
+ doorplateAddressDetailVO = baseMapper.getDoorplateAddressDetailByHouseId(houseId);
+ } else {
+ // 先查询门牌信息
+ doorplateAddressDetailVO = baseMapper.getDoorplateAddressDetailByCode(code);
+ }
if (null != doorplateAddressDetailVO) {
// 查询房屋出租情况
- List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(code);
+ List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(doorplateAddressDetailVO.getAddressCode());
// 查询房屋人员情况
- List<HouseholdVO> householdVOS = householdService.getHouseholdListByCode(code);
+ List<HouseholdVO> householdVOS = householdService.getHouseholdListByCode(doorplateAddressDetailVO.getAddressCode());
// 设置数据
doorplateAddressDetailVO.setHouseRentalList(houseRentalVOS);
doorplateAddressDetailVO.setHouseholdList(householdVOS);
@@ -642,12 +704,12 @@
/**
* 查询社区信息
*
- * @param name
+ * @param doorplateAddressEntity
* @return
*/
@Override
- public List<DoorplateAddressEntity> getAllDoorplateAddress(String name) {
- return baseMapper.getAllDoorplateAddress(name);
+ public List<DoorplateAddressEntity> getAllDoorplateAddress(DoorplateAddressEntity doorplateAddressEntity) {
+ return baseMapper.getAllDoorplateAddress(doorplateAddressEntity);
}
/**
@@ -658,6 +720,10 @@
*/
@Override
public List<DoorplateAddressVOTree> getHouseTree(HouseParam houseParam) {
+ String roleName = SpringUtils.getRequestParam("roleName");
+ if (!Strings.isBlank(roleName)) {
+ houseParam.setRoleName(roleName);
+ }
List<String> stringList = getHouseCodeList(houseParam);
// 根据社区居委会编号获取对应的小区/楼栋/单元/户室
return NodeTreeUtil.getAddressNodeTree(baseMapper.getHouseTree(houseParam, stringList));
@@ -670,16 +736,22 @@
* @return
*/
private List<String> getHouseCodeList(HouseParam houseParam) {
- List<String> stringList = new ArrayList<>();
+ List<String> addressCodeList = new ArrayList<>();
String userId = AuthUtil.getUserId().toString();
houseParam.setUserId(userId);
if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
- if (houseParam.getRoleName().equals("网格员") && !userId.equals("1726859808689696770")) {
+ if ((houseParam.getRoleName().equals("wgy") || houseParam.getRoleName().equals("wzcj"))
+ && !userId.equals("1726859808689696770")) {
+ // 先取对应网格员对应的网格编号集合
+ List<String> gridCodeList
+ = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, houseParam.getRoleName());
// 查询对应的房屋地址code
- stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+// addressCodeList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId(),null);
+ addressCodeList =
+ gridService.getAddressCodeListByGridCodeList(SpringUtils.getRequestParam("communityCode"), gridCodeList);
}
}
- return stringList;
+ return addressCodeList;
}
/**
@@ -693,12 +765,34 @@
String userId = AuthUtil.getUserId().toString();
houseParam.setUserId(userId);
if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
- if (houseParam.getRoleName().equals("民警") && !userId.equals("1726859808689696770")) {
- // 查询对应的房屋地址code
- stringList = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
+ if (houseParam.getRoleName().equals("mj") && !userId.equals("1726859808689696770")) {
+ // 查询对应社区编号集合
+ stringList = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, houseParam.getRoleName());
}
}
return stringList;
+ }
+
+ /**
+ * 根据角色获取网格编号集合
+ *
+ * @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;
}
/**
@@ -707,9 +801,9 @@
* @return
*/
@Override
- public Object houseDataHandle() {
+ public Object houseDataHandle(String townName) {
// 处理房屋数据
- handleHouseData();
+ handleHouseData(townName);
return null;
}
@@ -717,41 +811,67 @@
/**
* 处理房屋数据
*/
- private void handleHouseData() {
- // 查询所有户室数据（未入库的）
- List<DoorplateAddressEntity> list = baseMapper.getHouseList();
- // 需要新增的房屋 list
- List<HouseEntity> houseList = new ArrayList<>();
- // 处理户室数据
- for (DoorplateAddressEntity doorplateAddressEntity : list) {
- // 查询是否已存在，存在就插入，不存在则插入
- QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("house_code", doorplateAddressEntity.getAddressCode())
- .eq("is_deleted", 0);
- HouseEntity one = houseService.getOne(wrapper);
- if (null == one) {
- HouseEntity houseEntity = new HouseEntity();
- houseEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
- houseEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
- houseEntity.setDistrictName(doorplateAddressEntity.getAoiName());
- houseEntity.setHouseName(doorplateAddressEntity.getAddressName());
- houseEntity.setFloor(doorplateAddressEntity.getFloor());
- houseEntity.setBuilding(doorplateAddressEntity.getBuildingName());
- houseEntity.setUnit(doorplateAddressEntity.getUnitName());
- houseEntity.setRoom(doorplateAddressEntity.getHouseName());
- houseEntity.setBuildingNo(doorplateAddressEntity.getBuildingCode());
- houseEntity.setCreateUser(AuthUtil.getUserId().toString());
- houseEntity.setCreateTime(new Date());
- houseEntity.setUpdateUser(AuthUtil.getUserId().toString());
- houseEntity.setUpdateTime(new Date());
- // 设置来源 1：地址总表 2：国控采集
- houseEntity.setSource(1);
- // 加入集合
- houseList.add(houseEntity);
+ private void handleHouseData(String townName) {
+ // 查询总数
+ Integer count = baseMapper.getNotHouseListCount(townName);
+ if (count > 0) {
+ int num = count / 1000;
+ for (int i = 0; i <= num + 1; i++) {
+ // 查询所有户室数据（未入库的）
+ List<DoorplateAddressEntity> list = baseMapper.getHouseList(townName);
+ // 需要新增的房屋 list
+ List<HouseEntity> houseList = new ArrayList<>();
+ // 处理户室数据
+ for (DoorplateAddressEntity doorplateAddressEntity : list) {
+ // 查询是否已存在，存在就插入，不存在则插入
+ QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("house_code", doorplateAddressEntity.getAddressCode())
+ .eq("is_deleted", 0);
+ HouseEntity one = houseService.getOne(wrapper);
+ if (null == one) {
+ HouseEntity houseEntity = new HouseEntity();
+ houseEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
+ houseEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
+ houseEntity.setDistrictName(doorplateAddressEntity.getAoiName());
+ houseEntity.setLng(doorplateAddressEntity.getX());
+ houseEntity.setLat(doorplateAddressEntity.getY());
+ houseEntity.setHouseName(doorplateAddressEntity.getAddressName());
+ houseEntity.setAddress(doorplateAddressEntity.getAddressName());
+ houseEntity.setFloor(doorplateAddressEntity.getFloor());
+ houseEntity.setBuilding(doorplateAddressEntity.getBuildingName());
+ houseEntity.setUnit(doorplateAddressEntity.getUnitName());
+ houseEntity.setRoom(doorplateAddressEntity.getHouseName());
+ houseEntity.setBuildingNo(doorplateAddressEntity.getBuildingCode());
+ houseEntity.setCreateUser(AuthUtil.getUserId().toString());
+ houseEntity.setCreateTime(new Date());
+ houseEntity.setUpdateUser(AuthUtil.getUserId().toString());
+ houseEntity.setUpdateTime(new Date());
+ // 设置来源 1：地址总表 2：国控采集
+ houseEntity.setSource(1);
+ // 根据位置设置网格，警格编号
+ String point = "'POINT(" + doorplateAddressEntity.getX() + " " + doorplateAddressEntity.getY() + ")'";
+ //点坐标解析网格
+ List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
+ if (gridEntityList.size() > 0) {
+ GridEntity gridEntity = gridEntityList.get(0);
+ houseEntity.setGridId(gridEntity.getId());
+ houseEntity.setGridCode(gridEntity.getGridCode());
+ }
+ //点坐标解析警格
+ List<PoliceAffairsGridEntity> policeAffairsGridEntityList = policeAffairsGridService.spatialAnalysis(point);
+ if (policeAffairsGridEntityList.size() > 0) {
+ PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntityList.get(0);
+ houseEntity.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
+ }
+ // 加入集合
+ houseList.add(houseEntity);
+ }
+ }
+ // 批量插入
+ houseService.saveBatch(houseList);
}
}
- // 批量插入
- houseService.saveBatch(houseList);
+
}
/**
@@ -786,6 +906,17 @@
districtService.save(districtEntity);
// aoiList.add(districtEntity);
}
+// else {
+// // 更新
+// one.setCommunityCode(addressEntity.getNeiCode());
+// one.setAoiCode(addressEntity.getAoiCode());
+// one.setName(addressEntity.getAoiName());
+// one.setAddress(addressEntity.getAddressName());
+// one.setLng(addressEntity.getX());
+// one.setLat(addressEntity.getY());
+// // 加入集合
+// districtService.updateById(one);
+// }
}
// 批量插入
// districtService.saveBatch(aoiList);
@@ -801,37 +932,53 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Object placeDataHandle(String townName) {
- // 查询所有的地址表和场所表差集集合
- List<DoorplateAddressEntity> list = baseMapper.getNotInPlaceList(townName);
- // 创建场所集合对象
- List<PlaceEntity> placeList = new ArrayList<>();
- if (list.size() > 0) {
- // 将场所数据保存到场所表中
- for (DoorplateAddressEntity addressEntity : list) {
- // pio 名称不为空的进行插入操作
-// if (!Strings.isBlank(addressEntity.getPoi())) {
- PlaceEntity placeEntity = new PlaceEntity();
- placeEntity.setHouseCode(addressEntity.getAddressCode());
- placeEntity.setPlaceName(addressEntity.getPoi());
- placeEntity.setLng(addressEntity.getX());
- placeEntity.setLat(addressEntity.getY());
- placeEntity.setLocation(addressEntity.getAddressName());
- // 设置来源( 1：地址总表 2：国控采集 3:商超)
- placeEntity.setSource(1);
- // 待完善
- placeEntity.setStatus(1);
- // 默认为非九小场所
- placeEntity.setIsNine(2);
- // 加入集合
-// placeList.add(placeEntity);
- // 保存
- placeService.save(placeEntity);
- // 新增场所详情
- savePlaceExtAndTaskInfo(placeEntity);
-// }
+ // 查询总数
+ Integer count = baseMapper.getNotPlaceListCount(townName);
+ if (count > 0) {
+ int num = count / 1000;
+ for (int i = 0; i <= num + 1; i++) {
+ // 查询所有的地址表和场所表差集集合
+ List<DoorplateAddressEntity> list = baseMapper.getNotInPlaceList(townName);
+ if (list.size() > 0) {
+ // 将场所数据保存到场所表中
+ for (DoorplateAddressEntity addressEntity : list) {
+ // pio 名称不为空的进行插入操作
+ PlaceEntity placeEntity = new PlaceEntity();
+ placeEntity.setHouseCode(addressEntity.getAddressCode());
+ placeEntity.setPlaceName(addressEntity.getPoi());
+ placeEntity.setLng(addressEntity.getX());
+ placeEntity.setLat(addressEntity.getY());
+ placeEntity.setLocation(addressEntity.getAddressName());
+ // 设置来源( 1：地址总表 2：国控采集 3:商超)
+ placeEntity.setSource(1);
+ // 待完善
+ placeEntity.setStatus(1);
+ // 默认为非九小场所
+ placeEntity.setIsNine(2);
+ // 默认为现场采集
+ placeEntity.setIsScene(1);
+ // 根据位置设置网格，警格编号
+ String point = "'POINT(" + addressEntity.getX() + " " + addressEntity.getY() + ")'";
+ //点坐标解析网格
+ List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
+ if (gridEntityList.size() > 0) {
+ GridEntity gridEntity = gridEntityList.get(0);
+ placeEntity.setGridId(gridEntity.getId());
+ placeEntity.setGridCode(gridEntity.getGridCode());
+ }
+ //点坐标解析警格
+ List<PoliceAffairsGridEntity> policeAffairsGridEntityList = policeAffairsGridService.spatialAnalysis(point);
+ if (policeAffairsGridEntityList.size() > 0) {
+ PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntityList.get(0);
+ placeEntity.setJwGridCode(policeAffairsGridEntity.getJwGridCode());
+ }
+ // 保存
+ placeService.save(placeEntity);
+ // 新增场所详情
+ savePlaceExtAndTaskInfo(placeEntity);
+ }
+ }
}
- // 批量插入
-// savePlaceExtAndTaskInfo(placeList);
}
// 返回
return null;
@@ -839,6 +986,7 @@
/**
* 新增场所详情
+ *
* @param placeEntity
*/
public void savePlaceExtAndTaskInfo(PlaceEntity placeEntity) {
@@ -846,8 +994,8 @@
placeExtEntity.setPlaceId(placeEntity.getId());
// 判断是否已存在，已存在则不新增
QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted",0)
- .eq("place_id",placeEntity.getId());
+ wrapper.eq("is_deleted", 0)
+ .eq("place_id", placeEntity.getId());
PlaceExtEntity one = placeExtService.getOne(wrapper);
if (null == one) {
placeExtEntity.setPlaceId(placeEntity.getId());
@@ -869,38 +1017,81 @@
public Object getDetail(DoorplateAddressVO doorplateAddress) {
List<String> list = new ArrayList<>();
// 扫码时调用，需判断是否有权限查看
- DoorplateAddressVO one = baseMapper.getDoorplateAddressVODetail(doorplateAddress);
- if (null != one) {
+ DoorplateAddressVO doorplateAddressVO = baseMapper.getDoorplateAddressVODetail(doorplateAddress);
+ // 创建数组
+ String[] schoolName = {"幼儿园", "小学", "中学", "高中", "大专", "学校"};
+ List<String> stringList = new ArrayList<>(Arrays.asList(schoolName));
+ if (null != doorplateAddressVO) {
+ if (Strings.isNotBlank(doorplateAddressVO.getAoiName()) && stringList.stream()
+ .anyMatch(doorplateAddressVO.getAoiName()::contains)) {
+ doorplateAddressVO.setAddressLevel(1);
+ doorplateAddressVO.setDoorplateType(DictConstant.centre_DOORPLATE);
+ }
+ if (Strings.isNotBlank(doorplateAddressVO.getPoi()) && stringList.stream()
+ .anyMatch(doorplateAddressVO.getPoi()::contains)) {
+ doorplateAddressVO.setAddressLevel(1);
+ doorplateAddressVO.setDoorplateType(DictConstant.centre_DOORPLATE);
+ }
+
// 不限制
- one.setIsJur(1);
- if (!Strings.isBlank(doorplateAddress.getRoleName())) {
+ doorplateAddressVO.setIsJur(1);
+ String roleName = SpringUtils.getRequestParam("roleName");
+ if (!Strings.isBlank(roleName)) {
// 判断是否有权限
- if (doorplateAddress.getRoleName().equals("网格员")) {
- list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
- boolean contains = list.contains(doorplateAddress.getAddressCode());
- if (list.size() == 0 || !contains) {
- // 无权限
- one.setIsJur(2);
- } else {
- one.setIsJur(1);
- }
- } else if (doorplateAddress.getRoleName().equals("民警")) {
+ if (roleName.equals("wgy") || roleName.equals("wzcj")) {
// 无权限
- one.setIsJur(2);
- // 查询对应的社区code
- list = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
- if (null!=list && list.size()>0){
- boolean contains = list.contains(one.getNeiCode());
+ doorplateAddressVO.setIsJur(2);
+// list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId(),doorplateAddress.getAddressCode());
+ list = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, roleName);
+ if (null != list && list.size() > 0) {
+ List<String> arrayList = new ArrayList<>();
+ for (String gridCode : list) {
+ if (gridCode.length() > 12) {
+ arrayList.add(gridCode.substring(0, gridCode.length() - 2));
+ } else {
+ arrayList.add(gridCode);
+ }
+ }
+ boolean contains = arrayList.contains(doorplateAddressVO.getNeiCode());
if (contains) {
- one.setIsJur(1);
+ doorplateAddressVO.setIsJur(1);
+ }
+ }
+ } else if (roleName.equals("mj")) {
+ // 无权限
+ doorplateAddressVO.setIsJur(2);
+ // 查询对应的社区code
+ list = SysCache.getGridRegionChildCodesByDeptId(AuthUtil.getDeptId(), null, roleName);
+ if (null != list && list.size() > 0) {
+ // 存在一个社区有多个派出所，所以社区有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);
}
}
} else {
// 不限制
- one.setIsJur(1);
+ doorplateAddressVO.setIsJur(1);
}
}
- return one;
+ if (doorplateAddressVO != null) {
+ // 获取房屋标签
+ IUserHouseLabelService userHouseLabelService = SpringUtils.getBean(IUserHouseLabelService.class);
+ List<UserHouseLabelEntity> houseLabelEntityList = userHouseLabelService.list(Wrappers.<UserHouseLabelEntity>lambdaQuery()
+ .eq(UserHouseLabelEntity::getHouseCode, doorplateAddressVO.getAddressCode())
+ .eq(UserHouseLabelEntity::getLableType, 2));
+ doorplateAddressVO.setUserHouseLabelVOList(houseLabelEntityList);
+ // 查询房屋类别
+ IPlacePoiLabelService poiLabelService = SpringUtils.getBean(IPlacePoiLabelService.class);
+ PlacePoiLabel placePoiLabel = poiLabelService.getOne(Wrappers.<PlacePoiLabel>lambdaQuery()
+ .eq(PlacePoiLabel::getPlaceId, doorplateAddressVO.getPid())
+ .eq(PlacePoiLabel::getType, CommonConstant.NUMBER_THREE));
+ if (ObjectUtil.isNotEmpty(placePoiLabel)) {
+ doorplateAddressVO.setLableCode(placePoiLabel.getPoiCode());
+ }
+ }
+ return doorplateAddressVO;
}
return null;
}
@@ -936,12 +1127,128 @@
/**
* 查询场所标准地址数据
- * @param doorplateAddressVO
+ *
+ * @param doorplateAddress
* @param size
* @return
*/
@Override
- public Object getPlaceList(DoorplateAddressVO doorplateAddressVO, Integer size) {
- return baseMapper.getPlaceList(doorplateAddressVO,size);
+ public Object getPlaceList(DoorplateAddressVO doorplateAddress, Integer size) {
+ // 公共参数设置
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(DoorplateAddressVO.class, doorplateAddress);
+ return baseMapper.getPlaceList(doorplateAddress,
+ null == size ? 10 : size,
+ commonParamSet.getGridCodeList(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator()
+ );
+ }
+
+ /**
+ * 通过小区id 查询楼栋编码
+ *
+ * @param districtId
+ * @return
+ */
+ @Override
+ public List<DoorplateAddressVO> getHouseBuildingCode(String districtId) {
+ return baseMapper.getHouseBuildingCode(districtId);
+ }
+
+ /**
+ * 网格范围数据处理
+ *
+ * @return
+ */
+ @Override
+ public boolean gridRangeDataHandle(String townName, String communityName) {
+ // 查询未匹配的网格范围地址信息
+ // 查询总数
+ Integer count = baseMapper.getNotBindGridRangeDoorListCount(townName, communityName);
+ if (count > 0) {
+ IGridRangeService gridRangeService = SpringUtils.getBean(IGridRangeService.class);
+ int num = count / 1000;
+ for (int i = 0; i <= num + 1; i++) {
+ // 查询所有未匹配的网格范围地址数据
+ List<DoorplateAddressEntity> list = baseMapper.getNotBindGridRangeDoorList(townName, communityName);
+ // 需要新增的网格范围 list
+ List<GridRangeEntity> gridRangeEntityList = new ArrayList<>();
+ // 处理户室数据
+ for (DoorplateAddressEntity doorplateAddressEntity : list) {
+ // 查询是否已存在，存在就插入，不存在则插入
+ QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("house_code", doorplateAddressEntity.getAddressCode());
+ GridRangeEntity one = gridRangeService.getOne(wrapper);
+ if (null == one) {
+ // 设置网格
+ String point = "'POINT(" + doorplateAddressEntity.getX() + " " + doorplateAddressEntity.getY() + ")'";
+ //点坐标解析网格
+ List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
+ if (gridEntityList.size() > 0) {
+ GridRangeEntity gridRangeEntity = new GridRangeEntity();
+ gridRangeEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
+ gridRangeEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
+ gridRangeEntity.setBuilding(doorplateAddressEntity.getBuildingCode());
+ GridEntity gridEntity = gridEntityList.get(0);
+ gridRangeEntity.setGridId(gridEntity.getId());
+ gridRangeEntity.setGridCode(gridEntity.getGridCode());
+ // 加入集合
+ gridRangeEntityList.add(gridRangeEntity);
+ }
+ }
+ }
+ // 批量插入
+ gridRangeService.saveBatch(gridRangeEntityList);
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 设置警格网格信息
+ *
+ * @param doorplateAddressEntity
+ */
+ public void setGridInfo(DoorplateAddressEntity doorplateAddressEntity, GridRangeEntity gridRangeEntity) {
+ // 根据位置设置网格，警格编号
+// IPoliceAffairsGridService policeAffairsGridService = SpringUtils.getBean(IPoliceAffairsGridService.class);
+ String point = "'POINT(" + doorplateAddressEntity.getX() + " " + doorplateAddressEntity.getY() + ")'";
+ //点坐标解析网格
+ List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
+ if (gridEntityList.size() > 0) {
+ GridEntity gridEntity = gridEntityList.get(0);
+ gridRangeEntity.setGridId(gridEntity.getId());
+ gridRangeEntity.setGridCode(gridEntity.getGridCode());
+ }
+// //点坐标解析警格
+// List<PoliceAffairsGridEntity> policeAffairsGridEntityList = policeAffairsGridService.spatialAnalysis(point);
+// if (policeAffairsGridEntityList.size()>0){
+// PoliceAffairsGridEntity policeAffairsGridEntity = policeAffairsGridEntityList.get(0);
+// 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