From ed28663eebdcc20325474e70be42e10e91fad930 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Jan 2024 11:54:31 +0800
Subject: [PATCH] 住户删除，场所删除，三色任务执行修改
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 270 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 254 insertions(+), 16 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 079301c..ede4050 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,6 +19,7 @@
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.node.TreeStringNode;
import org.springblade.common.utils.IdUtils;
@@ -26,11 +27,16 @@
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.GridEntity;
import org.springblade.modules.grid.entity.GridRangeEntity;
+import org.springblade.modules.grid.mapper.GridMapper;
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.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;
@@ -86,6 +92,12 @@
@Autowired
private IDeptService deptService;
+ @Autowired
+ private GridMapper gridMapper;
+
+ @Autowired
+ private IHouseholdService householdService;
+
/**
* 自定义列表查询
* @param page
@@ -103,10 +115,6 @@
if (place.getRoleName().equals("网格员")){
// 查询对应的房屋地址code
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
- place.setCreateUser(AuthUtil.getUserId());
- }
- if (!place.getRoleName().equals("系统管理员")){
- place.setCreateUser(AuthUtil.getUserId());
}
}
List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page, place, list);
@@ -116,8 +124,6 @@
GridVO gridVO = gridService.getGridDetailByHouseCode(placeVO.getHouseCode());
if (null!= gridVO){
placeVO.setGridName(gridVO.getGridName());
-// placeVO.setNeiName(gridVO.getCommunityName());
-// placeVO.setTownStreetName(gridVO.getTownStreetName());
}
}
// 返回
@@ -214,20 +220,74 @@
gridRangeService.updateById(one);
}
}else {
+ // 判断角色，如果是网格员则直接使用网格员的网格id,如果是民警则采用点落面的方式进行获取网格的id
+ if (!Strings.isBlank(placeVO.getRoleName())) {
+ // 网格员角色位置绑定
+ gridmanPositionHandle(placeVO);
+ // 民警角色位置绑定
+ policePositionHandle(placeVO);
+ }
+ }
+ }
+
+ /**
+ * 网格员角色位置绑定
+ * @param placeVO
+ */
+ private void gridmanPositionHandle(PlaceVO placeVO) {
+ if (placeVO.getRoleName().equals("网格员")) {
// 判断网格员，查询对应网格人对应的网格id
Integer gridId = gridmanService.getGridIdByUserId(AuthUtil.getUserId());
- if (null!=gridId){
+ if (null != gridId) {
// 判断关联关系表是否存在
QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("grid_id",gridId).eq("house_code",placeVO.getHouseCode());
+ wrapper.eq("grid_id", gridId).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(gridId);
// 插入
gridRangeService.save(gridRangeEntity);
+ }else {
+ // 修改绑定
+ one.setGridId(placeVO.getGridId());
+ // 修改
+ gridRangeService.updateById(one);
+ }
+ }
+ }
+ }
+
+ /**
+ * 民警角色位置绑定
+ * @param placeVO
+ */
+ private void policePositionHandle(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) {
+ // 判断关联关系表是否存在
+ QueryWrapper<GridRangeEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("grid_id", gridEntity.getId()).eq("house_code", placeVO.getHouseCode());
+ GridRangeEntity one = gridRangeService.getOne(wrapper);
+ if (null == one) {
+ // 新增
+ GridRangeEntity gridRangeEntity = new GridRangeEntity();
+ gridRangeEntity.setHouseCode(placeVO.getHouseCode());
+ gridRangeEntity.setGridId(gridEntity.getId());
+ // 插入
+ gridRangeService.save(gridRangeEntity);
+ }else {
+ // 修改绑定
+ one.setGridId(placeVO.getGridId());
+ // 修改
+ gridRangeService.updateById(one);
}
}
}
@@ -298,8 +358,8 @@
// 处理单个
String labelCode = labelList.get(0);
// 切割成三个，分别是大类，中类，小类
- String bigString = labelCode.substring(0,2);
- String midString = labelCode.substring(0,4);
+ String bigString = labelCode.substring(0, 2);
+ String midString = labelCode.substring(0, 4);
// 大类
PlacePoiLabel big = new PlacePoiLabel();
big.setPlaceId(placeVO.getId());
@@ -313,7 +373,7 @@
mid.setType(2);
placePoiLabelService.save(mid);
// 处理小类
- if (labelCode.length()>4) {
+ if (labelCode.length() > 4) {
// 小类
PlacePoiLabel min = new PlacePoiLabel();
min.setPlaceId(placeVO.getId());
@@ -337,7 +397,14 @@
//根据手机号查询库里的数据
User userParams = new User();
userParams.setPhone(placeVO.getPrincipalPhone());
+ userParams.setIsDeleted(0);
User user = userService.getOne(Condition.getQueryWrapper(userParams));
+ if (null==user){
+ User userParams1 = new User();
+ userParams1.setAccount(placeVO.getPrincipalPhone());
+ userParams1.setIsDeleted(0);
+ user = userService.getOne(Condition.getQueryWrapper(userParams1));
+ }
if (null!=user) {
//如果用户存在，则该用户id绑定场所
@@ -388,9 +455,14 @@
PlaceExtEntity one = placeExtService.getOne(wrapper);
if (null == one) {
placeExtEntity.setPlaceId(placeVO.getId());
- placeExtEntity.setLocaltion(placeVO.getLocation());
- //新增
- placeExtService.savePlaceExt(placeExtEntity);
+ // 默认给待完善状态
+ placeExtEntity.setConfirmFlag(4);
+ placeExtEntity.setCreateTime(new Date());
+ placeExtEntity.setUpdateTime(new Date());
+ placeExtEntity.setCreateUser(AuthUtil.getUserId());
+ placeExtEntity.setUpdateUser(AuthUtil.getUserId());
+ // 新增场所详情
+ placeExtService.save(placeExtEntity);
}
}
@@ -469,7 +541,7 @@
List<DoorplateAddressEntity> list = doorplateAddressService.list(wrapper);
if (list.size() > 0) {
placeVO.setDoorplateAddressEntity(list.get(0));
- placeVO.setNeiCode(list.get(0).getNeiCode().replaceAll("0+$", ""));
+ placeVO.setNeiCode(list.get(0).getNeiCode());
}
// 查询网格数据
GridVO gridVO = gridService.getGridDetailByHouseCode(place.getHouseCode());
@@ -477,6 +549,10 @@
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 {
// 通过定位点落面分析网格位置，反向推出社区派出所相关数据
@@ -562,6 +638,7 @@
* @param isCovered
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void importAndRelPlace(List<PlaceAndRelExcel> data, Boolean isCovered) {
for (PlaceAndRelExcel placeExcel : data) {
// 判断是否存在，不存在则插入，否则不操作
@@ -580,6 +657,10 @@
placeEntity.setCreateUser(AuthUtil.getUserId());
placeEntity.setUpdateTime(new Date());
placeEntity.setUpdateUser(AuthUtil.getUserId());
+ // 并生成36位的houseCode
+ placeEntity.setHouseCode(IdUtils.getIdBy36());
+ // 商超数据
+ placeEntity.setSource(3);
//一个一个插入，防止同一个表中有相同的数据
save(placeEntity);
// 插入标签关系表
@@ -717,4 +798,161 @@
}
return null;
}
+
+ /**
+ * 历史场所详情数据处理
+ * @param place
+ * @return
+ */
+ @Override
+ public Object historyPlaceExtHandle(PlaceVO place) {
+ // 查询所有的场所数据（除去详情表已有的）
+ List<PlaceEntity> list = baseMapper.getPlaceListByNoExt();
+ // 遍历更新
+ for (PlaceEntity placeEntity : list) {
+ QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("place_id",placeEntity.getId()).eq("is_deleted",0);
+ PlaceExtEntity one = placeExtService.getOne(queryWrapper);
+ if (null==one){
+ // 新增
+ PlaceExtEntity placeExtEntity = new PlaceExtEntity();
+ if (null!=placeEntity.getPrincipalUserId()){
+ // 待审核
+ placeExtEntity.setConfirmFlag(1);
+ }else {
+ // 待完善
+ placeExtEntity.setConfirmFlag(4);
+ }
+ placeExtEntity.setPlaceId(placeEntity.getId());
+ // 插入
+ placeExtService.save(placeExtEntity);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 商超数据处理
+ * @return
+ */
+ @Override
+ public Object placeAndRelHandle() {
+ // 查询未处理的商超数据
+ List<PlaceEntity> placeEntityList = baseMapper.placeAndRelHandle();
+ // 处理
+ for (PlaceEntity placeEntity : placeEntityList) {
+ if (Strings.isBlank(placeEntity.getHouseCode())){
+ // 并生成36位的houseCode
+ placeEntity.setHouseCode(IdUtils.getIdBy36());
+ // 商超数据
+ placeEntity.setSource(3);
+ // 更新
+ updateById(placeEntity);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * 根据编号集合查询对应的场所（按颜色区分近多少天没有发过任务的场所）
+ * @param stringList
+ * @param tableName
+ * @return
+ */
+ @Override
+ 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