From 7f85ff7e882ed4d3d39c3261bc996af9cf656aa1 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 28 Feb 2024 14:26:19 +0800
Subject: [PATCH] 消息管理
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 171 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 137 insertions(+), 34 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 7c9908f..af67476 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
@@ -20,12 +20,15 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import liquibase.pro.packaged.W;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.cache.SysCache;
import org.springblade.common.node.TreeStringNode;
+import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.IdUtils;
import org.springblade.common.utils.SpringUtils;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
@@ -45,13 +48,11 @@
import org.springblade.modules.place.excel.NinePlaceExcel;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
import org.springblade.modules.place.excel.PlaceExcel;
-import org.springblade.modules.place.service.IPlaceExtService;
-import org.springblade.modules.place.service.IPlacePoiLabelService;
-import org.springblade.modules.place.service.IPlaceRelService;
+import org.springblade.modules.place.service.*;
+import org.springblade.modules.place.vo.PlaceCheckVO;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.place.mapper.PlaceMapper;
-import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.Dept;
@@ -90,6 +91,9 @@
private IPlaceRelService placeRelService;
@Autowired
+ private IPlaceDoorService placeDoorService;
+
+ @Autowired
private IDoorplateAddressService doorplateAddressService;
@Autowired
@@ -119,16 +123,13 @@
*/
@Override
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);
+ // 公共参数设置
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceVO.class,place);
+ List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page,
+ place,
+ commonParamSet.getGridCodeList(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator());
// 返回
return page.setRecords(placeVOS);
}
@@ -158,6 +159,7 @@
placeVO.setUpdateTime(new Date());
// 查看是否包含houseCode,如果有，则更新
if (!Strings.isBlank(placeVO.getHouseCode())) {
+ setSource(placeVO);
// 比对是否1km 范围内(现场)采集
setIsScene(placeVO);
// 更新,先查询场所信息
@@ -174,6 +176,8 @@
bindUserHandle(placeVO);
// 设置完善状态
setPlaceStatus(placeVO);
+ // 房屋编号绑定处理
+// houseCodeBindHandle(placeVO);
// 更新场所信息
flag = updateById(placeVO);
} else {
@@ -203,10 +207,28 @@
gridCodeBind(placeVO);
// 警务网格绑定
jwGridCodeBind(placeVO);
- // 房屋编号绑定
-// houseCodeBind(placeVO);
// 返回结果
return flag;
+ }
+
+ /**
+ * 设置场所的source 来源
+ * @param placeVO
+ */
+ public void setSource(PlaceVO placeVO) {
+ if (null!=placeVO.getSource()){
+ placeVO.setSource(placeVO.getSource());
+ }else {
+ // 查询该houseCode 是否存在地址总表，如果是，赋值 1，否则2
+ QueryWrapper<DoorplateAddressEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("address_code",placeVO.getHouseCode());
+ DoorplateAddressEntity one = doorplateAddressService.getOne(wrapper);
+ if (null!=one){
+ placeVO.setSource(1);
+ }else {
+ placeVO.setSource(2);
+ }
+ }
}
/**
@@ -262,18 +284,54 @@
}
/**
- * 房屋绑定
+ * 房屋绑定处理
*
* @param placeVO
*/
- public void houseCodeBind(PlaceVO placeVO) {
- String houseCode = placeVO.getHouseCode();
- List<String> list = Arrays.asList(houseCode.split(","));
- if (list.size() > 1) {
- // 处理对应的绑定房屋数据
- List<Long> longs = new ArrayList<>();
- // 把其他单个的场所数据删除
- for (String code : list) {
+ public void houseCodeBindHandle(PlaceVO placeVO) {
+ List<String> list = Arrays.asList(placeVO.getHouseCodeBinds().split(","));
+ // 先删除原有的绑定
+ QueryWrapper<PlaceDoorEntity> removeQw = new QueryWrapper<>();
+ removeQw.eq("place_id",placeVO.getId());
+ // 删除
+ placeDoorService.remove(removeQw);
+ // 遍历更新
+ for (String houseCode : list) {
+ // 查询是否已存在关联关系
+ QueryWrapper<PlaceDoorEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("house_code",houseCode);
+ // 查询
+ List<PlaceDoorEntity> placeDoorEntityList = placeDoorService.list(wrapper);
+ if (placeDoorEntityList.size()>0){
+ // 该houseCode 已被绑定
+// errorList.add(houseCode);
+ for (PlaceDoorEntity placeDoorEntity : placeDoorEntityList) {
+ placeDoorEntity.setPlaceId(placeVO.getId());
+ // 更新
+ placeDoorService.updateById(placeDoorEntity);
+ }
+ }else {
+ PlaceDoorEntity placeDoorEntity = new PlaceDoorEntity();
+ placeDoorEntity.setHouseCode(houseCode);
+ placeDoorEntity.setPlaceId(placeVO.getId());
+ // 对应插入到关联关系表中
+ placeDoorService.save(placeDoorEntity);
+ }
+ }
+ // 处理原场所表houseCode 绑定数据
+ handlePlaceOne(list,placeVO);
+ }
+
+ /**
+ * 处理对应的绑定房屋数据
+ * @param list
+ */
+ public void handlePlaceOne(List<String> list,PlaceVO place) {
+ // 处理对应的绑定房屋数据
+ List<Long> longs = new ArrayList<>();
+ // 把其他单个的场所数据删除
+ for (String code : list) {
+ if (!code.equals(place.getHouseCode())) {
// 先查询对应的场所id
QueryWrapper<PlaceEntity> wrapper = new QueryWrapper<>();
wrapper.eq("house_code", code).eq("is_deleted", 0);
@@ -284,14 +342,14 @@
removeById(one.getId());
}
}
- if (longs.size() > 0) {
- // 删除对应的详情
- removePlaceExt(longs);
- // 删除对应的标签绑定信息
- removePlaceLabel(longs);
- }
- } else {
- // 一对一,暂时不处理，后续考虑需加绑定关系表
+ }
+ if (longs.size() > 0) {
+ // 删除对应的详情
+ removePlaceExt(longs);
+ // 删除对应的标签绑定信息
+ removePlaceLabel(longs);
+ // 删除对应的场所门牌绑定关系信息
+ removePlaceDoor(longs);
}
}
@@ -306,6 +364,7 @@
&& !Strings.isBlank(placeVO.getLocation())
&& !Strings.isBlank(placeVO.getPlaceName())
&& !Strings.isBlank(placeVO.getImageUrls())
+ && !Strings.isBlank(placeVO.getPrincipalIdCard())
) {
// 已完善
placeVO.setStatus(2);
@@ -771,6 +830,10 @@
if (null != addressEntity) {
placeVO = new PlaceVO();
placeVO.setDoorplateAddressEntity(addressEntity);
+ placeVO.setHouseCode(addressEntity.getAddressCode());
+ placeVO.setLng(addressEntity.getX());
+ placeVO.setLat(addressEntity.getY());
+ placeVO.setLocation(addressEntity.getAddressName());
}
}
}
@@ -1105,6 +1168,8 @@
removePlaceExt(longs);
// 删除对应的标签绑定信息
removePlaceLabel(longs);
+ // 删除对应的门牌绑定信息
+ removePlaceDoor(longs);
// 返回
return removeByIds;
}
@@ -1185,6 +1250,19 @@
}
/**
+ * 删除对应的门牌绑定信息
+ *
+ * @param longs
+ */
+ public void removePlaceDoor(List<Long> longs) {
+ for (Long id : longs) {
+ QueryWrapper<PlaceDoorEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("place_id", id);
+ placeDoorService.remove(wrapper);
+ }
+ }
+
+ /**
* 九小场所档案
*
* @param page
@@ -1236,7 +1314,6 @@
@Override
public List<NinePlaceExcel> export(PlaceVO place) {
- place.setIsNine(1);
String roleName = SpringUtils.getRequestParam("roleName");
String communityCode = SpringUtils.getRequestParam("communityCode");
if (!Strings.isBlank(communityCode)){
@@ -1318,4 +1395,30 @@
}
return null;
}
+
+ /**
+ * 场所综治网格处理
+ */
+ @Override
+ public Object placeGridCodeHandle() {
+ // 查询 综治网格为空的数据
+ List<PlaceEntity> list = baseMapper.getPlaceNotGridCode();
+ // 遍历
+ for (PlaceEntity placeEntity : list) {
+ if (!Strings.isBlank(placeEntity.getLng())) {
+ // 空间分析
+ //点坐标解析
+ String point = "'POINT(" + placeEntity.getLng() + " " + placeEntity.getLat() + ")'";
+ //String point = "'POINT(" + villageInfoExcel.getLatitude() + " " + villageInfoExcel.getLongitude() +")'";
+ List<GridEntity> gridEntityList = gridService.spatialAnalysis(point);
+ if (gridEntityList.size() > 0) {
+ GridEntity gridEntity = gridEntityList.get(0);
+ placeEntity.setGridCode(gridEntity.getGridCode());
+ // 更新
+ updateById(placeEntity);
+ }
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3