From 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Apr 2024 15:20:49 +0800
Subject: [PATCH] 民警网格区域查询合并，网格员区域树查询修改，解决不显示网格问题
---
src/main/java/org/springblade/modules/grid/service/impl/GridServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 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 d42f5cd..b411049 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
@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.cache.SysCache;
+import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
@@ -37,6 +38,7 @@
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
+import org.springblade.modules.task.vo.TaskVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -66,9 +68,10 @@
@Override
public IPage<GridVO> selectGridPage(IPage<GridVO> page, GridVO grid) {
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
- return page.setRecords(baseMapper.selectGridPage(page, grid,regionChildCodesList,isAdministrator));
+// List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+// Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(GridVO.class, grid);
+ return page.setRecords(baseMapper.selectGridPage(page, grid,commonParamSet.getRegionChildCodesList(),commonParamSet.getIsAdministrator()));
}
/**
@@ -139,8 +142,8 @@
* @return
*/
@Override
- public List<String> getAddressCodeListByUserId(Long userId) {
- return baseMapper.getAddressCodeListByUserId(userId);
+ public List<String> getAddressCodeListByUserId(Long userId,String addressCode) {
+ return baseMapper.getAddressCodeListByUserId(userId,addressCode);
}
/**
@@ -181,6 +184,14 @@
}
}
return null;
+ }
+
+ /**
+ * 空间分析
+ */
+ @Override
+ public List<GridEntity> spatialAnalysis(String point) {
+ return baseMapper.spatialAnalysis(point);
}
/**
@@ -355,4 +366,25 @@
public List<String> getGridListByUserId(Long userId) {
return baseMapper.getGridListByUserId(userId.toString());
}
+
+ /**
+ * 查询对应的房屋地址code(更加网格编号集合）
+ * @param gridCodeList
+ * @return
+ */
+ @Override
+ public List<String> getAddressCodeListByGridCodeList(String communityCode, List<String> gridCodeList) {
+ return baseMapper.getAddressCodeListByGridCodeList(communityCode,gridCodeList);
+ }
+
+ /**
+ * 根据社区编号及网格编号集合查询对应的网格信息
+ * @param communityCode
+ * @param gridCodeList
+ * @return
+ */
+ @Override
+ public List<GridVO> getGridListByComAndList(String communityCode, List<String> gridCodeList) {
+ return baseMapper.getGridListByComAndList(communityCode,gridCodeList);
+ }
}
--
Gitblit v1.9.3