TbAreaServiceImpl.java 24.3 KB
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636
package com.zteits.sys.biz;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

import com.zteits.clouds.api.dto.sys.param.*;
import com.google.common.collect.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import com.alibaba.fastjson.JSONObject;
import com.clouds.common.log.LogSelf;
import com.clouds.common.utils.LogSelfFactory;
import com.clouds.common.utils.ResultUtils;
import com.clouds.common.utils.SequenceUtil;
import com.xiaoleilu.hutool.util.CollectionUtil;
import com.zteits.clouds.api.apibase.bean.BizResult;
import com.zteits.clouds.api.apibase.bean.PageBean;
import com.zteits.clouds.api.apibase.constants.AreaTypeEnum;
import com.zteits.clouds.api.apibase.constants.ErrorType;
import com.zteits.clouds.api.apibase.constants.SequenceTypeEnum;
import com.zteits.clouds.api.apibase.exception.BizException;
import com.zteits.clouds.api.dto.park.dto.ParkingLotDTO;
import com.zteits.clouds.api.dto.park.param.IsAllowDelAreaBlockRequest;
import com.zteits.clouds.api.dto.park.param.QueryParkingLotByAreaBlockRequest;
import com.zteits.clouds.api.dto.pay.param.ChangeBlockForParkLotRequest;
import com.zteits.clouds.api.dto.sys.AreaTreeDTO;
import com.zteits.clouds.api.dto.sys.CityAreaTreeDTO;
import com.zteits.clouds.api.dto.sys.QueryProvinceCityAreaByBlockIdsDTO;
import com.zteits.clouds.api.dto.sys.TbAreaDTO;
import com.zteits.clouds.api.service.park.ParkingLotQueryService;
import com.zteits.clouds.api.service.park.ParkingLotService;
import com.zteits.clouds.api.service.sys.TbAreaService;
import com.zteits.sys.dao.SysOrgAreaDao;
import com.zteits.sys.dao.TbAreaBlockDao;
import com.zteits.sys.dao.TbAreaDao;
import com.zteits.sys.domain.TbArea;
import com.zteits.sys.domain.TbAreaBlock;

@Service("com.zteits.sys.biz.TbAreaServiceImpl")
public class TbAreaServiceImpl implements TbAreaService {

    private static final LogSelf log = LogSelfFactory.getLogSelf(TbAreaServiceImpl.class);
    @Autowired
    private TbAreaDao tbAreaDao;

    @Autowired
    private TbAreaBlockDao tbAreaBlockDao;

    @Autowired
    private SysOrgAreaDao sysOrgAreaDao;

    @Autowired
	private ParkingLotQueryService parkingLotQueryService;
    
    @Autowired
    private ParkingLotService parkingLotService;

    @Override
    public BizResult<List<TbAreaDTO>> queryNextLowerLeverById(TbAreaQueryRequest request) {
        log.info("请求参数:" + JSONObject.toJSONString(request));
        if (null == request.getId()) {
            throw new BizException(ErrorType.PARAMM_NULL, "区域id");
        }
        List<TbAreaDTO> dtoList = new ArrayList<>();
        List<TbArea> nextLowerLeverArea = tbAreaDao.queryNextLowerLeverById(request.getId());
        if (!CollectionUtils.isEmpty(nextLowerLeverArea)) {
            for (TbArea tbArea : nextLowerLeverArea) {
                TbAreaDTO dto = new TbAreaDTO();
                if (null != tbArea) {
                    BeanUtils.copyProperties(tbArea, dto);
                }
                dtoList.add(dto);
            }
        }
        return new BizResult<List<TbAreaDTO>>(dtoList);
    }

    @Override
    public BizResult<List<TbAreaBlockDTO>> queryNextLowerLeverByIdForArea(TbAreaQueryRequest request) {
        log.info("请求参数:" + JSONObject.toJSONString(request));
        if (null == request.getId()) {
            throw new BizException(ErrorType.PARAMM_NULL, "区域id");
        }
        List<TbAreaBlockDTO> dtoList = new ArrayList<>();
        List<TbAreaBlock> nextLowerLeverArea = tbAreaBlockDao.queryNextLowerLeverByIdForArea(request.getId());
        if (!CollectionUtils.isEmpty(nextLowerLeverArea)) {
            for (TbAreaBlock tbArea : nextLowerLeverArea) {
                TbAreaBlockDTO dto = new TbAreaBlockDTO();
                if (null != tbArea) {
                    BeanUtils.copyProperties(tbArea, dto);
                }
                dtoList.add(dto);
            }
        }
        return new BizResult<>(dtoList);
    }

