From 4b344a457f2c430ca42a3a05a4b53181acada734 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 22 Nov 2023 14:22:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 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 6a3cf71..d340b03 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
@@ -255,25 +255,36 @@
* @return
*/
@Override
- public PlaceVO getDetail(PlaceEntity place) {
+ public PlaceVO getDetail(PlaceVO place) {
// 查询场所信息
PlaceVO placeVO = baseMapper.getDetail(place);
- if (null!= placeVO) {
- if (null != placeVO.getHouseCode() && !placeVO.getHouseCode().equals("")){
- place.setHouseCode(placeVO.getHouseCode());
+ if (null!= place.getAddressType() && place.getAddressType()==4){
+ if (null != placeVO) {
+ // 查询地址编码信息（社区派出所相关信息）
+ DoorplateAddressEntity addressEntity = placeRelService.getDoorplateAddressEntity(placeVO);
+ placeVO.setDoorplateAddressEntity(addressEntity);
+ // 查询网格信息
+ placeVO.setGrid(gridService.getGridDetailByParam(placeVO));
}
- // 查询门牌地址信息
- if (null != place.getHouseCode() && !place.getHouseCode().equals("")) {
- QueryWrapper<DoorplateAddressEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("address_code", place.getHouseCode());
- List<DoorplateAddressEntity> list = doorplateAddressService.list(wrapper);
- if (list.size() > 0) {
- placeVO.setDoorplateAddressEntity(list.get(0));
+ }else {
+ if (null != placeVO) {
+ if (null != placeVO.getHouseCode() && !placeVO.getHouseCode().equals("")) {
+ place.setHouseCode(placeVO.getHouseCode());
}
- // 查询网格数据
- placeVO.setGrid(gridService.getGridDetailByHouseCode(place.getHouseCode()));
- }else {
- // 通过定位点落面分析网格位置，反向推出社区派出所相关数据
+ // 查询门牌地址信息
+ if (null != place.getHouseCode() && !place.getHouseCode().equals("")) {
+ QueryWrapper<DoorplateAddressEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("address_code", place.getHouseCode());
+ List<DoorplateAddressEntity> list = doorplateAddressService.list(wrapper);
+ if (list.size() > 0) {
+ placeVO.setDoorplateAddressEntity(list.get(0));
+ }
+ // 查询网格数据
+ placeVO.setGrid(gridService.getGridDetailByHouseCode(place.getHouseCode()));
+ } else {
+ // 通过定位点落面分析网格位置，反向推出社区派出所相关数据
+
+ }
}
}
// 返回
--
Gitblit v1.9.3