From 7bcd0d2d7510cb2ba67099cd768e1b2b6d047dc2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Feb 2024 17:16:27 +0800
Subject: [PATCH] 投票人员查询优化
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 113 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 84 insertions(+), 29 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 186bd7c..ab71455 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
@@ -50,7 +50,11 @@
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.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;
@@ -71,6 +75,9 @@
@Autowired
private IPlaceService placeService;
+
+ @Autowired
+ private IPlaceExtService placeExtService;
@Autowired
private IHouseService houseService;
@@ -99,6 +106,9 @@
@Autowired
private ICommunityService communityService;
+ @Autowired
+ private IPoliceAffairsGridService policeAffairsGridService;
+
@Override
public IPage<DoorplateAddressVO> selectDoorplateAddressPage(IPage<DoorplateAddressVO> page, DoorplateAddressVO doorplateAddress) {
@@ -119,21 +129,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);
// 查询社区
@@ -636,12 +646,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);
}
/**
@@ -689,7 +699,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;
@@ -794,33 +804,66 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Object placeDataHandle() {
+ public Object placeDataHandle(String townName) {
// 查询所有的地址表和场所表差集集合
- List<DoorplateAddressEntity> list = baseMapper.getPlaceList();
+ 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())) {
+// 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：国控采集)
+ // 设置来源( 1：地址总表 2：国控采集 3:商超)
placeEntity.setSource(1);
+ // 待完善
+ placeEntity.setStatus(1);
+ // 默认为非九小场所
+ placeEntity.setIsNine(2);
// 加入集合
- placeList.add(placeEntity);
- }
+// placeList.add(placeEntity);
+ // 保存
+ placeService.save(placeEntity);
+ // 新增场所详情
+ savePlaceExtAndTaskInfo(placeEntity);
+// }
}
// 批量插入
- placeService.saveBatch(placeList);
+// savePlaceExtAndTaskInfo(placeList);
}
// 返回
return null;
+ }
+
+ /**
+ * 新增场所详情
+ * @param placeEntity
+ */
+ public void savePlaceExtAndTaskInfo(PlaceEntity placeEntity) {
+ PlaceExtEntity placeExtEntity = new PlaceExtEntity();
+ placeExtEntity.setPlaceId(placeEntity.getId());
+ // 判断是否已存在，已存在则不新增
+ QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0)
+ .eq("place_id",placeEntity.getId());
+ PlaceExtEntity one = placeExtService.getOne(wrapper);
+ if (null == one) {
+ placeExtEntity.setPlaceId(placeEntity.getId());
+ // 默认给待完善状态
+ placeExtEntity.setConfirmFlag(4);
+ placeExtEntity.setCreateTime(new Date());
+ placeExtEntity.setUpdateTime(new Date());
+ placeExtEntity.setCreateUser(AuthUtil.getUserId());
+ placeExtEntity.setUpdateUser(AuthUtil.getUserId());
+ // 新增场所详情
+ placeExtService.save(placeExtEntity);
+ }
}
/**
@@ -846,14 +889,15 @@
one.setIsJur(1);
}
} else if (doorplateAddress.getRoleName().equals("民警")) {
+ // 无权限
+ one.setIsJur(2);
// 查询对应的社区code
- list = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
- boolean contains = list.contains(doorplateAddress.getNeiCode().replaceAll("0+$", ""));
- if (list.size() == 0 || !contains) {
- // 无权限
- one.setIsJur(2);
- } else {
- one.setIsJur(1);
+ list = policeAffairsGridService.getCommunityCodeListByUserId(AuthUtil.getUserId());
+ if (null!=list && list.size()>0){
+ boolean contains = list.contains(one.getNeiCode());
+ if (contains) {
+ one.setIsJur(1);
+ }
}
} else {
// 不限制
@@ -893,4 +937,15 @@
}
return null;
}
+
+ /**
+ * 查询场所标准地址数据
+ * @param doorplateAddressVO
+ * @param size
+ * @return
+ */
+ @Override
+ public Object getPlaceList(DoorplateAddressVO doorplateAddressVO, Integer size) {
+ return baseMapper.getPlaceList(doorplateAddressVO,size);
+ }
}
--
Gitblit v1.9.3