    @Override
    public BizResult<List<TbAreaDTO>> queryProvince(TbAreaQueryProvinceRequest request) {
        log.info("请求参数:" + JSONObject.toJSONString(request));
        if (null == request) {
            throw new BizException(ErrorType.PARAMM_NULL, "区域id");
        }
        List<TbAreaDTO> dtoList = new ArrayList<>();
        List<TbArea> province = tbAreaDao.queryProvince();
        if (!CollectionUtils.isEmpty(province)) {
            for (TbArea tbArea : province) {
                TbAreaDTO dto = new TbAreaDTO();
                if (null != tbArea) {
                    BeanUtils.copyProperties(tbArea, dto);
                }
                dtoList.add(dto);
            }
        }
        return new BizResult<List<TbAreaDTO>>(dtoList);
    }

    @Override
    public BizResult<List<AreaTreeDTO>> queryAreaBlockByOrgId(AreaBlockByOrgIdQueryRequest request) {
        if (null == request.getOrgId()) {
            throw new BizException(ErrorType.PARAMM_NULL, "归属组织Id");
        }

        List<TbArea> areas = tbAreaDao.queryTbAreaByAreaType(
            Arrays.asList(AreaTypeEnum.PROVINCE.code(), AreaTypeEnum.CITY.code(), AreaTypeEnum.DISTRICT.code()));

        List<TbAreaBlock> areaBlocks = tbAreaBlockDao.queryAreaBlockByAreaType(Arrays.asList(AreaTypeEnum.BLOCK.code()),
            request.getOrgId());

        List<AreaTreeDTO> areaTreeDTOS = new ArrayList<>();
        AreaTreeDTO dto;
        if (!CollectionUtils.isEmpty(areas)) {
            for (TbArea tbArea : areas) {
                dto = new AreaTreeDTO();
                BeanUtils.copyProperties(tbArea, dto);
                areaTreeDTOS.add(dto);
            }
        }

        if (!CollectionUtils.isEmpty(areaBlocks)) {
            for (TbAreaBlock tbArea : areaBlocks) {
                dto = new AreaTreeDTO();
                BeanUtils.copyProperties(tbArea, dto);
                areaTreeDTOS.add(dto);
            }
        }

        return new BizResult<>(areaTreeDTOS);
    }
    public static void main(String[] args) {
        String nextId = "1109248454218356736011232";
        long parseLong = Long.parseLong(nextId.substring(0, 18));
        System.out.println(parseLong);

    }
    @Transactional
    @Override
    public BizResult<Integer> saveOrUpdateAreaBlock(AreaBlockSaveOrUpdateRequest request) {

        TbAreaBlock tbAreaBlock = new TbAreaBlock();
        BeanUtils.copyProperties(request, tbAreaBlock);
        tbAreaBlock.setModfiyDate(new Date());
        tbAreaBlock.setModfiyEmpid(request.getOpId() + "");

        int num;
        if (null == request.getId()) {
            //新增
            String nextId = SequenceUtil.getNextId(SequenceTypeEnum.AREA_BLOCK_CODE);
            tbAreaBlock.setAreaCode(Long.parseLong(nextId.substring(0,18)));
            tbAreaBlock.setDataState(1);
            tbAreaBlock.setCreateDate(new Date());
            tbAreaBlock.setCreateEmpid(request.getOpId()+"");
            num = tbAreaBlockDao.saveTbAreaBlock(tbAreaBlock);
        } else {
            //更新
            num = tbAreaBlockDao.updateTbAreaBlock(tbAreaBlock);
            log.info("通过块ID,更新停车场对应的块名称");
            ChangeBlockForParkLotRequest updateBlockForParkReq = new ChangeBlockForParkLotRequest();
            updateBlockForParkReq.setModifyOp(request.getOpId());
            updateBlockForParkReq.setModifyTime(new Date());
            updateBlockForParkReq.setPlAreaBlockId(request.getId());
            updateBlockForParkReq.setPlAreaBlockName(request.getAreaName());
            updateBlockForParkReq.setSysCode(request.getSysCode());
            /**通过办事处id更新停车场块信息.*/
            BizResult<Boolean> bizResult = parkingLotService.updateParkLotBlockNameByBlockId(updateBlockForParkReq);
            log.info("更新停车场块名称响应信息为:"+JSONObject.toJSONString(bizResult));
            if(ResultUtils.getBizResultData(bizResult)){
            	log.info("更新停车场块名称成功");
            }
        }

        return new BizResult<>(num);
    }

