From 4fa495b3a31cff7a22ef5efff1d40eb26d5272ec Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 02 Feb 2024 14:36:44 +0800
Subject: [PATCH] getRegionChildCodesByDeptId 方法修改适配多部门
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 211 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 133 insertions(+), 78 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 6b390d2..26d539e 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -148,6 +148,9 @@
PlaceEntity one = getOne(wrapper);
if (null!=one) {
placeVO.setId(one.getId());
+ }else {
+ // 新增，地址表中没有或者地址表中有场所表中没有的（是房屋的），扫码进来的
+ save(placeVO);
}
// 绑定用户信息
bindUserHandle(placeVO);
@@ -178,8 +181,43 @@
gridBind(placeVO);
// 网格编号绑定场所-新
gridCodeBind(placeVO);
+ // 房屋编号绑定
+// houseCodeBind(placeVO);
// 返回结果
return flag;
+ }
+
+ /**
+ * 房屋绑定
+ * @param placeVO
+ */
+ public void houseCodeBind(PlaceVO placeVO) {
+ String houseCode = placeVO.getHouseCode();
+ List<String> list = Arrays.asList(houseCode.split(","));
+ if (list.size()>1){
+ // 处理对应的绑定房屋数据
+ List<Long> longs = new ArrayList<>();
+ // 把其他单个的场所数据删除
+ for (String code : list) {
+ // 先查询对应的场所id
+ QueryWrapper<PlaceEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("house_code",code).eq("is_deleted",0);
+ PlaceEntity one = getOne(wrapper);
+ if (null!=one){
+ longs.add(one.getId());
+ // 删除对应的单个编号的场所
+ removeById(one.getId());
+ }
+ }
+ if (longs.size()>0) {
+ // 删除对应的详情
+ removePlaceExt(longs);
+ // 删除对应的标签绑定信息
+ removePlaceLabel(longs);
+ }
+ }else {
+ // 一对一,暂时不处理，后续考虑需加绑定关系表
+ }
}
/**
@@ -263,7 +301,7 @@
if (null != gridId) {
// 判断关联关系表是否存在
QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("grid_id", gridId).eq("house_code", placeVO.getHouseCode());
+ wrapper.eq("house_code", placeVO.getHouseCode());
GridRangeEntity one = gridRangeService.getOne(wrapper);
if (null == one) {
// 新增
@@ -274,7 +312,7 @@
gridRangeService.save(gridRangeEntity);
}else {
// 修改绑定
- one.setGridId(placeVO.getGridId());
+ one.setGridId(gridId);
// 修改
gridRangeService.updateById(one);
}
@@ -309,11 +347,12 @@
//点坐标解析
String point = "'POINT(" + placeVO.getLng() + " " + placeVO.getLat() +")'";
// String point = "'POINT(" + villageInfoExcel.getLatitude() + " " + villageInfoExcel.getLongitude() +")'";
- GridEntity gridEntity = gridMapper.spatialAnalysis(point);
- if (null != gridEntity) {
+ List<GridEntity> gridEntityList = gridMapper.spatialAnalysis(point);
+ if (gridEntityList.size()>0) {
+ GridEntity gridEntity = gridEntityList.get(0);
// 判断关联关系表是否存在
QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("grid_id", gridEntity.getId()).eq("house_code", placeVO.getHouseCode());
+ wrapper.eq("house_code", placeVO.getHouseCode());
GridRangeEntity one = gridRangeService.getOne(wrapper);
if (null == one) {
// 新增
@@ -324,7 +363,7 @@
gridRangeService.save(gridRangeEntity);
}else {
// 修改绑定
- one.setGridId(placeVO.getGridId());
+ one.setGridId(gridEntity.getId());
// 修改
gridRangeService.updateById(one);
}
@@ -342,12 +381,15 @@
//点坐标解析
String point = "'POINT(" + placeVO.getLng() + " " + placeVO.getLat() +")'";
// String point = "'POINT(" + villageInfoExcel.getLatitude() + " " + villageInfoExcel.getLongitude() +")'";
- GridEntity gridEntity = gridMapper.spatialAnalysis(point);
- if (null != gridEntity && !Strings.isBlank(gridEntity.getGridCode())) {
- // 场所编号绑定
- placeVO.setGridCode(gridEntity.getGridCode());
- // 更新场所信息
- updateById(placeVO);
+ List<GridEntity> gridEntityList = gridMapper.spatialAnalysis(point);
+ if (gridEntityList.size()>0) {
+ GridEntity gridEntity = gridEntityList.get(0);
+ if (null != gridEntity && !Strings.isBlank(gridEntity.getGridCode())) {
+ // 场所编号绑定
+ placeVO.setGridCode(gridEntity.getGridCode());
+ // 更新场所信息
+ updateById(placeVO);
+ }
}
}
}
@@ -382,81 +424,83 @@
* @param placeVO
*/
public void savePlaceLabel(PlaceVO placeVO) {
- // 批量新增
- List<String> labelList = Arrays.asList(placeVO.getLabel().split(","));
- if (labelList.size()>1){
- // 只处理小类
- // 遍历
- labelList.forEach(labelId -> {
+ if (!Strings.isBlank(placeVO.getLabel())) {
+ // 批量新增
+ List<String> labelList = Arrays.asList(placeVO.getLabel().split(","));
+ if (labelList.size() > 1) {
+ // 只处理小类
+ // 遍历
+ labelList.forEach(labelId -> {
+ // 处理小类
+ if (labelId.length() > 4) {
+ // 切割成三个，分别是大类，中类，小类
+ String bigString = labelId.substring(0, 2);
+ String midString = labelId.substring(0, 4);
+ // 大类
+ PlacePoiLabel big = new PlacePoiLabel();
+ big.setPlaceId(placeVO.getId());
+ big.setPoiCode(Integer.parseInt(bigString));
+ big.setType(1);
+ if (!Strings.isBlank(placeVO.getColor())) {
+ big.setColor(placeVO.getColor());
+ }
+ placePoiLabelService.save(big);
+ // 中类
+ PlacePoiLabel mid = new PlacePoiLabel();
+ mid.setPlaceId(placeVO.getId());
+ mid.setPoiCode(Integer.parseInt(midString));
+ mid.setType(2);
+ if (!Strings.isBlank(placeVO.getColor())) {
+ mid.setColor(placeVO.getColor());
+ }
+ placePoiLabelService.save(mid);
+ // 小类
+ PlacePoiLabel min = new PlacePoiLabel();
+ min.setPlaceId(placeVO.getId());
+ min.setPoiCode(Integer.parseInt(labelId));
+ min.setType(3);
+ if (!Strings.isBlank(placeVO.getColor())) {
+ min.setColor(placeVO.getColor());
+ }
+ placePoiLabelService.save(min);
+ }
+ });
+ } else {
+ // 处理单个
+ String labelCode = labelList.get(0);
+ // 切割成三个，分别是大类，中类，小类
+ String bigString = labelCode.substring(0, 2);
+ String midString = labelCode.substring(0, 4);
+ // 大类
+ PlacePoiLabel big = new PlacePoiLabel();
+ big.setPlaceId(placeVO.getId());
+ big.setPoiCode(Integer.parseInt(bigString));
+ big.setType(1);
+ if (!Strings.isBlank(placeVO.getColor())) {
+ big.setColor(placeVO.getColor());
+ }
+ placePoiLabelService.save(big);
+ // 中类
+ PlacePoiLabel mid = new PlacePoiLabel();
+ mid.setPlaceId(placeVO.getId());
+ mid.setPoiCode(Integer.parseInt(midString));
+ mid.setType(2);
+ if (!Strings.isBlank(placeVO.getColor())) {
+ mid.setColor(placeVO.getColor());
+ }
+ placePoiLabelService.save(mid);
// 处理小类
- if (labelId.length()>4) {
- // 切割成三个，分别是大类，中类，小类
- String bigString = labelId.substring(0,2);
- String midString = labelId.substring(0,4);
- // 大类
- PlacePoiLabel big = new PlacePoiLabel();
- big.setPlaceId(placeVO.getId());
- big.setPoiCode(Integer.parseInt(bigString));
- big.setType(1);
- if (!Strings.isBlank(placeVO.getColor())){
- big.setColor(placeVO.getColor());
- }
- placePoiLabelService.save(big);
- // 中类
- PlacePoiLabel mid = new PlacePoiLabel();
- mid.setPlaceId(placeVO.getId());
- mid.setPoiCode(Integer.parseInt(midString));
- mid.setType(2);
- if (!Strings.isBlank(placeVO.getColor())){
- mid.setColor(placeVO.getColor());
- }
- placePoiLabelService.save(mid);
+ if (labelCode.length() > 4) {
// 小类
PlacePoiLabel min = new PlacePoiLabel();
min.setPlaceId(placeVO.getId());
- min.setPoiCode(Integer.parseInt(labelId));
+ min.setPoiCode(Integer.parseInt(labelCode));
min.setType(3);
- if (!Strings.isBlank(placeVO.getColor())){
+ if (!Strings.isBlank(placeVO.getColor())) {
min.setColor(placeVO.getColor());
}
placePoiLabelService.save(min);
}
- });
- }else {
- // 处理单个
- String labelCode = labelList.get(0);
- // 切割成三个，分别是大类，中类，小类
- String bigString = labelCode.substring(0, 2);
- String midString = labelCode.substring(0, 4);
- // 大类
- PlacePoiLabel big = new PlacePoiLabel();
- big.setPlaceId(placeVO.getId());
- big.setPoiCode(Integer.parseInt(bigString));
- big.setType(1);
- if (!Strings.isBlank(placeVO.getColor())){
- big.setColor(placeVO.getColor());
- }
- placePoiLabelService.save(big);
- // 中类
- PlacePoiLabel mid = new PlacePoiLabel();
- mid.setPlaceId(placeVO.getId());
- mid.setPoiCode(Integer.parseInt(midString));
- mid.setType(2);
- if (!Strings.isBlank(placeVO.getColor())){
- mid.setColor(placeVO.getColor());
- }
- placePoiLabelService.save(mid);
- // 处理小类
- if (labelCode.length() > 4) {
- // 小类
- PlacePoiLabel min = new PlacePoiLabel();
- min.setPlaceId(placeVO.getId());
- min.setPoiCode(Integer.parseInt(labelCode));
- min.setType(3);
- if (!Strings.isBlank(placeVO.getColor())){
- min.setColor(placeVO.getColor());
- }
- placePoiLabelService.save(min);
}
}
}
@@ -629,6 +673,17 @@
queryWrapper.eq("is_deleted", 0).eq("place_id", placeVO.getId());
placeVO.setPlaceExtEntity(placeExtService.getOne(queryWrapper));
}
+ }else {
+ // 查询地址编码信息（社区派出所相关信息）
+ if (!Strings.isBlank(place.getHouseCode())) {
+ QueryWrapper<DoorplateAddressEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("address_code", place.getHouseCode());
+ DoorplateAddressEntity addressEntity = doorplateAddressService.getOne(queryWrapper);
+ if (null != addressEntity) {
+ placeVO = new PlaceVO();
+ placeVO.setDoorplateAddressEntity(addressEntity);
+ }
+ }
}
// 返回
return placeVO;
--
Gitblit v1.9.3