From 4f6b7c7fec6139461c3702eee16f8b8715336316 Mon Sep 17 00:00:00 2001
From: llw <18235445130@163.com>
Date: Wed, 6 Sep 2017 11:43:34 +0800
Subject: [PATCH] tijiao

---
 src/main/java/com/zteits/irain/portal/vo/parkinglotdatacenter/ParkLotAndBerthsCountVO.java | 17 +++++++++++++++++
 src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java          | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zteits/irain/portal/vo/parkinglotdatacenter/ParkLotAndBerthsCountVO.java b/src/main/java/com/zteits/irain/portal/vo/parkinglotdatacenter/ParkLotAndBerthsCountVO.java
index 399c62f..6a811a7 100644
--- a/src/main/java/com/zteits/irain/portal/vo/parkinglotdatacenter/ParkLotAndBerthsCountVO.java
+++ b/src/main/java/com/zteits/irain/portal/vo/parkinglotdatacenter/ParkLotAndBerthsCountVO.java
@@ -24,6 +24,11 @@ public class ParkLotAndBerthsCountVO {
 	private Map<String,Integer> pkberthsCount;
 	//key：区县名称，value:停车场数
 	private Map<String,Integer> pkCount;
+	//key:区县名称，value:map{key:plType,停车场类型，value :车位数 }   
+	private Map<String,Object> pkberthsCountMap;
+	//key：区县名称，value:map{key:plType,停车场类型，value :停车场数 }   
+	private Map<String,Object> pkCountMap;
+	
 	public Map<String, Integer> getPkberthsCount() {
 		return pkberthsCount;
 	}
@@ -36,6 +41,18 @@ public class ParkLotAndBerthsCountVO {
 	public void setPkCount(Map<String, Integer> pkCount) {
 		this.pkCount = pkCount;
 	}
+	public Map<String, Object> getPkberthsCountMap() {
+		return pkberthsCountMap;
+	}
+	public void setPkberthsCountMap(Map<String, Object> pkberthsCountMap) {
+		this.pkberthsCountMap = pkberthsCountMap;
+	}
+	public Map<String, Object> getPkCountMap() {
+		return pkCountMap;
+	}
+	public void setPkCountMap(Map<String, Object> pkCountMap) {
+		this.pkCountMap = pkCountMap;
+	}
 	
 	
 }
diff --git a/src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java b/src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java
index c4cc4a4..95608e4 100644
--- a/src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java
+++ b/src/main/java/com/zteits/irain/portal/web/govclouds/DataGeneralizeController.java
@@ -463,4 +463,52 @@ public class DataGeneralizeController {
         
 		return new BizResultVO<ParkEqpAndPDACountDTO>().setData(parkEqpAndPDACountDTO);
 	}
+	
+	
+	/**
+	 * 分区统计停车场、停车位数量
+	 * langlw 2017-9-5
+	 * @param request
+	 * @return
+	 */
+	@ApiOperation(value="分区、停车场类型统计停车场、停车位数量")
+	@PostMapping("getParkAndBerthAndEquChartForPlType")
+	@ResponseBody
+	public BizResultVO<ParkLotAndBerthsCountVO> getParkAndBerthAndEquChartForPlType(@RequestBody StatisticParkLotCountByCountryRequest request){
+		if(null == request.getCityId()){
+			throw new BizException(ErrorType.PARAMM_NULL, "城市编号");
+		}
+		logger.info("对城市："+request.getCityId()+" 按照区域统计停车场、车位数量等信息");
+		//停车场数量 先查询缓存
+		BizResult<List<ParkLotCountStatisticByCountryDTO>> bizResultParkLot = parkingLotQueryService.statisticParkLotCountByCountryForPlType(request);
+		logger.info("调用后场dubbo服务,响应为: result={}", JSONObject.toJSONString(bizResultParkLot));
+        List<ParkLotCountStatisticByCountryDTO> parkLotCountList=bizResultParkLot.getData();
+        
+        Map<String,Object> pkberthsCountObjMap=Maps.newHashMap();
+        Map<String,Object> parkLotCountObjMap=Maps.newHashMap();
+       
+        
+        if(CollectionUtils.isNotEmpty(parkLotCountList)){
+        	for (ParkLotCountStatisticByCountryDTO dto : parkLotCountList) {
+				String countryName = dto.getPlCountryName();
+				 //停车场车位数
+		        Map<Integer,Integer> berthsCountMap = Maps.newHashMap();
+		        //停车场数
+		        Map<Integer,Integer> parkLotCountMap = Maps.newHashMap();
+				//停车场个数
+		        int pkCount = dto.getParkLotCount()==null?0:dto.getParkLotCount();
+		        Integer plType=dto.getPlType();
+		        parkLotCountMap.put(plType, pkCount);
+				parkLotCountObjMap.put(countryName, parkLotCountMap);
+				//停车位个数
+				int pkberthsCount = dto.getTotalBerths();
+				berthsCountMap.put(plType, pkberthsCount);
+				pkberthsCountObjMap.put(countryName, berthsCountMap);
+			}
+        }
+        ParkLotAndBerthsCountVO parkLotAndBerthsCountVO = new ParkLotAndBerthsCountVO();
+        parkLotAndBerthsCountVO.setPkberthsCountMap(pkberthsCountObjMap);
+        parkLotAndBerthsCountVO.setPkCountMap(parkLotCountObjMap);
+		return new BizResultVO<ParkLotAndBerthsCountVO>().setData(parkLotAndBerthsCountVO);
+	}
 }
--
libgit2 0.21.4