    @Override
    public BizResult<List<TbAreaDTO>> queryAreaBlockByParentId(AreaBlockQueryByParentIdRequest request) {
        if (null == request.getAreaId()) {
            throw new BizException(ErrorType.PARAMM_NULL, "区县ID");
        }

        if (null == request.getOrgId()) {
            throw new BizException(ErrorType.PARAMM_NULL, "归属组织ID");
        }

        List<TbAreaBlock> areaBlocks = tbAreaBlockDao.queryAreaBlockByParentIdAndOrgId(request.getAreaId(),
            request.getOrgId());

        List<TbAreaDTO> dtos = new ArrayList<>();
        if (!CollectionUtils.isEmpty(areaBlocks)) {
            TbAreaDTO dto;
            for (TbAreaBlock block : areaBlocks) {
                dto = new TbAreaDTO();
                BeanUtils.copyProperties(block, dto);
                dtos.add(dto);
            }
        }
        return new BizResult<>(dtos);
    }

    @Override
    @Transactional
    public BizResult<Integer> deleteAreaBlockByAreaBlockId(AreaBlockDeleteByAreaBlockIdRequest request) {
        if (null == request.getAreaBlockId()) {
            throw new BizException(ErrorType.PARAMM_NULL, "区块ID");
        }
		log.info("调用PARK,判断是否允许删除该区块");
		IsAllowDelAreaBlockRequest allowDelRequest = new IsAllowDelAreaBlockRequest();
		List<Long> areaBlockIds = new ArrayList<>();
		areaBlockIds.add(request.getAreaBlockId());
		allowDelRequest.setSysCode(request.getSysCode());
		allowDelRequest.setPlAreaBlockId(areaBlockIds );
		BizResult<Boolean> bizResult = parkingLotService.isAllowDeleteAreaBlock(allowDelRequest );
		if(!bizResult.isSuccess() || !bizResult.getErrCode().getCode().equals(ErrorType.BIZ_SUCCESS.getCode())){
			throw new BizException(bizResult.getErrCode(),bizResult.getErrMsg());
		}
        log.info("根据区块ID[{}]删除区块----start---", request.getAreaBlockId());
        /**
         * 1、根据区块ID 删除区块与组织的关联关系
         */
        int num = sysOrgAreaDao.deleteOrgAreaRelationByAreaId(request.getAreaBlockId());
        log.info("根据区块ID[{}]删除区块,删除区块与组织的关联关系{}条", request.getAreaBlockId(), num);
        /**
         * 2、删除 区块
         */
        num = tbAreaBlockDao.deleteTbAreaBlock(request.getAreaBlockId());
        log.info("根据区块ID[{}]删除区块,删除区块{}条", request.getAreaBlockId(), num);
        
        log.info("根据区块ID[{}]删除区块----end---", request.getAreaBlockId());
        return new BizResult<>(1);
    }

