Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-05 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java

@@ -8,9 +8,16 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.dtos.grid.ComMngVillageListAppDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingHouseVO;
import com.panzhihua.common.model.vos.grid.ComMngVillageBuildingVO;
import com.panzhihua.common.model.vos.grid.admin.ComMngVillageStatisticsVO;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActDAO;
@@ -238,4 +245,68 @@
    public R getVillage(Long villageId){
        return R.ok(this.baseMapper.getVillageById(villageId));
    }

    /**
     * 综治app-小区列表
     * @param villageListAppDTO 请求参数
     * @return  小区列表
     */
    @Override
    public R getGridVillageList(ComMngVillageListAppDTO villageListAppDTO){
        return R.ok(this.baseMapper.getGridVillageList(new Page(villageListAppDTO.getPageNum(),villageListAppDTO.getPageSize()),villageListAppDTO));
    }

    /**
     * 综治app-根据小区id查询小区下楼栋列表
     * @param villageId 小区id
     * @return  楼栋列表
     */
    @Override
    public R getGridVillageBuildingList(Long villageId){

        List<ComMngVillageBuildingVO> villageBuildingList = this.baseMapper.getGridVillageBuildingList(villageId);
        if(!villageBuildingList.isEmpty()){
            villageBuildingList.forEach(villageBuilding -> {
                if(!villageBuilding.getFloor().contains("栋")){
                    villageBuilding.setFloorString(villageBuilding.getFloor() + "栋");
                }else{
                    villageBuilding.setFloorString(villageBuilding.getFloor());
                }
                if(!villageBuilding.getUnitNo().contains("单元")){
                    villageBuilding.setUnitNoString(villageBuilding.getUnitNo() + "单元");
                }else{
                    villageBuilding.setUnitNoString(villageBuilding.getUnitNo());
                }
            });
        }
        return R.ok(villageBuildingList);
    }

    @Override
    public R delGridVillage(List<Long> villageIds){

        if(villageIds.isEmpty()){
            return R.fail("请选择需要删除的小区");
        }
        //查询需要删除的小区下面是否绑定的有房屋
        Integer count = this.baseMapper.getVillageHouseCount(villageIds);
        if(count > 0){
            return R.fail("您选择的小区已被引用，无法删除");
        }
        if(this.baseMapper.deleteBatchIds(villageIds) > 0){
            return R.ok();
        }
        return R.fail("删除失败");
    }

    @Override
    public R getGridVillageStatistics(){
        return R.ok(this.baseMapper.getGridVillageStatistics());
    }

    @Override
    public R getGridVillageListExport(ComMngVillageListExportAdminDTO villageListAppDTO){
        return R.ok(this.baseMapper.getGridVillageLists(villageListAppDTO));
    }

}