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 | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 114 insertions(+), 0 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 368740a..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;
@@ -33,6 +34,9 @@
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;
@@ -90,6 +94,9 @@
@Autowired
private GridMapper gridMapper;
+
+ @Autowired
+ private IHouseholdService householdService;
/**
* 自定义列表查询
@@ -542,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 {
// 通过定位点落面分析网格位置，反向推出社区派出所相关数据
@@ -841,4 +852,107 @@
}
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