    @Override
    public BizResult<List<TbAreaDTO>> queryAreaByAreaType(AreaQueryByAreaTypeRequest request) {
        if (null == request.getAreaType()) {
            throw new BizException(ErrorType.PARAMM_NULL, "区域类型");
        }
        List<TbAreaDTO> dtos = new ArrayList<>();
        TbArea tbArea = new TbArea();
        tbArea.setAreaType(request.getAreaType());
        tbArea.setDataState(1);
        List<TbArea> areas = tbAreaDao.queryTbAreaByAreaType(Arrays.asList(request.getAreaType()));
        if (!CollectionUtils.isEmpty(areas)) {
            TbAreaDTO dto;
            for (TbArea area : areas) {
                dto = new TbAreaDTO();
                BeanUtils.copyProperties(area, dto);
                dtos.add(dto);
            }
        }
        return new BizResult<>(dtos);
    }

	@Override
	public BizResult<List<AreaTreeDTO>> queryAreaBlockByBlockId(AreaBlockQueryByAreaBlockIdsRequest request) {
		if (null == request.getPlBlockIds()) {
            throw new BizException(ErrorType.PARAMM_NULL, "区块ID");
        }
		List<AreaTreeDTO> dtos = new ArrayList<>();
		List<TbAreaBlock> areas = tbAreaBlockDao.queryAreaBlockByBlockId(request.getPlBlockIds());
		if (!CollectionUtils.isEmpty(areas)) {
            for (TbAreaBlock area : areas) {
            	AreaTreeDTO dto = new AreaTreeDTO();
            	BeanUtils.copyProperties(area, dto);
                dtos.add(dto);
            }
        }
        return new BizResult<>(dtos);
	}

    @Override
    public BizResult<List<CityAreaTreeDTO>> queryCityAreaByBlockIds(CityAreaQueryBlockIdsRequest request) {

        List<CityAreaTreeDTO> resultDto = new ArrayList<>();

        if(CollectionUtils.isEmpty(request.getBlockIds())){
            throw new BizException(ErrorType.PARAMM_NULL,"区块ID集合");
        }

        List<TbAreaBlock> areaBlockList =   tbAreaBlockDao.queryAreaBlockByBlockId(request.getBlockIds());
        if(CollectionUtils.isEmpty(areaBlockList)){
            return new BizResult<>(resultDto);
        }

        Set<Long> parentIds = new HashSet<>();
        //获取排重后的父级节点id
        for(TbAreaBlock tbAreaBlock:areaBlockList){
            parentIds.add(tbAreaBlock.getParentId());
        }



        return null;
    }

	

    /**
     * 根据父级节点递归查询区域信息
     * @param
     * @return
     */
    //private CityAreaTreeDTO queryCityAreaTreeByParentIdOfRecursion(Long parentId){
    //    List<TbArea> areas =   tbAreaDao.queryTbAreaByParentId(parentId);
    //    CityAreaTreeDTO dto = new CityAreaTreeDTO();
    //    List<CityAreaTreeDTO> childList = new ArrayList<>();
    //    CityAreaTreeDTO tempDto = null;
    //    if(CollectionUtils.isEmpty(areas)){
    //        return null;
    //    }
    //
    //    for(TbArea area:areas){
    //        dto = new CityAreaTreeDTO();
    //        BeanUtils.copyProperties(area,dto);
    //        if(null != area.getParentId() && 0 != area.getParentId()){
    //            tempDto = queryCityAreaTreeByParentIdOfRecursion(area.getParentId());
    //            childList.add(tempDto);
    //        }
    //
    //    }
    //
    //
    //}
    
    
    
