From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 306 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 274 insertions(+), 32 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 48a3538..5730afa 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
@@ -17,18 +17,20 @@
package org.springblade.modules.place.service.impl;
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 org.apache.logging.log4j.util.Strings;
import org.springblade.common.node.TreeStringNode;
+import org.springblade.common.utils.IdUtils;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
+import org.springblade.modules.grid.entity.GridRangeEntity;
+import org.springblade.modules.grid.service.IGridRangeService;
import org.springblade.modules.grid.service.IGridService;
-import org.springblade.modules.place.entity.PlaceEntity;
-import org.springblade.modules.place.entity.PlaceExtEntity;
-import org.springblade.modules.place.entity.PlacePoiLabel;
-import org.springblade.modules.place.entity.PlaceRelEntity;
+import org.springblade.modules.grid.vo.GridVO;
+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;
@@ -44,10 +46,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
/**
* 场所表 服务实现类
@@ -75,6 +74,9 @@
@Autowired
private IGridService gridService;
+ @Autowired
+ private IGridRangeService gridRangeService;
+
/**
* 自定义列表查询
* @param page
@@ -88,10 +90,25 @@
if (place.getRoleName().equals("网格员")){
// 查询对应的房屋地址code
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+ place.setCreateUser(AuthUtil.getUserId());
+ }
+ if (!place.getRoleName().equals("系统管理员")){
+ place.setCreateUser(AuthUtil.getUserId());
}
}
- place.setCreateUser(AuthUtil.getUserId());
- return page.setRecords(baseMapper.selectPlacePage(page, place,list));
+ 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());
+// placeVO.setNeiName(gridVO.getCommunityName());
+// placeVO.setTownStreetName(gridVO.getTownStreetName());
+ }
+ }
+ // 返回
+ return page.setRecords(placeVOS);
}
/**
@@ -105,28 +122,80 @@
}
/**
- * 场所信息自定义新增
+ * 场所信息自定义新增/修改
* @param placeVO
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean addVO(PlaceVO placeVO) {
- // 设置基础数据
- placeVO.setCreateUser(AuthUtil.getUserId());
- placeVO.setCreateTime(new Date());
+ public Boolean addOrUpdate(PlaceVO placeVO) {
+ boolean flag = false;
placeVO.setUpdateUser(AuthUtil.getUserId());
placeVO.setUpdateTime(new Date());
- // 绑定用户信息
- bindUserHandle(placeVO);
- // 新增场所信息
- boolean save = save(placeVO);
- // 保存场所详情及任务信息
- savePlaceExtAndTaskInfo(placeVO);
- // 场所标签信息绑定
- placeLabelBind(placeVO);
+ // 查看是否包含houseCode,如果有，则更新
+ if (!Strings.isBlank(placeVO.getHouseCode())){
+ // 更新,先查询场所信息
+ QueryWrapper<PlaceEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("is_deleted",0).eq("house_code",placeVO.getHouseCode());
+ PlaceEntity one = getOne(wrapper);
+ if (null!=one) {
+ placeVO.setId(one.getId());
+ }
+ // 设置来源( 1：地址总表 2：国控采集),扫码采集
+ placeVO.setSource(1);
+ // 绑定用户信息
+ bindUserHandle(placeVO);
+ // 更新场所信息
+ flag = updateById(placeVO);
+ // 保存场所详情及任务信息
+ savePlaceExtAndTaskInfo(placeVO);
+ // 场所标签信息绑定(更新，调整）
+ placeLabelBind(placeVO);
+ // 网格绑定
+ gridBind(placeVO);
+ }else {
+ // 设置基础数据
+ placeVO.setCreateUser(AuthUtil.getUserId());
+ placeVO.setCreateTime(new Date());
+ // 设置来源( 1：地址总表 2：国控采集)
+ placeVO.setSource(2);
+ // 并生成36位的houseCode
+ placeVO.setHouseCode(IdUtils.getIdBy36());
+ // 绑定用户信息
+ bindUserHandle(placeVO);
+ // 新增场所信息
+ flag = save(placeVO);
+ // 保存场所详情及任务信息
+ savePlaceExtAndTaskInfo(placeVO);
+ // 场所标签信息绑定
+ placeLabelBind(placeVO);
+ // 网格绑定
+ gridBind(placeVO);
+ }
+ // 位置绑定，通过定位去匹配所在网格
// 返回结果
- return save;
+ return flag;
+ }
+
+ /**
+ * 网格绑定
+ * @param placeVO
+ */
+ public void gridBind(PlaceVO placeVO) {
+ if (null!=placeVO.getGridId()){
+ // 判断关联关系表是否存在
+ QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("grid_id",placeVO.getGrid()).eq("house_code",placeVO.getHouseCode());
+ GridRangeEntity one = gridRangeService.getOne(wrapper);
+ if (null==one){
+ // 新增
+ GridRangeEntity gridRangeEntity = new GridRangeEntity();
+ gridRangeEntity.setHouseCode(placeVO.getHouseCode());
+ gridRangeEntity.setGridId(placeVO.getGridId());
+ // 插入
+ gridRangeService.save(gridRangeEntity);
+ }
+ }
}
/**
@@ -135,14 +204,89 @@
*/
@Transactional(rollbackFor = Exception.class)
public void placeLabelBind(PlaceVO placeVO) {
+ // 先查询对于的场所是否已有标签信息
+ // 查询对应已存在的从业人员
+ QueryWrapper<PlacePoiLabel> wrapper = new QueryWrapper<>();
+ wrapper.eq("place_id",placeVO.getId());
+ List<PlacePoiLabel> oldList = placePoiLabelService.list(wrapper);
+ if (oldList.size()>0){
+ // 先将老的全部删除，然后批量插入
+ QueryWrapper<PlacePoiLabel> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("place_id",placeVO.getId());
+ boolean remove = placePoiLabelService.remove(queryWrapper);
+ if (remove){
+ // 批量新增
+ savePlaceLabel(placeVO);
+ }
+ }else {
+ savePlaceLabel(placeVO);
+ }
+ }
+
+ /**
+ * 插入场所标签信息
+ * @param placeVO
+ */
+ public void savePlaceLabel(PlaceVO placeVO) {
+ // 批量新增
List<String> labelList = Arrays.asList(placeVO.getLabel().split(","));
- // 遍历
- labelList.forEach(labelId->{
- PlacePoiLabel placePoiLabel = new PlacePoiLabel();
- placePoiLabel.setPlaceId(placeVO.getId());
- placePoiLabel.setPoiCode(Integer.parseInt(labelId));
- placePoiLabelService.save(placePoiLabel);
- });
+ 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);
+ placePoiLabelService.save(big);
+ // 中类
+ PlacePoiLabel mid = new PlacePoiLabel();
+ mid.setPlaceId(placeVO.getId());
+ mid.setPoiCode(Integer.parseInt(midString));
+ mid.setType(2);
+ placePoiLabelService.save(mid);
+ // 小类
+ PlacePoiLabel min = new PlacePoiLabel();
+ min.setPlaceId(placeVO.getId());
+ min.setPoiCode(Integer.parseInt(labelId));
+ min.setType(3);
+ 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);
+ }
+ }
}
/**
@@ -153,6 +297,8 @@
public User bindUserHandle(PlaceVO placeVO) {
User newUser = new User();
if (null!=placeVO.getPhone() && !placeVO.getPhone().equals("")) {
+ placeVO.setPrincipal(placeVO.getUsername());
+ placeVO.setPrincipalPhone(placeVO.getPhone());
//根据手机号查询库里的数据
User userParams = new User();
userParams.setPhone(placeVO.getPhone());
@@ -287,9 +433,14 @@
List<DoorplateAddressEntity> list = doorplateAddressService.list(wrapper);
if (list.size() > 0) {
placeVO.setDoorplateAddressEntity(list.get(0));
+ placeVO.setNeiCode(list.get(0).getNeiCode().replaceAll("0+$", ""));
}
// 查询网格数据
- placeVO.setGrid(gridService.getGridDetailByHouseCode(place.getHouseCode()));
+ GridVO gridVO = gridService.getGridDetailByHouseCode(place.getHouseCode());
+ if (null!= gridVO) {
+ placeVO.setGrid(gridVO);
+ place.setGridId(gridVO.getId());
+ }
} else {
// 通过定位点落面分析网格位置，反向推出社区派出所相关数据
@@ -319,6 +470,8 @@
PlaceEntity placeEntity = new PlaceEntity();
placeEntity.setHouseCode(placeExcel.getHouseCode());
placeEntity.setPrincipalUserId(userId);
+ placeEntity.setPrincipal(placeExcel.getName());
+ placeEntity.setPrincipalPhone(placeExcel.getPhoneNumber());
placeEntity.setCreateTime(new Date());
placeEntity.setCreateUser(AuthUtil.getUserId());
placeEntity.setUpdateTime(new Date());
@@ -384,6 +537,9 @@
placeEntity.setPlaceName(placeExcel.getPlaceName());
placeEntity.setLocaltion(placeExcel.getAddress());
placeEntity.setPrincipalUserId(userId);
+ placeEntity.setPrincipal(placeExcel.getName());
+ placeEntity.setPrincipalPhone(placeExcel.getPhoneNumber());
+ placeEntity.setPrincipalUserId(userId);
placeEntity.setCreateTime(new Date());
placeEntity.setCreateUser(AuthUtil.getUserId());
placeEntity.setUpdateTime(new Date());
@@ -439,4 +595,90 @@
placeLabelBind(placeVO);
}
}
+
+ /**
+ * 场所数据处理-用户信息（场所负责人信息写入到场所表）
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Object placeUserHandle() {
+ // 查询出有用户id 的场所
+ List<PlaceEntity> list = baseMapper.getHasUserIdPlaceList();
+ // 遍历
+ for (PlaceEntity placeEntity : list) {
+ // 查询对应的用户信息
+ User user = userService.getById(placeEntity.getPrincipalUserId());
+ if (null!=user) {
+ // 设置场所负责人，手机号
+ if (null != user.getRealName() && !user.getRealName().equals("")) {
+ placeEntity.setPrincipal(user.getRealName());
+ }
+ if (null != user.getPhone() && !user.getPhone().equals("")) {
+ placeEntity.setPrincipalPhone(user.getPhone());
+ }
+ // 更新场所信息
+ updateById(placeEntity);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 自定义修改
+ * @param placeVO
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updatePlace(PlaceVO placeVO) {
+ boolean flag = false;
+ // 修改场所信息
+ flag = updateById(placeVO);
+ // 修改标签绑定信息
+ // 返回
+ return flag;
+ }
+
+ /**
+ * 场所标签数据处理
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Object placeLabelHandle() {
+ // 查询所有的标签绑定
+ List<PlacePoiLabel> list = placePoiLabelService.getPlacePoiLabelList();
+ // 遍历
+ for (PlacePoiLabel placePoiLabel : list) {
+ // 处理单个
+ String labelCode = placePoiLabel.getPoiCode().toString();
+ // 切割成三个，分别是大类，中类，小类
+ String bigString = labelCode.substring(0,2);
+ String midString = labelCode.substring(0,4);
+ // 大类
+ PlacePoiLabel big = new PlacePoiLabel();
+ big.setPlaceId(placePoiLabel.getPlaceId());
+ big.setPoiCode(Integer.parseInt(bigString));
+ big.setType(1);
+ // 保存前先判断
+ QueryWrapper<PlacePoiLabel> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("place_id",placePoiLabel.getPlaceId()).eq("poi_code",Integer.parseInt(bigString));
+ PlacePoiLabel one = placePoiLabelService.getOne(queryWrapper);
+ if (null==one) {
+ placePoiLabelService.save(big);
+ }
+ // 中类
+ PlacePoiLabel mid = new PlacePoiLabel();
+ mid.setPlaceId(placePoiLabel.getPlaceId());
+ mid.setPoiCode(Integer.parseInt(midString));
+ mid.setType(2);
+ // 保存前先判断
+ QueryWrapper<PlacePoiLabel> wrapper = new QueryWrapper<>();
+ wrapper.eq("place_id",placePoiLabel.getPlaceId()).eq("poi_code",Integer.parseInt(midString));
+ PlacePoiLabel two = placePoiLabelService.getOne(wrapper);
+ if (null==two) {
+ placePoiLabelService.save(mid);
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3