From 83b7c740d6fbad1b96e4a0a39be2fe6d14194d6e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 20 Jan 2024 16:18:39 +0800
Subject: [PATCH] 场所新增网格编号绑定
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 150 ++++++++++++++++++++++++++++---------------------
1 files changed, 86 insertions(+), 64 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 cf2480e..29be09c 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
@@ -107,22 +107,7 @@
public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
- List<String> list = new ArrayList<>();
- if (null!=place.getRoleName() && !place.getRoleName().equals("")){
- if (place.getRoleName().equals("网格员")){
- // 查询对应的房屋地址code
- list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
- }
- }
- List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page, place, list,regionChildCodesList,isAdministrator);
- // 遍历
- for (PlaceVO placeVO : placeVOS) {
- // 设置对应的网格名称
- GridVO gridVO = gridService.getGridDetailByHouseCode(placeVO.getHouseCode());
- if (null!= gridVO){
- placeVO.setGridName(gridVO.getGridName());
- }
- }
+ List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page, place,regionChildCodesList,isAdministrator);
// 返回
return page.setRecords(placeVOS);
}
@@ -163,12 +148,6 @@
setPlaceStatus(placeVO);
// 更新场所信息
flag = updateById(placeVO);
- // 保存场所详情及任务信息
- savePlaceExtAndTaskInfo(placeVO);
- // 场所标签信息绑定(更新，调整）
- placeLabelBind(placeVO);
- // 网格绑定
- gridBind(placeVO);
}else {
// 设置基础数据
placeVO.setCreateUser(AuthUtil.getUserId());
@@ -183,14 +162,15 @@
setPlaceStatus(placeVO);
// 新增场所信息
flag = save(placeVO);
- // 保存场所详情及任务信息
- savePlaceExtAndTaskInfo(placeVO);
- // 场所标签信息绑定
- placeLabelBind(placeVO);
- // 网格绑定
- gridBind(placeVO);
}
- // 位置绑定，通过定位去匹配所在网格
+ // 保存场所详情及任务信息
+ savePlaceExtAndTaskInfo(placeVO);
+ // 场所标签信息绑定(更新，调整）
+ placeLabelBind(placeVO);
+ // 网格绑定
+ gridBind(placeVO);
+ // 网格编号绑定场所-新
+ gridCodeBind(placeVO);
// 返回结果
return flag;
}
@@ -249,10 +229,27 @@
}
/**
- * 网格员角色位置绑定
+ * 网格编号绑定
* @param placeVO
*/
- private void gridmanPositionHandle(PlaceVO placeVO) {
+ public void gridCodeBind(PlaceVO placeVO) {
+ // 无网格编号时
+ if (Strings.isBlank(placeVO.getGridCode())){
+ // 判断角色，如果是网格员则直接使用网格员的网格id,如果是民警则采用点落面的方式进行获取网格的id
+ if (!Strings.isBlank(placeVO.getRoleName())) {
+ // 网格员场所网格编号绑定-新
+ gridmanGridCodePositionHandle(placeVO);
+ // 民警角色时通过位置绑定网格-新
+ policeGridCodePositionHandle(placeVO);
+ }
+ }
+ }
+
+ /**
+ * 网格员角色位置绑定-grid_id
+ * @param placeVO
+ */
+ public void gridmanPositionHandle(PlaceVO placeVO) {
if (placeVO.getRoleName().equals("网格员")) {
// 判断网格员，查询对应网格人对应的网格id
Integer gridId = gridmanService.getGridIdByUserId(AuthUtil.getUserId());
@@ -274,6 +271,23 @@
// 修改
gridRangeService.updateById(one);
}
+ }
+ }
+ }
+
+ /**
+ * 网格员角色位置绑定-grid_code
+ * @param placeVO
+ */
+ public void gridmanGridCodePositionHandle(PlaceVO placeVO) {
+ if (placeVO.getRoleName().equals("网格员")) {
+ // 判断网格员，查询对应网格人对应的网格
+ GridEntity grid = gridService.getGridByUserId(AuthUtil.getUserId());
+ if (null != grid && !Strings.isBlank(grid.getGridCode())) {
+ // 场所编号绑定
+ placeVO.setGridCode(grid.getGridCode());
+ // 更新场所信息
+ updateById(placeVO);
}
}
}
@@ -307,6 +321,26 @@
// 修改
gridRangeService.updateById(one);
}
+ }
+ }
+ }
+
+ /**
+ * 民警角色时通过位置绑定网格
+ * @param placeVO
+ */
+ private void policeGridCodePositionHandle(PlaceVO placeVO) {
+ // 是民警且位置信息存在
+ if (placeVO.getRoleName().equals("民警") && !Strings.isBlank(placeVO.getLng())) {
+ //点坐标解析
+ 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);
}
}
}
@@ -557,49 +591,37 @@
public PlaceVO getDetail(PlaceVO place) {
// 查询场所信息
PlaceVO placeVO = baseMapper.getDetail(place);
+ // 门牌信息
if (null!= place.getAddressType() && place.getAddressType()==4){
if (null != placeVO) {
// 查询地址编码信息（社区派出所相关信息）
DoorplateAddressEntity addressEntity = placeRelService.getDoorplateAddressEntity(placeVO);
placeVO.setDoorplateAddressEntity(addressEntity);
- // 查询网格信息
+ // 查询网格信息--商超
placeVO.setGrid(gridService.getGridDetailByParam(placeVO));
}
}else {
- if (null != placeVO) {
- if (null != placeVO.getHouseCode() && !placeVO.getHouseCode().equals("")) {
- place.setHouseCode(placeVO.getHouseCode());
- }
- if (placeVO.getPlacePoiLabelVOList().size()>0){
- PlacePoiLabelVO placePoiLabelVO = placeVO.getPlacePoiLabelVOList().get(0);
- if (!Strings.isBlank(placePoiLabelVO.getColor())){
- placeVO.setColor(placePoiLabelVO.getColor());
- }
- }
- // 查询门牌地址信息
- 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.setNeiCode(list.get(0).getNeiCode());
- }
- // 查询网格数据
- GridVO gridVO = gridService.getGridDetailByHouseCode(place.getHouseCode());
- if (null!= gridVO) {
- placeVO.setGrid(gridVO);
- place.setGridId(gridVO.getId());
- }
- // 设置详情信息
- QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0).eq("place_id",placeVO.getId());
- placeVO.setPlaceExtEntity(placeExtService.getOne(queryWrapper));
- } else {
- // 通过定位点落面分析网格位置，反向推出社区派出所相关数据
-
+ // 管理后台查询赋值颜色
+ if (placeVO.getPlacePoiLabelVOList().size()>0){
+ PlacePoiLabelVO placePoiLabelVO = placeVO.getPlacePoiLabelVOList().get(0);
+ if (!Strings.isBlank(placePoiLabelVO.getColor())){
+ placeVO.setColor(placePoiLabelVO.getColor());
}
}
+ // 查询地址门牌信息
+ QueryWrapper<DoorplateAddressEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("address_code", placeVO.getHouseCode());
+ List<DoorplateAddressEntity> list = doorplateAddressService.list(wrapper);
+ if (list.size() > 0) {
+ placeVO.setDoorplateAddressEntity(list.get(0));
+ placeVO.setNeiCode(list.get(0).getNeiCode());
+ }
+ // 查询场所对应的网格数据
+ placeVO.setGrid(gridService.getPlaceGridDetailByHouseCode(placeVO.getHouseCode()));
+ // 设置详情信息
+ QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0).eq("place_id",placeVO.getId());
+ placeVO.setPlaceExtEntity(placeExtService.getOne(queryWrapper));
}
// 返回
return placeVO;
--
Gitblit v1.9.3