From 02f3b2a577143724b09a70cd13cd3e9256f5fc21 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 12 Mar 2024 18:00:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 153 +++++++++++++++++++++++++++++++++------------------
1 files changed, 99 insertions(+), 54 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..48456f5 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
@@ -23,6 +23,7 @@
import org.apache.logging.log4j.util.Strings;
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.core.secure.utils.AuthUtil;
@@ -54,6 +55,7 @@
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceVO;
+import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.service.IRegionService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -105,6 +107,9 @@
@Autowired
private ICommunityService communityService;
+ @Autowired
+ private IPoliceAffairsGridService policeAffairsGridService;
+
@Override
public IPage<DoorplateAddressVO> selectDoorplateAddressPage(IPage<DoorplateAddressVO> page, DoorplateAddressVO doorplateAddress) {
@@ -125,21 +130,21 @@
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) {
+ if (null != roleName && !roleName.equals("")) {
+ houseParam.setRoleName(roleName);
+ if (roleName.equals("网格员") && !userId.equals("1726859808689696770")) {
+ // 查询对应的网格code
+ stringList = gridService.getGridListByUserId(AuthUtil.getUserId());
+ }
+ if (roleName.equals("民警")) {
+ // 查询对应的社区编号
+ communityList = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
+ }
+ }
// 查询街道
List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam, stringList, communityList);
// 查询社区
@@ -642,12 +647,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);
}
/**
@@ -695,7 +700,7 @@
if (null != houseParam.getRoleName() && !houseParam.getRoleName().equals("")) {
if (houseParam.getRoleName().equals("民警") && !userId.equals("1726859808689696770")) {
// 查询对应的房屋地址code
- stringList = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
+ stringList = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
}
}
return stringList;
@@ -707,9 +712,9 @@
* @return
*/
@Override
- public Object houseDataHandle() {
+ public Object houseDataHandle(String townName) {
// 处理房屋数据
- handleHouseData();
+ handleHouseData(townName);
return null;
}
@@ -717,41 +722,52 @@
/**
* 处理房屋数据
*/
- 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);
+ // 加入集合
+ houseList.add(houseEntity);
+ }
+ }
+ // 批量插入
+ houseService.saveBatch(houseList);
}
}
- // 批量插入
- houseService.saveBatch(houseList);
+
}
/**
@@ -785,6 +801,16 @@
// 加入集合
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);
}
}
// 批量插入
@@ -822,6 +848,8 @@
placeEntity.setStatus(1);
// 默认为非九小场所
placeEntity.setIsNine(2);
+ // 默认为现场采集
+ placeEntity.setIsScene(1);
// 加入集合
// placeList.add(placeEntity);
// 保存
@@ -888,7 +916,7 @@
// 无权限
one.setIsJur(2);
// 查询对应的社区code
- list = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
+ list = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
if (null!=list && list.size()>0){
boolean contains = list.contains(one.getNeiCode());
if (contains) {
@@ -936,12 +964,29 @@
/**
* 查询场所标准地址数据
- * @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);
}
}
--
Gitblit v1.9.3