From ffcd3e31c9938eb256d616c80edbe1821e9fb2bf Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期五, 02 七月 2021 16:15:34 +0800 Subject: [PATCH] 综治后台小区模块接口 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 111 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java index a55c36a..28ff7f9 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java @@ -2,6 +2,7 @@ import cn.hutool.core.util.IdcardUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,6 +11,8 @@ import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO; import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO; import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO; +import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationRelationHouseDTO; +import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComMngCascadeHouseVO; import com.panzhihua.common.model.vos.community.ComMngPopulationHouseDetailAdminVO; @@ -18,6 +21,8 @@ import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseDetailVO; import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseVO; import com.panzhihua.common.model.vos.grid.PopulationListVO; +import com.panzhihua.common.model.vos.grid.admin.ComMngSubordinateVO; +import com.panzhihua.common.utlis.Snowflake; import com.panzhihua.service_community.dao.ComActVillageDAO; import com.panzhihua.service_community.dao.ComMngPopulationDAO; import com.panzhihua.service_community.dao.ComMngPopulationHouseDAO; @@ -33,6 +38,10 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; import javax.annotation.Resource; import java.util.*; @@ -53,6 +62,8 @@ private ComMngPopulationDAO comMngPopulationDAO; @Resource private ComActVillageDAO comActVillageDAO; + @Resource + private ComMngPopulationHouseDAO comMngPopulationHouseDAO; /** * 查询房屋级联菜单 @@ -332,4 +343,104 @@ return R.ok(buildingHouseDetailVO); } + private static <T> Predicate<T> distinctByKey(Function<? super T, Object> keyExtractor) { + Map<Object, Boolean> seen = new ConcurrentHashMap<>(); + return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null; + } + + @Override + public R subordinate(ComMngPopulationSubordinateDTO subordinateDTO){ + + List<ComMngSubordinateVO> subordinateList = new ArrayList<>(); + + ComMngPopulationHouseDO houseDO = null; + if(subordinateDTO.getHouseId() != null){ + houseDO = this.baseMapper.selectById(subordinateDTO.getHouseId()); + } + + switch (subordinateDTO.getType()){ + case 1: + subordinateList = this.baseMapper.getHouseLevelByFloors(subordinateDTO.getVillageId()); +// subordinateList = subordinateList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getFloor()))), ArrayList::new)); + subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getFloor)).collect(Collectors.toList()); + subordinateList.forEach(cascade -> { + if(cascade.getFloor().contains("栋")){ + cascade.setName(cascade.getFloor()); + }else{ + cascade.setName(cascade.getFloor() + "栋"); + } + }); + break; + case 2: + if(houseDO != null){ + subordinateList = this.baseMapper.getHouseLevelByUnitNos(houseDO.getVillageId(),houseDO.getFloor()); + subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getUnitNo)).collect(Collectors.toList()); +// subordinateList = subordinateList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getUnitNo()))), ArrayList::new)); + subordinateList.forEach(cascade -> { + if(cascade.getUnitNo().contains("单元")){ + cascade.setName(cascade.getUnitNo()); + }else{ + cascade.setName(cascade.getUnitNo() + "单元"); + } + }); + } + break; + case 3: + if(houseDO != null) { + subordinateList = this.baseMapper.getHouseLevelByHouseNos(houseDO.getVillageId(), houseDO.getFloor(), houseDO.getUnitNo()); + subordinateList = subordinateList.stream().filter(distinctByKey(ComMngSubordinateVO::getHouseNo)).collect(Collectors.toList()); +// subordinateList = subordinateList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getHouseNo()))), ArrayList::new)); + subordinateList.forEach(cascade -> { + cascade.setName(cascade.getHouseNo()); + }); + } + break; + default: + break; + } + return R.ok(subordinateList); + } + + public R populationRelationHouse(ComMngPopulationRelationHouseDTO relationHouseDTO){ + + if(relationHouseDTO.getPopulationId().isEmpty()){ + return R.fail("请选择居民"); + } + + //查询房屋信息 + ComMngPopulationHouseDO houseDO = comMngPopulationHouseDAO.selectById(relationHouseDTO.getHouseId()); + if(houseDO == null){ + return R.fail("未查到房屋信息"); + } + + relationHouseDTO.getPopulationId().forEach(population -> { + //修改人口信息 + ComMngPopulationDO populationDO = new ComMngPopulationDO(); + populationDO.setId(population); + populationDO.setHouseId(houseDO.getId()); + populationDO.setRoad(houseDO.getAlley()); + populationDO.setDoorNo(houseDO.getHouseNum()); + populationDO.setFloor(houseDO.getFloor()); + populationDO.setUnitNo(houseDO.getUnitNo()); + populationDO.setHouseNo(houseDO.getHouseNo()); + comMngPopulationDAO.updateById(populationDO); + + //添加房屋关系 + ComMngPopulationHouseUserDO houseUserDO = comMngPopulationHouseUserDAO.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>() + .lambda().eq(ComMngPopulationHouseUserDO::getPopulId,population).eq(ComMngPopulationHouseUserDO::getHouseId,relationHouseDTO.getHouseId())); + if(houseUserDO == null){ + houseUserDO = new ComMngPopulationHouseUserDO(); + houseUserDO.setId(Snowflake.getId()); + houseUserDO.setHouseId(relationHouseDTO.getHouseId()); + houseUserDO.setPopulId(population); + houseUserDO.setRelationId(ComMngPopulationHouseUserDO.relationId.zizhu); + comMngPopulationHouseUserDAO.insert(houseUserDO); + }else{ + houseUserDO.setRelationId(ComMngPopulationHouseUserDO.relationId.zizhu); + comMngPopulationHouseUserDAO.updateById(houseUserDO); + } + }); + return R.ok(); + } + } -- Gitblit v1.7.1