From 2137911cd6a0a20723356f3c0678cbf3556e7d7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 29 Dec 2023 18:17:01 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 124 +++++++++++++++++++++++++++++++++++------
1 files changed, 106 insertions(+), 18 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 290c25e..5978eab 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,7 +17,7 @@
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.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.springblade.common.node.TreeStringNode;
@@ -29,24 +29,32 @@
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.grid.service.IGridmanService;
import org.springblade.modules.grid.vo.GridVO;
-import org.springblade.modules.place.entity.*;
+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.place.excel.PlaceAndRelExcel;
import org.springblade.modules.place.excel.PlaceExcel;
+import org.springblade.modules.place.mapper.PlaceMapper;
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.PlaceVO;
-import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.IPlaceService;
+import org.springblade.modules.place.vo.PlaceVO;
+import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
/**
* 场所表 服务实现类
@@ -77,6 +85,12 @@
@Autowired
private IGridRangeService gridRangeService;
+ @Autowired
+ private IGridmanService gridmanService;
+
+ @Autowired
+ private IDeptService deptService;
+
/**
* 自定义列表查询
* @param page
@@ -85,6 +99,10 @@
*/
@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> list = new ArrayList<>();
if (null!=place.getRoleName() && !place.getRoleName().equals("")){
if (place.getRoleName().equals("网格员")){
@@ -103,6 +121,8 @@
GridVO gridVO = gridService.getGridDetailByHouseCode(placeVO.getHouseCode());
if (null!= gridVO){
placeVO.setGridName(gridVO.getGridName());
+// placeVO.setNeiName(gridVO.getCommunityName());
+// placeVO.setTownStreetName(gridVO.getTownStreetName());
}
}
// 返回
@@ -183,15 +203,37 @@
if (null!=placeVO.getGridId()){
// 判断关联关系表是否存在
QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("grid_id",placeVO.getGrid()).eq("house_code",placeVO.getHouseCode());
+ wrapper.eq("house_code",placeVO.getHouseCode());
GridRangeEntity one = gridRangeService.getOne(wrapper);
- if (null!=one){
+ if (null==one){
// 新增
GridRangeEntity gridRangeEntity = new GridRangeEntity();
gridRangeEntity.setHouseCode(placeVO.getHouseCode());
gridRangeEntity.setGridId(placeVO.getGridId());
// 插入
gridRangeService.save(gridRangeEntity);
+ }else {
+ // 修改绑定
+ one.setGridId(placeVO.getGridId());
+ // 修改
+ gridRangeService.updateById(one);
+ }
+ }else {
+ // 判断网格员，查询对应网格人对应的网格id
+ Integer gridId = gridmanService.getGridIdByUserId(AuthUtil.getUserId());
+ if (null!=gridId){
+ // 判断关联关系表是否存在
+ QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("grid_id",gridId).eq("house_code",placeVO.getHouseCode());
+ GridRangeEntity one = gridRangeService.getOne(wrapper);
+ if (null==one){
+ // 新增
+ GridRangeEntity gridRangeEntity = new GridRangeEntity();
+ gridRangeEntity.setHouseCode(placeVO.getHouseCode());
+ gridRangeEntity.setGridId(gridId);
+ // 插入
+ gridRangeService.save(gridRangeEntity);
+ }
}
}
}
@@ -294,12 +336,12 @@
@Transactional(rollbackFor = Exception.class)
public User bindUserHandle(PlaceVO placeVO) {
User newUser = new User();
- if (null!=placeVO.getPhone() && !placeVO.getPhone().equals("")) {
- placeVO.setPrincipal(placeVO.getUsername());
- placeVO.setPrincipalPhone(placeVO.getPhone());
+ if (null!=placeVO.getPrincipalPhone() && !placeVO.getPrincipalPhone().equals("")) {
+ placeVO.setPrincipal(placeVO.getPrincipal());
+ placeVO.setPrincipalPhone(placeVO.getPrincipalPhone());
//根据手机号查询库里的数据
User userParams = new User();
- userParams.setPhone(placeVO.getPhone());
+ userParams.setPhone(placeVO.getPrincipalPhone());
User user = userService.getOne(Condition.getQueryWrapper(userParams));
if (null!=user) {
@@ -314,10 +356,10 @@
}
} else {
//如果用户不存在，则新增一个用户
- newUser.setAccount(placeVO.getPhone());
- newUser.setPhone(placeVO.getPhone());
- newUser.setName(placeVO.getUsername());
- newUser.setRealName(placeVO.getUsername());
+ newUser.setAccount(placeVO.getPrincipalPhone());
+ newUser.setPhone(placeVO.getPrincipalPhone());
+ newUser.setName(placeVO.getPrincipal());
+ newUser.setRealName(placeVO.getPrincipal());
// 社区群众部门
newUser.setDeptId("1727979636479037441");
// 目前暂定居民角色，
@@ -351,6 +393,9 @@
PlaceExtEntity one = placeExtService.getOne(wrapper);
if (null == one) {
placeExtEntity.setPlaceId(placeVO.getId());
+ placeExtEntity.setLocation(placeVO.getLocation());
+ // TODO 后面需要把新增的参所设置为待完善
+ // placeExtEntity.setConfirmFlag(0);
//新增
placeExtService.savePlaceExt(placeExtEntity);
}
@@ -533,7 +578,7 @@
// 插入场所
PlaceEntity placeEntity = new PlaceEntity();
placeEntity.setPlaceName(placeExcel.getPlaceName());
- placeEntity.setLocaltion(placeExcel.getAddress());
+ placeEntity.setLocation(placeExcel.getAddress());
placeEntity.setPrincipalUserId(userId);
placeEntity.setPrincipal(placeExcel.getName());
placeEntity.setPrincipalPhone(placeExcel.getPhoneNumber());
@@ -568,7 +613,7 @@
PlaceEntity placeEntity = new PlaceEntity();
placeEntity.setId(one.getId());
placeEntity.setPlaceName(placeExcel.getPlaceName());
- placeEntity.setLocaltion(placeExcel.getAddress());
+ placeEntity.setLocation(placeExcel.getAddress());
placeEntity.setPrincipalUserId(userId);
placeEntity.setCreateTime(new Date());
placeEntity.setCreateUser(AuthUtil.getUserId());
@@ -636,4 +681,47 @@
// 返回
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