From 06c5736e13f1a5e53041153759dca8476a381f8f Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 14 Dec 2023 17:56:41 +0800
Subject: [PATCH] 管理后台优化

---
 src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
index e3be78d..c4efa62 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java
@@ -17,35 +17,30 @@
 package org.springblade.modules.grid.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.common.utils.NodeTreeUtil;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
 import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
 import org.springblade.modules.grid.entity.GridEntity;
 import org.springblade.modules.grid.entity.GridRangeEntity;
+import org.springblade.modules.grid.entity.GridmanEntity;
 import org.springblade.modules.grid.excel.GridExcel;
-import org.springblade.modules.grid.service.IGridRangeService;
-import org.springblade.modules.grid.vo.GridVO;
 import org.springblade.modules.grid.mapper.GridMapper;
+import org.springblade.modules.grid.service.IGridRangeService;
 import org.springblade.modules.grid.service.IGridService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.grid.vo.GridVO;
 import org.springblade.modules.place.vo.PlaceVO;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.entity.Region;
-import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IDeptService;
 import org.springblade.modules.system.service.IRegionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 /**
  * 网格表 服务实现类
@@ -269,6 +264,7 @@
 
 	/**
 	 * 网格树
+	 *
 	 * @param grid
 	 * @return
 	 */
@@ -276,4 +272,16 @@
 	public Object getGridTree(GridVO grid) {
 		return NodeTreeUtil.getStringNodeTree(baseMapper.getGridTree());
 	}
+
+
+	@Override
+	public Object gridInfoByHouseCode(String houseCode) {
+		Map<String, Object> objectObjectHashMap = new HashMap<>();
+		List<GridmanEntity> gridmanEntities = baseMapper.gridInfo(houseCode);
+		Integer id = gridmanEntities.get(0).getId();
+		objectObjectHashMap.put("grid", gridmanEntities);
+		List<DoorplateAddressEntity> result = baseMapper.gridAoiName(id);
+		objectObjectHashMap.put("doorplateAddress", result);
+		return objectObjectHashMap;
+	}
 }

--
Gitblit v1.9.3