From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 439 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 323 insertions(+), 116 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 937b49a..a102711 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
@@ -19,7 +19,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.utils.IdUtils;
import org.springblade.core.mp.support.Condition;
@@ -33,12 +35,16 @@
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.grid.vo.GridVO;
+import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.entity.UserHouseLabelEntity;
+import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.place.entity.*;
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.vo.PlacePoiLabelVO;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.IPlaceService;
@@ -86,10 +92,10 @@
private IGridmanService gridmanService;
@Autowired
- private IDeptService deptService;
+ private GridMapper gridMapper;
@Autowired
- private GridMapper gridMapper;
+ private IHouseholdService householdService;
/**
* 自定义列表查询
@@ -99,10 +105,8 @@
*/
@Override
public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null!=dept){
- place.setRegionCode(dept.getRegionCode());
- }
+ 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("网格员")){
@@ -110,15 +114,7 @@
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
}
}
- List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page, place, list);
- // 遍历
- for (PlaceVO placeVO : placeVOS) {
- // 设置对应的网格名称
- GridVO gridVO = gridService.getGridDetailByHouseCode(placeVO.getHouseCode());
- if (null!= gridVO){
- placeVO.setGridName(gridVO.getGridName());
- }
- }
+ List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page, place,list,regionChildCodesList,isAdministrator);
// 返回
return page.setRecords(placeVOS);
}
@@ -153,18 +149,12 @@
if (null!=one) {
placeVO.setId(one.getId());
}
- // 设置来源( 1：地址总表 2：国控采集),扫码采集
- placeVO.setSource(1);
// 绑定用户信息
bindUserHandle(placeVO);
+ // 设置完善状态
+ setPlaceStatus(placeVO);
// 更新场所信息
flag = updateById(placeVO);
- // 保存场所详情及任务信息
- savePlaceExtAndTaskInfo(placeVO);
- // 场所标签信息绑定(更新，调整）
- placeLabelBind(placeVO);
- // 网格绑定
- gridBind(placeVO);
}else {
// 设置基础数据
placeVO.setCreateUser(AuthUtil.getUserId());
@@ -175,18 +165,75 @@
placeVO.setHouseCode(IdUtils.getIdBy36());
// 绑定用户信息
bindUserHandle(placeVO);
+ // 设置完善状态
+ setPlaceStatus(placeVO);
// 新增场所信息
flag = save(placeVO);
- // 保存场所详情及任务信息
- savePlaceExtAndTaskInfo(placeVO);
- // 场所标签信息绑定
- placeLabelBind(placeVO);
- // 网格绑定
- gridBind(placeVO);
}
- // 位置绑定，通过定位去匹配所在网格
+ // 保存场所详情及任务信息
+ savePlaceExtAndTaskInfo(placeVO);
+ // 场所标签信息绑定(更新，调整）
+ placeLabelBind(placeVO);
+ // 网格绑定
+ gridBind(placeVO);
+ // 网格编号绑定场所-新
+ gridCodeBind(placeVO);
+ // 房屋编号绑定
+// houseCodeBind(placeVO);
// 返回结果
return flag;
+ }
+
+ /**
+ * 房屋绑定
+ * @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) {
+ // 先查询对应的场所id
+ QueryWrapper<PlaceEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("house_code",code).eq("is_deleted",0);
+ PlaceEntity one = getOne(wrapper);
+ if (null!=one){
+ longs.add(one.getId());
+ // 删除对应的单个编号的场所
+ removeById(one.getId());
+ }
+ }
+ if (longs.size()>0) {
+ // 删除对应的详情
+ removePlaceExt(longs);
+ // 删除对应的标签绑定信息
+ removePlaceLabel(longs);
+ }
+ }else {
+ // 一对一,暂时不处理，后续考虑需加绑定关系表
+ }
+ }
+
+ /**
+ * 设置场所完善状态
+ * @param placeVO
+ */
+ private void setPlaceStatus(PlaceVO placeVO) {
+ if (!Strings.isBlank(placeVO.getPrincipal())
+ && !Strings.isBlank(placeVO.getPrincipalPhone())
+ && !Strings.isBlank(placeVO.getLocation())
+ && !Strings.isBlank(placeVO.getPlaceName())
+ && !Strings.isBlank(placeVO.getImageUrls())
+ ){
+ // 已完善
+ placeVO.setStatus(2);
+ }else {
+ // 未完善
+ placeVO.setStatus(1);
+ }
}
/**
@@ -224,10 +271,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());
@@ -249,6 +313,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);
}
}
}
@@ -287,6 +368,26 @@
}
/**
+ * 民警角色时通过位置绑定网格
+ * @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);
+ }
+ }
+ }
+
+ /**
* 场所标签信息绑定入库
* @param placeVO
*/
@@ -316,63 +417,83 @@
* @param placeVO
*/
public void savePlaceLabel(PlaceVO placeVO) {
- // 批量新增
- List<String> labelList = Arrays.asList(placeVO.getLabel().split(","));
- if (labelList.size()>1){
- // 只处理小类
- // 遍历
- labelList.forEach(labelId -> {
+ if (!Strings.isBlank(placeVO.getLabel())) {
+ // 批量新增
+ List<String> labelList = Arrays.asList(placeVO.getLabel().split(","));
+ if (labelList.size() > 1) {
+ // 只处理小类
+ // 遍历
+ labelList.forEach(labelId -> {
+ // 处理小类
+ if (labelId.length() > 4) {
+ // 切割成三个，分别是大类，中类，小类
+ String bigString = labelId.substring(0, 2);
+ String midString = labelId.substring(0, 4);
+ // 大类
+ PlacePoiLabel big = new PlacePoiLabel();
+ big.setPlaceId(placeVO.getId());
+ big.setPoiCode(Integer.parseInt(bigString));
+ big.setType(1);
+ if (!Strings.isBlank(placeVO.getColor())) {
+ big.setColor(placeVO.getColor());
+ }
+ placePoiLabelService.save(big);
+ // 中类
+ PlacePoiLabel mid = new PlacePoiLabel();
+ mid.setPlaceId(placeVO.getId());
+ mid.setPoiCode(Integer.parseInt(midString));
+ mid.setType(2);
+ if (!Strings.isBlank(placeVO.getColor())) {
+ mid.setColor(placeVO.getColor());
+ }
+ placePoiLabelService.save(mid);
+ // 小类
+ PlacePoiLabel min = new PlacePoiLabel();
+ min.setPlaceId(placeVO.getId());
+ min.setPoiCode(Integer.parseInt(labelId));
+ min.setType(3);
+ if (!Strings.isBlank(placeVO.getColor())) {
+ min.setColor(placeVO.getColor());
+ }
+ placePoiLabelService.save(min);
+ }
+ });
+ } else {
+ // 处理单个
+ String labelCode = labelList.get(0);
+ // 切割成三个，分别是大类，中类，小类
+ String bigString = labelCode.substring(0, 2);
+ String midString = labelCode.substring(0, 4);
+ // 大类
+ PlacePoiLabel big = new PlacePoiLabel();
+ big.setPlaceId(placeVO.getId());
+ big.setPoiCode(Integer.parseInt(bigString));
+ big.setType(1);
+ if (!Strings.isBlank(placeVO.getColor())) {
+ big.setColor(placeVO.getColor());
+ }
+ placePoiLabelService.save(big);
+ // 中类
+ PlacePoiLabel mid = new PlacePoiLabel();
+ mid.setPlaceId(placeVO.getId());
+ mid.setPoiCode(Integer.parseInt(midString));
+ mid.setType(2);
+ if (!Strings.isBlank(placeVO.getColor())) {
+ mid.setColor(placeVO.getColor());
+ }
+ placePoiLabelService.save(mid);
// 处理小类
- if (labelId.length()>4) {
- // 切割成三个，分别是大类，中类，小类
- String bigString = labelId.substring(0,2);
- String midString = labelId.substring(0,4);
- // 大类
- PlacePoiLabel big = new PlacePoiLabel();
- big.setPlaceId(placeVO.getId());
- big.setPoiCode(Integer.parseInt(bigString));
- big.setType(1);
- placePoiLabelService.save(big);
- // 中类
- PlacePoiLabel mid = new PlacePoiLabel();
- mid.setPlaceId(placeVO.getId());
- mid.setPoiCode(Integer.parseInt(midString));
- mid.setType(2);
- placePoiLabelService.save(mid);
+ if (labelCode.length() > 4) {
// 小类
PlacePoiLabel min = new PlacePoiLabel();
min.setPlaceId(placeVO.getId());
- min.setPoiCode(Integer.parseInt(labelId));
+ min.setPoiCode(Integer.parseInt(labelCode));
min.setType(3);
+ if (!Strings.isBlank(placeVO.getColor())) {
+ min.setColor(placeVO.getColor());
+ }
placePoiLabelService.save(min);
}
- });
- }else {
- // 处理单个
- String labelCode = labelList.get(0);
- // 切割成三个，分别是大类，中类，小类
- String bigString = labelCode.substring(0, 2);
- String midString = labelCode.substring(0, 4);
- // 大类
- PlacePoiLabel big = new PlacePoiLabel();
- big.setPlaceId(placeVO.getId());
- big.setPoiCode(Integer.parseInt(bigString));
- big.setType(1);
- placePoiLabelService.save(big);
- // 中类
- PlacePoiLabel mid = new PlacePoiLabel();
- mid.setPlaceId(placeVO.getId());
- mid.setPoiCode(Integer.parseInt(midString));
- mid.setType(2);
- placePoiLabelService.save(mid);
- // 处理小类
- if (labelCode.length() > 4) {
- // 小类
- PlacePoiLabel min = new PlacePoiLabel();
- min.setPlaceId(placeVO.getId());
- min.setPoiCode(Integer.parseInt(labelCode));
- min.setType(3);
- placePoiLabelService.save(min);
}
}
}
@@ -514,42 +635,36 @@
public PlaceVO getDetail(PlaceVO place) {
// 查询场所信息
PlaceVO placeVO = baseMapper.getDetail(place);
- if (null!= place.getAddressType() && place.getAddressType()==4){
- if (null != placeVO) {
+ // 门牌信息
+ if (null != placeVO) {
+ if (null != place.getAddressType() && place.getAddressType() == 4) {
// 查询地址编码信息（社区派出所相关信息）
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 (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());
+ } else {
+ // 管理后台查询赋值颜色
+ if (placeVO.getPlacePoiLabelVOList().size() > 0) {
+ PlacePoiLabelVO placePoiLabelVO = placeVO.getPlacePoiLabelVOList().get(0);
+ if (!Strings.isBlank(placePoiLabelVO.getColor())) {
+ placeVO.setColor(placePoiLabelVO.getColor());
}
- // 查询网格数据
- 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 {
- // 通过定位点落面分析网格位置，反向推出社区派出所相关数据
-
}
+ // 查询地址门牌信息
+ 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));
}
}
// 返回
@@ -847,13 +962,105 @@
}
/**
- * 根据标签编号集合查询对应的场所
+ * 根据编号集合查询对应的场所（按颜色区分近多少天没有发过任务的场所）
* @param stringList
- * @param color
+ * @param tableName
* @return
*/
@Override
- public List<PlaceVO> getPlaceListByParam(List<String> stringList,String color) {
- return baseMapper.getPlaceListByParam(stringList,color);
+ public List<PlaceVO> getPlaceListByParam(List<String> stringList,String tableName) {
+ return baseMapper.getPlaceListByParam(stringList,tableName);
+ }
+
+ /**
+ * 删除
+ * @param longs
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean removePlace(List<Long> longs) {
+ // 删除场所负责人对应的用户
+ removeUser(longs);
+ // 删除
+ boolean removeByIds = removeByIds(longs);
+ // 删除对应的详情
+ removePlaceExt(longs);
+ // 删除对应的标签绑定信息
+ removePlaceLabel(longs);
+ // 返回
+ return removeByIds;
+ }
+
+ /**
+ * 删除场所负责人对应的用户
+ * @param longs
+ */
+ public void removeUser(List<Long> longs) {
+ // 遍历
+ for (Long id : longs) {
+ PlaceEntity placeEntity = getById(id);
+ if (null!=placeEntity.getPrincipalUserId()){
+ User user = userService.getById(placeEntity.getPrincipalUserId());
+ // 查询场所判断是否还绑定有其他的场所
+ QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted",0).eq("principal_user_id",user.getId());
+ List<PlaceEntity> placeEntityList = list(queryWrapper);
+ // 如果没有（1个 当前的还没有删除）
+ if (placeEntityList.size()==1){
+ // 判断角色
+ if (!Strings.isBlank(user.getRoleId())){
+ // 判断是否还绑定其他的房屋，如果有，则不操作用户
+ QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0).eq("associated_user_id",user.getId());
+ List<HouseholdEntity> householdEntityList = householdService.list(wrapper);
+ // 即没有房屋和场所了就删除对应的居民角色
+ if (householdEntityList.size()==0) {
+ List<String> stringList = Arrays.asList(user.getRoleId().split(","));
+ // 查看当前用户的角色是否只有一个
+ if (stringList.size() > 1) {
+ // 查询是否对应有场所负责人，如果有则不删除，如果没有则删除对应的角色
+ List<String> arrayList = new ArrayList<>();
+ for (String roleId : stringList) {
+ if (!roleId.equals("1717429059648606209")) {
+ arrayList.add(roleId);
+ }
+ }
+ user.setRoleId(StringUtils.join(arrayList, ","));
+ // 更新用户
+ userService.updateById(user);
+ } else {
+ // 删除当前用户
+ userService.removeById(user.getId());
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * 删除场所对应的详情
+ * @param longs
+ */
+ public void removePlaceExt(List<Long> longs) {
+ for (Long id : longs) {
+ QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("place_id",id);
+ placeExtService.remove(wrapper);
+ }
+ }
+
+ /**
+ * 删除对应的标签绑定信息
+ * @param longs
+ */
+ public void removePlaceLabel(List<Long> longs) {
+ for (Long id : longs) {
+ QueryWrapper<PlacePoiLabel> wrapper = new QueryWrapper<>();
+ wrapper.eq("place_id",id);
+ placePoiLabelService.remove(wrapper);
+ }
}
}
--
Gitblit v1.9.3