From 8400a67289b214b83a20484410fff96d236c6d49 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 25 Nov 2023 18:39:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 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..ab844dc 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
@@ -18,9 +18,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.AllArgsConstructor;
import org.apache.logging.log4j.util.Strings;
-import org.springblade.common.node.TreeNode;
+import org.springblade.common.node.TreeStringNode;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
@@ -101,7 +100,7 @@
* @return
*/
@Override
- public List<TreeNode> selectPlaceNodeList(Long userId) {
+ public List<TreeStringNode> selectPlaceNodeList(Long userId) {
return baseMapper.selectPlaceNodeList(userId.toString());
}
@@ -255,25 +254,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