From b7df6735bcb2d447cae7fcfba2d12accf3dd2fcc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 17:27:21 +0800
Subject: [PATCH] 消防检查优化
---
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 359 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 236 insertions(+), 123 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 fb04f78..b7f2a0d 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
@@ -20,15 +20,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.constant.DictConstant;
import org.springblade.common.node.TreeStringNode;
import org.springblade.common.utils.ComplexNumberStringComparator;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.modules.category.dto.CategoryLabelDTO;
-import org.springblade.modules.category.service.ICategoryLabelService;
+import org.springblade.modules.category.dto.CategoryDTO;
+import org.springblade.modules.category.service.ICategoryService;
import org.springblade.modules.community.entity.CommunityEntity;
import org.springblade.modules.community.service.ICommunityService;
import org.springblade.modules.district.entity.DistrictEntity;
@@ -51,7 +50,10 @@
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.system.entity.Region;
import org.springblade.modules.system.service.IRegionService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +74,9 @@
@Autowired
private IPlaceService placeService;
+
+ @Autowired
+ private IPlaceExtService placeExtService;
@Autowired
private IHouseService houseService;
@@ -95,7 +100,7 @@
private IDistrictService districtService;
@Autowired
- private ICategoryLabelService iCategoryLabelService;
+ private ICategoryService iCategoryService;
@Autowired
private ICommunityService communityService;
@@ -108,41 +113,42 @@
/**
* 根据角色获取功能集合数据
- * @param type 1：查社区 2:查房屋和场所（居民角色）
+ *
+ * @param type 1：查社区 2:查房屋和场所（居民角色）
* @param roleName
* @return
*/
@Override
- public Object getFuncList(Integer type,String roleName) {
+ public Object getFuncList(Integer type, String roleName) {
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("")){
+ if (null != roleName && !roleName.equals("")) {
houseParam.setRoleName(roleName);
- if (roleName.equals("网格员") && !userId.equals("1726859808689696770")){
+ if (roleName.equals("网格员") && !userId.equals("1726859808689696770")) {
// 查询对应的房屋地址code
stringList = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
}
- if (roleName.equals("民警")){
+ if (roleName.equals("民警")) {
// 查询对应的社区编号
communityList = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
}
}
List<TreeStringNode> list = new ArrayList<>();
- if (null!=type) {
+ if (null != type) {
// 如果是网格管理员，系统管理员,民警
- if (type==1){
+ if (type == 1) {
// 查询街道
- List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam,stringList,communityList);
+ List<TreeStringNode> townList = baseMapper.getRegionListByGroupTwon(houseParam, stringList, communityList);
// 查询社区
- List<TreeStringNode> neiList = baseMapper.getRegionListByGroupNei(houseParam,stringList,communityList);
+ List<TreeStringNode> neiList = baseMapper.getRegionListByGroupNei(houseParam, stringList, communityList);
// 遍历
for (TreeStringNode treeNode : townList) {
// 遍历
for (TreeStringNode node : neiList) {
- if (treeNode.getId().equals(node.getParentId())){
+ if (treeNode.getId().equals(node.getParentId())) {
node.setHasChildren(false);
treeNode.getChildren().add(node);
}
@@ -152,7 +158,7 @@
return townList;
}
// 如果是居民
- if (type==2 || type==3){
+ if (type == 2 || type == 3) {
return getInhabitantInfo(list);
}
}
@@ -161,6 +167,7 @@
/**
* 获取居民角色对应的房屋，场所信息
+ *
* @param list
* @return
*/
@@ -169,7 +176,7 @@
List<TreeStringNode> houseNodeList = householdService.selectHouseNodeList(AuthUtil.getUserId());
for (TreeStringNode treeNode : houseNodeList) {
// 判断房屋类型类型
- if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
+ if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
(DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
treeNode.getAddressLevel().equals(1))) {
treeNode.setAddressType(2);
@@ -181,10 +188,10 @@
List<TreeStringNode> placeNodeList = placeService.selectPlaceNodeList(AuthUtil.getUserId());
for (TreeStringNode treeNode : placeNodeList) {
treeNode.setAddressType(2);
- CategoryLabelDTO categoryLabelDTO = new CategoryLabelDTO();
- categoryLabelDTO.setPlaceId(treeNode.getId());
- List<CategoryLabelDTO> categoryLabelDTOS = iCategoryLabelService.selectCategoryLabelList(categoryLabelDTO);
- treeNode.setCategoryLabelList(categoryLabelDTOS);
+ CategoryDTO categoryDTO = new CategoryDTO();
+ categoryDTO.setPlaceId(treeNode.getId());
+ List<CategoryDTO> categoryDTOS = iCategoryService.selectCategoryLabelList(categoryDTO);
+ treeNode.setCategoryList(categoryDTOS);
// if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
// (DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
// treeNode.getAddressLevel().equals(1))) {
@@ -200,23 +207,32 @@
houseNode.setId("1");
houseNode.setHasChildren(true);
houseNode.setChildren(houseNodeList);
+ list.add(houseNode);
TreeStringNode placeNode = new TreeStringNode();
placeNode.setName("场所");
placeNode.setId("2");
placeNode.setHasChildren(true);
placeNode.setChildren(placeNodeList);
-
- list.add(houseNode);
list.add(placeNode);
// 返回
return list;
}
- if (houseNodeList.size()>0){
- list = houseNodeList;
+ if (houseNodeList.size() > 0) {
+ TreeStringNode houseNode = new TreeStringNode();
+ houseNode.setName("房屋");
+ houseNode.setId("1");
+ houseNode.setHasChildren(true);
+ houseNode.setChildren(houseNodeList);
+ list.add(houseNode);
}
- if (placeNodeList.size()>0){
- list = placeNodeList;
+ if (placeNodeList.size() > 0) {
+ TreeStringNode placeNode = new TreeStringNode();
+ placeNode.setName("场所");
+ placeNode.setId("2");
+ placeNode.setHasChildren(true);
+ placeNode.setChildren(placeNodeList);
+ list.add(placeNode);
}
// 返回
return list;
@@ -224,6 +240,7 @@
/**
* 获取楼盘相关集合数据
+ *
* @param houseParam
* @return
*/
@@ -237,16 +254,16 @@
// 获取网格员对应的网格信息
getGridInfoByGridman(houseParam);
// 查小区，场所
- if (houseParam.getType()==1){
+ if (houseParam.getType() == 1) {
// 根据社区名称查询小区集合
- list = baseMapper.getDistrictList(houseParam,stringList,communityCodeList);
+ list = baseMapper.getDistrictList(houseParam, stringList, communityCodeList);
}
// 查楼栋，街路巷
- if (houseParam.getType()==2){
- return getBuildLevelData(houseParam,map);
+ if (houseParam.getType() == 2) {
+ return getBuildLevelData(houseParam, map);
}
// 查户室
- if (houseParam.getType()==3){
+ if (houseParam.getType() == 3) {
return getHouseLevelData(houseParam, map);
}
return list;
@@ -254,6 +271,7 @@
/**
* 获取网格员对应的网格信息
+ *
* @param houseParam
*/
private void getGridInfoByGridman(HouseParam houseParam) {
@@ -279,6 +297,7 @@
/**
* 查询户室级别数据
+ *
* @param houseParam
* @param map
* @return
@@ -286,41 +305,64 @@
private Map<String, Object> getHouseLevelData(HouseParam houseParam, Map<String, Object> map) {
List<String> stringList = getHouseCodeList(houseParam);
// 判断地址类型
- if (houseParam.getAddressType()==1) {
+ if (houseParam.getAddressType() == 1) {
List<FuncNode> aoiList = new ArrayList<>();
List<FuncNode> shopList = new ArrayList<>();
// 查询户室及住户相关信息，单元中包含住户,或者和单元平级的 商铺
- List<FuncNode> householdList = getUnitHouseholdList(houseParam,stringList);
+ List<FuncNode> householdList = getUnitHouseholdList(houseParam, stringList);
// 遍历
- if (householdList.size()>0){
+ if (householdList.size() > 0) {
for (FuncNode funcNode : householdList) {
- if (funcNode.getAddressType()==1){
+ if (funcNode.getAddressType() == 1) {
aoiList.add(funcNode);
}
- if (funcNode.getAddressType()==2){
+ if (funcNode.getAddressType() == 2) {
shopList.add(funcNode);
}
}
}
- map.put("aoiList",aoiList);
- map.put("shopList",shopList);
+ map.put("aoiList", aoiList);
+ map.put("shopList", shopList);
// 返回
return map;
}
- if(houseParam.getAddressType()==3){
+ if (houseParam.getAddressType() == 3) {
// 根据街路巷编号查询街路巷门牌名称集合
- List<FuncNode> doorplateNameList = baseMapper.getDoorplateNameList(houseParam,stringList);
- map.put("aoiList",new ArrayList<>());
- map.put("shopList",doorplateNameList);
+ List<FuncNode> doorplateNameList = baseMapper.getDoorplateNameList(houseParam, stringList);
+ map.put("aoiList", new ArrayList<>());
+ map.put("shopList", doorplateNameList);
// 返回
return map;
}
- if(houseParam.getAddressType()==4){
+ if (houseParam.getAddressType() == 4) {
getGridInfoByGridman(houseParam);
// 查询商超
List<FuncNode> doorplateNameList = baseMapper.getPlaceRelDetailList(houseParam);
- map.put("aoiList",new ArrayList<>());
- map.put("shopList",doorplateNameList);
+ // 按单元(网格)分组
+ Map<String, List<FuncNode>> listMap = doorplateNameList.stream().collect(Collectors.groupingBy(FuncNode::getUnitName));
+ //
+ List<FuncNode> tempList = new ArrayList<>();
+ // 遍历
+ listMap.forEach((s, temps) -> {
+ FuncNode funcNode = new FuncNode();
+ funcNode.setUnitName(s);
+ funcNode.setAddressType(4);
+ funcNode.setUnitCode(temps.get(0).getUnitCode());
+ funcNode.setChildren(temps);
+ // 查询网格对应的排序
+ QueryWrapper<GridEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("community_code", funcNode.getUnitCode()).eq("grid_name", funcNode.getUnitName());
+ // 查询网格
+ GridEntity one = gridService.getOne(wrapper);
+ if (null != one) {
+ funcNode.setSort(one.getSort());
+ }
+ tempList.add(funcNode);
+ });
+ // 排序
+ List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getSort())).collect(Collectors.toList());
+ map.put("aoiList", new ArrayList<>());
+ map.put("shopList", sortList);
// 返回
return map;
}
@@ -329,12 +371,13 @@
/**
* 获取楼栋层级数据
+ *
* @param houseParam
* @param map
* @return
*/
- private Object getBuildLevelData(HouseParam houseParam,Map<String, Object> map) {
- if (houseParam.getAddressType()==4){
+ private Object getBuildLevelData(HouseParam houseParam, Map<String, Object> map) {
+ if (houseParam.getAddressType() == 4) {
// 获取网格员对应的网格信息
getGridInfoByGridman(houseParam);
// 查询商超
@@ -343,7 +386,7 @@
map.put("shopList", list);
// 返回
return map;
- }else {
+ } else {
List<String> stringList = getHouseCodeList(houseParam);
// 判断 code 长度，如果 code 长度大于 12 则为小区查楼栋/商铺，否则则按社区查街路巷
if (houseParam.getCode().length() > 12) {
@@ -356,7 +399,7 @@
sorted(new Comparator<TreeStringNode>() {
@Override
public int compare(TreeStringNode o1, TreeStringNode o2) {
- return ComplexNumberStringComparator.compare(o1.getName(),o2.getName());
+ return ComplexNumberStringComparator.compare(o1.getName(), o2.getName());
}
}).collect(Collectors.toList());
if (list.size() > 0) {
@@ -386,27 +429,28 @@
/**
* 查询户室及住户相关信息，单元中包含住户
+ *
* @param houseParam
* @param stringList
* @return
*/
- private List<FuncNode> getUnitHouseholdList(HouseParam houseParam,List<String> stringList) {
+ private List<FuncNode> getUnitHouseholdList(HouseParam houseParam, List<String> stringList) {
List<FuncNode> list = new ArrayList<>();
// 查询户室及住户相关信息，单元中包含住户
- List<FuncNode> funcNodes = baseMapper.getUnitHouseholdList(houseParam,stringList);
+ List<FuncNode> funcNodes = baseMapper.getUnitHouseholdList(houseParam, stringList);
// 遍历
- List<FuncNode> aoiNodes = new ArrayList<>();
- List<FuncNode> shopNodes = new ArrayList<>();
+ List<FuncNode> aoiNodes = new ArrayList<>();
+ List<FuncNode> shopNodes = new ArrayList<>();
for (FuncNode funcNode : funcNodes) {
- if (funcNode.getAddressType()==1){
+ if (funcNode.getAddressType() == 1) {
aoiNodes.add(funcNode);
}
- if (funcNode.getAddressType()==2){
+ if (funcNode.getAddressType() == 2) {
shopNodes.add(funcNode);
}
}
// 处理，先按单元分组，再按楼层分组
- if (aoiNodes.size()>0){
+ if (aoiNodes.size() > 0) {
// 按单元分组
Map<String, List<FuncNode>> listMap = aoiNodes.stream().collect(Collectors.groupingBy(FuncNode::getUnitName));
// 单个单元
@@ -421,11 +465,12 @@
/**
* 单个单元处理
+ *
* @param list
* @param listMap
*/
private void oneUnitHandle(List<FuncNode> list, Map<String, List<FuncNode>> listMap) {
- if (listMap.size()==1){
+ if (listMap.size() == 1) {
Set<String> keySet = listMap.keySet();
// 获取第一个key
String firstKey = null;
@@ -433,35 +478,38 @@
firstKey = key;
break;
}
- if (firstKey.equals("未知单元")){
- // 取出数据按楼层分组
- List<FuncNode> unitList = listMap.get(firstKey);
- Map<String, List<FuncNode>> floorListMap = unitList.stream().collect(Collectors.groupingBy(FuncNode::getFloor));
- List<FuncNode> funcNodeList = new ArrayList<>();
- floorListMap.forEach((s, temps) -> {
- FuncNode funcNode = new FuncNode();
- funcNode.setFloor(s);
- funcNode.setChildren(temps);
- funcNode.setAddressType(1);
- funcNodeList.add(funcNode);
- });
+ // 取出数据按楼层分组
+ List<FuncNode> unitList = listMap.get(firstKey);
+ Map<String, List<FuncNode>> floorListMap = unitList.stream().collect(Collectors.groupingBy(FuncNode::getFloor));
+ List<FuncNode> funcNodeList = new ArrayList<>();
+ floorListMap.forEach((s, temps) -> {
FuncNode funcNode = new FuncNode();
- funcNode.setUnitName("一单元");
- funcNode.setChildren(funcNodeList);
+ funcNode.setFloor(s);
+ funcNode.setChildren(temps);
funcNode.setAddressType(1);
- list.add(funcNode);
+ funcNodeList.add(funcNode);
+ });
+ FuncNode funcNode = new FuncNode();
+ if (firstKey.equals("未知单元")) {
+ funcNode.setUnitName("一单元");
+ } else {
+ funcNode.setUnitName(firstKey);
}
+ funcNode.setChildren(funcNodeList);
+ funcNode.setAddressType(1);
+ list.add(funcNode);
}
}
/**
* 多单元处理
+ *
* @param list
* @param listMap
*/
private void moreUnitHandle(List<FuncNode> list, Map<String, List<FuncNode>> listMap) {
// 不止一个单元
- if (listMap.size()>1){
+ if (listMap.size() > 1) {
List<FuncNode> tempList = new ArrayList<>();
// 遍历
listMap.forEach((s, temps) -> {
@@ -470,7 +518,7 @@
funcNode.setAddressType(1);
// 按楼层分组
Map<String, List<FuncNode>> floorListMap = temps.stream().collect(Collectors.groupingBy(FuncNode::getFloor));
- List<FuncNode> floorNodeList = new ArrayList<>();
+ List<FuncNode> floorNodeList = new ArrayList<>();
floorListMap.forEach((floor, houseList) -> {
FuncNode floorNode = new FuncNode();
floorNode.setFloor(floor);
@@ -482,7 +530,7 @@
tempList.add(funcNode);
});
// 排序
- sortUnit(tempList,list);
+ sortUnit(tempList, list);
// List<FuncNode> sortList = tempList.stream().sorted(Comparator.comparing(X -> X.getUnitName())).collect(Collectors.toList());
// list.addAll(sortList);
}
@@ -490,30 +538,28 @@
/**
* 单元排序
+ *
* @param tempList
* @param list
*/
- private void sortUnit(List<FuncNode> tempList,List<FuncNode> list) {
+ private void sortUnit(List<FuncNode> tempList, List<FuncNode> list) {
// 遍历
- if(tempList.size()>1){
+ if (tempList.size() > 1) {
for (FuncNode funcNode : tempList) {
- if (funcNode.getUnitName().contains("一")){
+ if (funcNode.getUnitName().contains("一")) {
funcNode.setSort(1);
- }
- if (funcNode.getUnitName().contains("二")){
+ } else if (funcNode.getUnitName().contains("二")) {
funcNode.setSort(2);
- }
- if (funcNode.getUnitName().contains("三")){
+ } else if (funcNode.getUnitName().contains("三")) {
funcNode.setSort(3);
- }
- if (funcNode.getUnitName().contains("四")){
+ } else if (funcNode.getUnitName().contains("四")) {
funcNode.setSort(4);
- }
- if (funcNode.getUnitName().contains("五")){
+ } else if (funcNode.getUnitName().contains("五")) {
funcNode.setSort(5);
- }
- if (funcNode.getUnitName().contains("六")){
+ } else if (funcNode.getUnitName().contains("六")) {
funcNode.setSort(6);
+ } else {
+ funcNode.setSort(1);
}
}
// 排序
@@ -524,6 +570,7 @@
/**
* 查询房屋及出租详情信息
+ *
* @param code 门牌地址编号
* @return
*/
@@ -531,7 +578,7 @@
public Object getHouseRentInfo(String code) {
// 先查询门牌信息
DoorplateAddressVO doorplateAddressDetailVO = baseMapper.getDoorplateAddressDetailByCode(code);
- if(null!= doorplateAddressDetailVO) {
+ if (null != doorplateAddressDetailVO) {
// 查询房屋出租情况
List<HouseRentalVO> houseRentalVOS = houseRentalService.getHouseRentalListByCode(code);
// 查询房屋人员情况
@@ -551,16 +598,16 @@
List<DoorplateAddressVOTree> list = new ArrayList<>();
- if (type.equals("townStreet")){
+ if (type.equals("townStreet")) {
//获取所有街道街道
list = baseMapper.getTownStreetVOTreeList();
- }else if (type.equals("nei")){
- list= baseMapper.getNeiVOTreeList(code);
- }else if (type.equals("streetRu")){
+ } else if (type.equals("nei")) {
+ list = baseMapper.getNeiVOTreeList(code);
+ } else if (type.equals("streetRu")) {
list = baseMapper.getStreetRuVOTreeList(code);
- }else if (type.equals("district")){
- list=baseMapper.getDistrictVOTreeList(code);
- }else if (type.equals("building")){
+ } else if (type.equals("district")) {
+ list = baseMapper.getDistrictVOTreeList(code);
+ } else if (type.equals("building")) {
list = baseMapper.getBuildingVOTreeList(code);
}
@@ -569,6 +616,7 @@
/**
* 根据参数获取地址详情
+ *
* @return
*/
@Override
@@ -593,16 +641,18 @@
/**
* 查询社区信息
- * @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);
}
/**
* 获取房屋树
+ *
* @param houseParam
* @return
*/
@@ -610,11 +660,12 @@
public List<DoorplateAddressVOTree> getHouseTree(HouseParam houseParam) {
List<String> stringList = getHouseCodeList(houseParam);
// 根据社区居委会编号获取对应的小区/楼栋/单元/户室
- return NodeTreeUtil.getAddressNodeTree(baseMapper.getHouseTree(houseParam,stringList));
+ return NodeTreeUtil.getAddressNodeTree(baseMapper.getHouseTree(houseParam, stringList));
}
/**
* 根据角色获取地址编号集合
+ *
* @param houseParam
* @return
*/
@@ -633,6 +684,7 @@
/**
* 根据角色获取社区编号集合
+ *
* @param houseParam
* @return
*/
@@ -651,6 +703,7 @@
/**
* 房屋数据处理
+ *
* @return
*/
@Override
@@ -673,10 +726,10 @@
for (DoorplateAddressEntity doorplateAddressEntity : list) {
// 查询是否已存在，存在就插入，不存在则插入
QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("house_code",doorplateAddressEntity.getAddressCode())
- .eq("is_deleted",0);
+ wrapper.eq("house_code", doorplateAddressEntity.getAddressCode())
+ .eq("is_deleted", 0);
HouseEntity one = houseService.getOne(wrapper);
- if (null==one){
+ if (null == one) {
HouseEntity houseEntity = new HouseEntity();
houseEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
houseEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
@@ -703,6 +756,7 @@
/**
* 小区数据处理
+ *
* @return
*/
@Override
@@ -717,10 +771,10 @@
for (DoorplateAddressEntity addressEntity : list) {
// 查询小区是否已存在，不存在则插入，否则不新增
QueryWrapper<DistrictEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("aoi_code",addressEntity.getAoiCode())
- .eq("is_deleted",0);
+ wrapper.eq("aoi_code", addressEntity.getAoiCode())
+ .eq("is_deleted", 0);
DistrictEntity one = districtService.getOne(wrapper);
- if (null==one) {
+ if (null == one) {
DistrictEntity districtEntity = new DistrictEntity();
districtEntity.setCommunityCode(addressEntity.getNeiCode());
districtEntity.setAoiCode(addressEntity.getAoiCode());
@@ -741,37 +795,71 @@
/**
* 场所数据处理
+ *
* @return
*/
@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) {
+ 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.setLocaltion(addressEntity.getAddressName());
- // 设置来源( 1：地址总表 2：国控采集)
+ placeEntity.setLocation(addressEntity.getAddressName());
+ // 设置来源( 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);
+ }
}
/**
@@ -782,19 +870,32 @@
List<String> list = new ArrayList<>();
// 扫码时调用，需判断是否有权限查看
DoorplateAddressVO one = baseMapper.getDoorplateAddressVODetail(doorplateAddress);
- if (null!=one){
+ if (null != one) {
+ // 不限制
+ one.setIsJur(1);
if (!Strings.isBlank(doorplateAddress.getRoleName())) {
// 判断是否有权限
if (doorplateAddress.getRoleName().equals("网格员")) {
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
boolean contains = list.contains(doorplateAddress.getAddressCode());
- if (list.size()==0 || !contains){
+ if (list.size() == 0 || !contains) {
// 无权限
one.setIsJur(2);
- }else {
+ } else {
one.setIsJur(1);
}
- }else {
+ } else if (doorplateAddress.getRoleName().equals("民警")) {
+ // 无权限
+ one.setIsJur(2);
+ // 查询对应的社区code
+ list = communityService.getCommunityCodeListByUserId(AuthUtil.getUserId());
+ if (null!=list && list.size()>0){
+ boolean contains = list.contains(one.getNeiCode());
+ if (contains) {
+ one.setIsJur(1);
+ }
+ }
+ } else {
// 不限制
one.setIsJur(1);
}
@@ -806,6 +907,7 @@
/**
* 社区数据处理
+ *
* @return
*/
@Override
@@ -815,11 +917,11 @@
// 遍历，插入库
for (DoorplateAddressEntity doorplateAddressEntity : doorplateAddressEntities) {
QueryWrapper<CommunityEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("name",doorplateAddressEntity.getNeiName())
- .eq("code",doorplateAddressEntity.getNeiCode())
- .eq("is_deleted",0);
+ queryWrapper.eq("name", doorplateAddressEntity.getNeiName())
+ .eq("code", doorplateAddressEntity.getNeiCode())
+ .eq("is_deleted", 0);
CommunityEntity one = communityService.getOne(queryWrapper);
- if (null==one){
+ if (null == one) {
// 插入
CommunityEntity communityEntity = new CommunityEntity();
communityEntity.setCode(doorplateAddressEntity.getNeiCode());
@@ -831,4 +933,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