diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/CloudsParDurationController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/CloudsParDurationController.java
index 1ad05bd..32bc273 100644
--- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/CloudsParDurationController.java
+++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/CloudsParDurationController.java
@@ -1,13 +1,17 @@
 package com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic;
 
-import java.math.BigDecimal;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -18,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.dubbo.common.utils.StringUtils;
+import com.clouds.common.utils.DateUtil;
 import com.clouds.common.utils.excle.ExcelUtil;
 import com.clouds.common.utils.excle.ExcleFillDateManager;
 import com.clouds.common.utils.excle.Layouter;
@@ -25,10 +30,8 @@ import com.clouds.common.web.BizController;
 import com.clouds.common.web.vo.BizResultVO;
 import com.zteits.clouds.api.apibase.bean.BizResult;
 import com.zteits.clouds.api.apibase.bean.PageBean;
-import com.zteits.clouds.api.dto.clouds.dto.BillManageDTO;
 import com.zteits.clouds.api.dto.clouds.dto.ParkDurationDTO;
 import com.zteits.clouds.api.dto.clouds.dto.ParkDurationForHourDTO;
-import com.zteits.clouds.api.dto.clouds.param.BillQueryRequest;
 import com.zteits.clouds.api.dto.clouds.param.ParkDurationRequest;
 import com.zteits.clouds.api.service.clouds.CloudsParDurationService;
 
@@ -44,12 +47,40 @@ public class CloudsParDurationController extends BizController{
 	/**
 	 * 企业云平台->停车时长折线图－>按日.<br/>
 	 * @return
+	 * @throws Exception 
 	 */
 	@ApiOperation("企业云平台->停车时长折线图－>按日")
 	@PostMapping("/queryEchartsForParkDurationForDay")
-	public BizResultVO<List<ParkDurationDTO>> queryEchartsForParkDurationForDay(@RequestBody ParkDurationRequest parkDurationRequest){
-		BizResult<List<ParkDurationDTO>> result  = cloudsParDurationService.queryEchartsForParkDurationForDay(parkDurationRequest);
-		return new BizResultVO<List<ParkDurationDTO>>(result);
+	public BizResultVO<Map<String,Object>> queryEchartsForParkDurationForDay(@RequestBody ParkDurationRequest parkDurationRequest,HttpServletResponse response) throws Exception{
+		BizResult<Map<String,Object>> result  = cloudsParDurationService.queryEchartsForParkDurationForDay(parkDurationRequest);
+       
+		return new BizResultVO<Map<String,Object>>(result);
+	}
+	
+	/**
+	 * 获取2个时间的时间所有天数.<br/>
+	 * @param parkDurationRequest
+	 * @return
+	 */
+	public List<String> getTwoDaysDay(ParkDurationRequest parkDurationRequest){
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		String beginTime = DateUtil.getDateString(parkDurationRequest.getParkOutBeginTime(),"yyyy-MM-dd");
+		String endTime = DateUtil.getDateString(parkDurationRequest.getParkOutEndTime(),"yyyy-MM-dd");
+		List<String> dateList =new ArrayList<String>(); 
+		//获取开始结束之间的所有日期
+	    try {
+			List<Date> datas = DateUtil.getBetweenDates(format.parse(beginTime),format.parse(endTime));
+			if(!CollectionUtils.isEmpty(datas)){
+				for(Date e:datas){
+					if(e != null){
+						dateList.add(format.format(e));
+					}
+				}
+			}
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+	    return dateList;
 	}
 	
 	/**
@@ -228,12 +259,13 @@ public class CloudsParDurationController extends BizController{
 	/**
 	 * 企业云平台->停车时长折线图－>按日.<br/>
 	 * @return
+	 * @throws Exception 
 	 */
 	@ApiOperation("企业云平台->停车时长折线图－>按月")
 	@PostMapping("/queryEchartsForParkDurationForMonth")
-	public BizResultVO<List<ParkDurationDTO>> queryEchartsForParkDurationForMonth(@RequestBody ParkDurationRequest parkDurationRequest){
-		BizResult<List<ParkDurationDTO>> result  = cloudsParDurationService.queryEchartsForParkDurationForMonth(parkDurationRequest);
-		return new BizResultVO<List<ParkDurationDTO>>(result);
+	public BizResultVO<Map<String,Object>> queryEchartsForParkDurationForMonth(@RequestBody ParkDurationRequest parkDurationRequest) throws Exception{
+		BizResult<Map<String,Object>> result  = cloudsParDurationService.queryEchartsForParkDurationForMonth(parkDurationRequest);
+		return new BizResultVO<Map<String,Object>>(result);
 	}
 	
 	/**
@@ -298,4 +330,5 @@ public class CloudsParDurationController extends BizController{
 	
 	
 	
+	
 }