Commit 4f6b7c7fec6139461c3702eee16f8b8715336316
1 parent
5049cdb0
tijiao
Showing
2 changed files
with
65 additions
and
0 deletions
src/main/java/com/zteits/irain/portal/vo/parkinglotdatacenter/ParkLotAndBerthsCountVO.java
... | ... | @@ -24,6 +24,11 @@ public class ParkLotAndBerthsCountVO { |
24 | 24 | private Map<String,Integer> pkberthsCount; |
25 | 25 | //key:区县名称,value:停车场数 |
26 | 26 | private Map<String,Integer> pkCount; |
27 | + //key:区县名称,value:map{key:plType,停车场类型,value :车位数 } | |
28 | + private Map<String,Object> pkberthsCountMap; | |
29 | + //key:区县名称,value:map{key:plType,停车场类型,value :停车场数 } | |
30 | + private Map<String,Object> pkCountMap; | |
31 | + | |
27 | 32 | public Map<String, Integer> getPkberthsCount() { |
28 | 33 | return pkberthsCount; |
29 | 34 | } |
... | ... | @@ -36,6 +41,18 @@ public class ParkLotAndBerthsCountVO { |
36 | 41 | public void setPkCount(Map<String, Integer> pkCount) { |
37 | 42 | this.pkCount = pkCount; |
38 | 43 | } |
44 | + public Map<String, Object> getPkberthsCountMap() { | |
45 | + return pkberthsCountMap; | |
46 | + } | |
47 | + public void setPkberthsCountMap(Map<String, Object> pkberthsCountMap) { | |
48 | + this.pkberthsCountMap = pkberthsCountMap; | |
49 | + } | |
50 | + public Map<String, Object> getPkCountMap() { | |
51 | + return pkCountMap; | |
52 | + } | |
53 | + public void setPkCountMap(Map<String, Object> pkCountMap) { | |
54 | + this.pkCountMap = pkCountMap; | |
55 | + } | |
39 | 56 | |
40 | 57 | |
41 | 58 | } | ... | ... |
src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java
... | ... | @@ -463,4 +463,52 @@ public class DataGeneralizeController { |
463 | 463 | |
464 | 464 | return new BizResultVO<ParkEqpAndPDACountDTO>().setData(parkEqpAndPDACountDTO); |
465 | 465 | } |
466 | + | |
467 | + | |
468 | + /** | |
469 | + * 分区统计停车场、停车位数量 | |
470 | + * langlw 2017-9-5 | |
471 | + * @param request | |
472 | + * @return | |
473 | + */ | |
474 | + @ApiOperation(value="分区、停车场类型统计停车场、停车位数量") | |
475 | + @PostMapping("getParkAndBerthAndEquChartForPlType") | |
476 | + @ResponseBody | |
477 | + public BizResultVO<ParkLotAndBerthsCountVO> getParkAndBerthAndEquChartForPlType(@RequestBody StatisticParkLotCountByCountryRequest request){ | |
478 | + if(null == request.getCityId()){ | |
479 | + throw new BizException(ErrorType.PARAMM_NULL, "城市编号"); | |
480 | + } | |
481 | + logger.info("对城市:"+request.getCityId()+" 按照区域统计停车场、车位数量等信息"); | |
482 | + //停车场数量 先查询缓存 | |
483 | + BizResult<List<ParkLotCountStatisticByCountryDTO>> bizResultParkLot = parkingLotQueryService.statisticParkLotCountByCountryForPlType(request); | |
484 | + logger.info("调用后场dubbo服务,响应为: result={}", JSONObject.toJSONString(bizResultParkLot)); | |
485 | + List<ParkLotCountStatisticByCountryDTO> parkLotCountList=bizResultParkLot.getData(); | |
486 | + | |
487 | + Map<String,Object> pkberthsCountObjMap=Maps.newHashMap(); | |
488 | + Map<String,Object> parkLotCountObjMap=Maps.newHashMap(); | |
489 | + | |
490 | + | |
491 | + if(CollectionUtils.isNotEmpty(parkLotCountList)){ | |
492 | + for (ParkLotCountStatisticByCountryDTO dto : parkLotCountList) { | |
493 | + String countryName = dto.getPlCountryName(); | |
494 | + //停车场车位数 | |
495 | + Map<Integer,Integer> berthsCountMap = Maps.newHashMap(); | |
496 | + //停车场数 | |
497 | + Map<Integer,Integer> parkLotCountMap = Maps.newHashMap(); | |
498 | + //停车场个数 | |
499 | + int pkCount = dto.getParkLotCount()==null?0:dto.getParkLotCount(); | |
500 | + Integer plType=dto.getPlType(); | |
501 | + parkLotCountMap.put(plType, pkCount); | |
502 | + parkLotCountObjMap.put(countryName, parkLotCountMap); | |
503 | + //停车位个数 | |
504 | + int pkberthsCount = dto.getTotalBerths(); | |
505 | + berthsCountMap.put(plType, pkberthsCount); | |
506 | + pkberthsCountObjMap.put(countryName, berthsCountMap); | |
507 | + } | |
508 | + } | |
509 | + ParkLotAndBerthsCountVO parkLotAndBerthsCountVO = new ParkLotAndBerthsCountVO(); | |
510 | + parkLotAndBerthsCountVO.setPkberthsCountMap(pkberthsCountObjMap); | |
511 | + parkLotAndBerthsCountVO.setPkCountMap(parkLotCountObjMap); | |
512 | + return new BizResultVO<ParkLotAndBerthsCountVO>().setData(parkLotAndBerthsCountVO); | |
513 | + } | |
466 | 514 | } | ... | ... |