    @Override
	public BizResult<List<QueryProvinceCityAreaByBlockIdsDTO>> queryProvinceCityAreaByBlockIdsRequest(
			QueryProvinceCityAreaByBlockIdsRequest request) {
		if(CollectionUtils.isEmpty(request.getBlockIds())){
			 throw new BizException(ErrorType.PARAMM_NULL, "区块ID");
		}
		List<QueryProvinceCityAreaByBlockIdsDTO> VOlist=Lists.newArrayList();
		List<TbAreaBlock> list = tbAreaBlockDao.queryAreaBlockByBlockId(request.getBlockIds());
		for (TbAreaBlock tbAreaBlock : list) {
			QueryProvinceCityAreaByBlockIdsDTO dto=new QueryProvinceCityAreaByBlockIdsDTO();
			if(null !=tbAreaBlock){
				dto.setBlockId(null==tbAreaBlock.getId()?null:tbAreaBlock.getId());
				dto.setBlockName(StringUtils.isEmpty(tbAreaBlock.getAreaName())?"":tbAreaBlock.getAreaName());
				Long provinceId=tbAreaBlock.getParentId();
				TbArea tbArea=new TbArea();
				tbArea.setId(provinceId);
				TbArea area = tbAreaDao.queryTbAreaByTbArea(tbArea);
				if(null !=area){
					dto.setAreaId(null==area.getId()?null:area.getId());
					dto.setAreaName(StringUtils.isEmpty(area.getAreaName())?"":area.getAreaName());
					Long cityId=area.getParentId();
					TbArea city=new TbArea();
					city.setId(cityId);
					TbArea cityNew = tbAreaDao.queryTbAreaByTbArea(city);
					if(null !=cityNew){
						dto.setCityId(null==cityNew.getId()?null:cityNew.getId());
						dto.setCityName(StringUtils.isEmpty(cityNew.getAreaName())?"":cityNew.getAreaName());
						Long pId=cityNew.getParentId();
						TbArea pro=new TbArea();
						pro.setId(pId);
						TbArea province = tbAreaDao.queryTbAreaByTbArea(pro);
						if(null != province){
							dto.setProvinceId(null==province.getId()?null:province.getId());
							dto.setProvinceName(StringUtils.isEmpty(province.getAreaName())?"":province.getAreaName());
						}
					}
				}
				
			}
			
			VOlist.add(dto);
			
		}
		
		return new BizResult<List<QueryProvinceCityAreaByBlockIdsDTO>>(VOlist);
	}
    /**
	 * 通过操作员ID+组织id查询区域tree.<br/>
	 * 步骤:1.查找操作员对应的块信息.<br/>
	 *      2.通过块list查找对应的区县list.<br/>
	 *      3.通过区县父id list 查询地市list.<br/>
	 *      4.通过地市父id list 查询对应省份list.<br/>
	 * @param request
	 * @return
	 * 2017年12月27日  wangfs.<br/>
	 */
	@Override
	public BizResult<List<AreaTreeDTO>> queryAreaTreeByOpIdAndOrgId(QueryAreaBlockByOpIdAndOrgIdRequest request) {
		log.info("begin通过操作员ID查询组织树,入参={}",JSONObject.toJSON(request));
		List<AreaTreeDTO> areaTree = new ArrayList<>();
		if(request == null){
			 throw new BizException(ErrorType.PARAMM_NULL, "操作员ID为空");
		}
		/**1.通过操作员ID+组织id查询块信息.*/
		List<TbAreaBlock> areaBlockList = tbAreaBlockDao.queryAreaBlockByOpIdAndOrgId(request.getSysOpId(), request.getOrgId());
		log.info("获取块list.size()={}",!CollectionUtils.isEmpty(areaBlockList) ?areaBlockList.size():0);
		
		/**2.查询区县list.*/
		 //2.1 根据节点查询区域数据
		   List<TbArea> areaIds = tbAreaDao.queryTbAreaByIdList(this.getAreaCodeFromBlockList(areaBlockList));
		List<TbArea> areaList = tbAreaDao.queryAreaByParentIdAndAreaType(this.getAreaCodeFromAreaList(areaIds), AreaTypeEnum.DISTRICT.code());
		log.info("获取区县list.size()={}",!CollectionUtils.isEmpty(areaList) ?areaList.size():0);
		/**3.查询地市list.*/
		List<TbArea> cityList = tbAreaDao.queryAreaByIdsAndAreaType(this.getAreaCodeFromAreaList(areaList), AreaTypeEnum.CITY.code());
		log.info("获取地市list.size()={}",!CollectionUtils.isEmpty(cityList) ?cityList.size():0);
		/**4.查询省份list.*/
		List<TbArea> provList = tbAreaDao.queryAreaByIdsAndAreaType(this.getAreaCodeFromAreaList(cityList), AreaTypeEnum.PROVINCE.code());
		log.info("获取省份list.size()={}",!CollectionUtils.isEmpty(provList) ?provList.size():0);
		//添加块信息
		if(!CollectionUtils.isEmpty(areaBlockList) ){
				for(TbAreaBlock areaBlock:areaBlockList){
					AreaTreeDTO areaTreeDTO = new AreaTreeDTO();
					if(areaBlock == null){
						continue;
					}
					areaTreeDTO.setId(areaBlock.getId());
					areaTreeDTO.setAreaName(areaBlock.getAreaName());
					areaTreeDTO.setParentId(areaBlock.getParentId());
					areaTreeDTO.setAreaType(areaBlock.getAreaType());
					areaTree.add(areaTreeDTO);
			   }
		}
		//添加省份
		if(!CollectionUtils.isEmpty(provList)){
			AreaTreeDTO areaDTO = new AreaTreeDTO();
			areaDTO.setId(-1L);
			areaDTO.setAreaName("全国");
			areaDTO.setParentId(-1L);
			areaTree.add(areaDTO);
			for(TbArea area:provList){
				AreaTreeDTO areaTreeDTO = new AreaTreeDTO();
				if(area == null){
					continue;
				}
				areaTreeDTO.setId(area.getId());
				areaTreeDTO.setAreaName(area.getAreaName());
				areaTreeDTO.setParentId(-1L);
				areaTreeDTO.setAreaType(area.getAreaType());
				areaTree.add(areaTreeDTO);
		   }
		}
	
		//添加地市、区县
		if(!CollectionUtils.isEmpty(cityList)){
			cityList.addAll(areaList);
			for(TbArea area:cityList){
				AreaTreeDTO areaTreeDTO = new AreaTreeDTO();
				if(area == null){
					continue;
				}
				areaTreeDTO.setId(area.getId());
				areaTreeDTO.setAreaName(area.getAreaName());
				areaTreeDTO.setParentId(area.getParentId());
				areaTreeDTO.setAreaType(area.getAreaType());
				areaTree.add(areaTreeDTO);
		   }
		}
		log.info("end通过操作员ID查询组织树...");
		return new BizResult<List<AreaTreeDTO>>(areaTree);
	}
	
	/**
	 * 获取块中的区县list.<br/>
	 * @param areaBlockList
	 * @return
	 * 2017年12月27日  wangfs.<br/>
	 */
	private List<Long> getAreaCodeFromBlockList(List<TbAreaBlock> areaBlockList){
		Set<Long> set = new HashSet<>();
		if(!CollectionUtils.isEmpty(areaBlockList)){
			for(TbAreaBlock areaBlock:areaBlockList){
				if(areaBlock == null){
					continue;
				}
				set.add(areaBlock.getParentId());
			}
		}
		return  new ArrayList<Long>(set);
	}
	
	/**
	 * 查询区域父类id.<br/>
	 * @param
	 * @return
	 * 2017年12月27日  wangfs.<br/>
	 */
	private List<Long> getAreaCodeFromAreaIdList(List<TbArea> areaList){
		Set<Long> set = new HashSet<>();
		if(!CollectionUtils.isEmpty(areaList)){
			for(TbArea area:areaList){
				if(area == null){
					continue;
				}
				set.add(area.getId());
			}
		}
		return  new ArrayList<Long>(set);
	}
	
	
	
	
	/**
	 * 查询区域父类ids.<br/>
	 * @param
	 * @return
	 * 2017年12月27日  wangfs.<br/>
	 */
	private List<Long> getAreaCodeFromAreaList(List<TbArea> areaList){
		Set<Long> set = new HashSet<>();
		if(!CollectionUtils.isEmpty(areaList)){
			for(TbArea area:areaList){
				if(area == null){
					continue;
				}
				set.add(area.getParentId());
			}
		}
		return  new ArrayList<Long>(set);
	}
	
	/**
	 * 检查块名称是否唯一.<br/>
	 * @param request
	 * @return
	 * 2018年1月2日  wangfs.<br/>
	 */
	@Override
	public BizResult<Boolean> checkBlockNameUnique(CheckBlockNameUniqueRequest request) {
		log.info("begin检查块名称是否唯一性,入参={}",JSONObject.toJSON(request));
	    if (null == request || StringUtils.isEmpty(request.getBlockName())) {
            throw new BizException(ErrorType.PARAMM_NULL, "区块名称");
        }
	     
		Boolean flg = tbAreaBlockDao.checkBlockNameUnique(request);
		log.info("end检查块名称是否唯一性, true='存在',false='不存在',结果={}",flg);
		return new BizResult<Boolean>(flg);
	}

    @Override
    public BizResult<Map<TbAreaDTO,List<TbAreaBlockDTO>>> queryAreaByOpIdAndOrgId(QueryAreaBlockByOpIdAndOrgIdRequest request) {
        log.info("begin通过操作员ID查询组织树,入参={}",JSONObject.toJSON(request));
        if(request == null){
            throw new BizException(ErrorType.PARAMM_NULL, "操作员ID为空");
        }
        Map<TbAreaDTO,List<TbAreaBlockDTO>> resultMap = new HashMap<>();
        /**1.通过操作员ID+组织id查询块信息.*/
        List<TbAreaBlock> areaBlockList = tbAreaBlockDao.queryAreaBlockByOpIdAndOrgId(request.getSysOpId(), request.getOrgId());
        log.info("获取块list.size()={}",!CollectionUtils.isEmpty(areaBlockList) ?areaBlockList.size():0);
        if(CollectionUtil.isEmpty(areaBlockList)){
        	return new BizResult<>(resultMap);
        }
        Map<Long,List<TbAreaBlockDTO>> areaBlockMap = areaBlockList.stream().map(areaBlock->{
        	TbAreaBlockDTO areaBlockDTO = new TbAreaBlockDTO();
        	BeanUtils.copyProperties(areaBlock, areaBlockDTO);
        	return areaBlockDTO;
        }).collect(Collectors.groupingBy(TbAreaBlockDTO::getParentId));
        /**2.查询区县list.*/
        List<TbArea> areaList = tbAreaDao.queryAreaByIdsAndAreaType(this.getAreaCodeFromBlockList(areaBlockList), AreaTypeEnum.DISTRICT.code());
        log.info("获取区县list.size()={}",!CollectionUtils.isEmpty(areaList) ?areaList.size():0);
        if(CollectionUtil.isNotEmpty(areaList)){
        	Set<Long> areaNos = new HashSet<>();
            for (TbArea area:areaList) {
                TbAreaDTO dto=new TbAreaDTO();
                if(area==null){
                	continue;
                }
                BeanUtils.copyProperties(area,dto);
                if(areaNos.contains(area.getId())){
                	continue;
                }
                areaNos.add(area.getAreaCode());
                resultMap.put(dto, areaBlockMap.get(area.getId()));
            }
        }
        return new BizResult<>(resultMap);
    }

    @Override
    public BizResult<List<TbAreaBlockDTO>> queryAreaBlockListByOrgId(AreaBlockByOrgIdQueryRequest request) {
        if (null == request.getOrgId()) {
            throw new BizException(ErrorType.PARAMM_NULL, "归属组织Id");
        }
        List<TbAreaBlock> areaBlocks = tbAreaBlockDao.queryAreaBlockByAreaType(Arrays.asList(AreaTypeEnum.BLOCK.code()),
                request.getOrgId());
        List<TbAreaBlockDTO> dtoList=new ArrayList<>();
        if(CollectionUtil.isNotEmpty(areaBlocks)){
            for (TbAreaBlock areaBlock : areaBlocks) {
                TbAreaBlockDTO dto=new TbAreaBlockDTO();
                if(areaBlock!=null){
                    BeanUtils.copyProperties(areaBlock,dto);
                    dtoList.add(dto);
                }
            }
        }
        return new BizResult<>(dtoList);
    }

    @Override
    public BizResult<TbAreaDTO> queryAreaByAreaId(AreaQueryByAreaIdRequest request) {
        if (null == request.getAreaId()) {
            throw new BizException(ErrorType.PARAMM_NULL, "区域id为空!");
        }
        TbArea area = tbAreaDao.queryTbAreaByAreaId(request.getAreaId());
        TbAreaDTO dto = new TbAreaDTO();
        BeanUtils.copyProperties(area, dto);
        return new BizResult<>(dto);
    }

}