BJ_ZTEITS-Developers / zteits-bcp-portal

Commit d8aac32cfb05b5b30cd27eb45e6d12082b58985b

Authored by 王富生
1 parent 3539f7d2

提交停车时长

Inline Side-by-side
Showing 1 changed file with 42 additions and 9 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/CloudsParDurationController.java
  View file @d8aac32
1 1 package com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic;
2 2  
3   -import java.math.BigDecimal;
  3 +import java.text.ParseException;
4 4 import java.text.SimpleDateFormat;
5 5 import java.util.ArrayList;
  6 +import java.util.Date;
  7 +import java.util.HashMap;
6 8 import java.util.List;
  9 +import java.util.Map;
7 10  
8 11 import javax.servlet.http.HttpServletRequest;
9 12 import javax.servlet.http.HttpServletResponse;
10 13  
  14 +import org.apache.commons.collections.map.HashedMap;
11 15 import org.apache.poi.xssf.usermodel.XSSFSheet;
12 16 import org.springframework.beans.factory.annotation.Autowired;
13 17 import org.springframework.util.CollectionUtils;
... ... @@ -18,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
18 22 import org.springframework.web.bind.annotation.RestController;
19 23  
20 24 import com.alibaba.dubbo.common.utils.StringUtils;
  25 +import com.clouds.common.utils.DateUtil;
21 26 import com.clouds.common.utils.excle.ExcelUtil;
22 27 import com.clouds.common.utils.excle.ExcleFillDateManager;
23 28 import com.clouds.common.utils.excle.Layouter;
... ... @@ -25,10 +30,8 @@ import com.clouds.common.web.BizController;
25 30 import com.clouds.common.web.vo.BizResultVO;
26 31 import com.zteits.clouds.api.apibase.bean.BizResult;
27 32 import com.zteits.clouds.api.apibase.bean.PageBean;
28   -import com.zteits.clouds.api.dto.clouds.dto.BillManageDTO;
29 33 import com.zteits.clouds.api.dto.clouds.dto.ParkDurationDTO;
30 34 import com.zteits.clouds.api.dto.clouds.dto.ParkDurationForHourDTO;
31   -import com.zteits.clouds.api.dto.clouds.param.BillQueryRequest;
32 35 import com.zteits.clouds.api.dto.clouds.param.ParkDurationRequest;
33 36 import com.zteits.clouds.api.service.clouds.CloudsParDurationService;
34 37  
... ... @@ -44,12 +47,40 @@ public class CloudsParDurationController extends BizController{
44 47 /**
45 48 * 企业云平台->停车时长折线图－>按日.<br/>
46 49 * @return
  50 + * @throws Exception
47 51 */
48 52 @ApiOperation("企业云平台->停车时长折线图－>按日")
49 53 @PostMapping("/queryEchartsForParkDurationForDay")
50   - public BizResultVO<List<ParkDurationDTO>> queryEchartsForParkDurationForDay(@RequestBody ParkDurationRequest parkDurationRequest){
51   - BizResult<List<ParkDurationDTO>> result = cloudsParDurationService.queryEchartsForParkDurationForDay(parkDurationRequest);
52   - return new BizResultVO<List<ParkDurationDTO>>(result);
  54 + public BizResultVO<Map<String,Object>> queryEchartsForParkDurationForDay(@RequestBody ParkDurationRequest parkDurationRequest,HttpServletResponse response) throws Exception{
  55 + BizResult<Map<String,Object>> result = cloudsParDurationService.queryEchartsForParkDurationForDay(parkDurationRequest);
  56 +
  57 + return new BizResultVO<Map<String,Object>>(result);
  58 + }
  59 +
  60 + /**
  61 + * 获取2个时间的时间所有天数.<br/>
  62 + * @param parkDurationRequest
  63 + * @return
  64 + */
  65 + public List<String> getTwoDaysDay(ParkDurationRequest parkDurationRequest){
  66 + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
  67 + String beginTime = DateUtil.getDateString(parkDurationRequest.getParkOutBeginTime(),"yyyy-MM-dd");
  68 + String endTime = DateUtil.getDateString(parkDurationRequest.getParkOutEndTime(),"yyyy-MM-dd");
  69 + List<String> dateList =new ArrayList<String>();
  70 + //获取开始结束之间的所有日期
  71 + try {
  72 + List<Date> datas = DateUtil.getBetweenDates(format.parse(beginTime),format.parse(endTime));
  73 + if(!CollectionUtils.isEmpty(datas)){
  74 + for(Date e:datas){
  75 + if(e != null){
  76 + dateList.add(format.format(e));
  77 + }
  78 + }
  79 + }
  80 + } catch (ParseException e) {
  81 + e.printStackTrace();
  82 + }
  83 + return dateList;
53 84 }
54 85  
55 86 /**
... ... @@ -228,12 +259,13 @@ public class CloudsParDurationController extends BizController{
228 259 /**
229 260 * 企业云平台->停车时长折线图－>按日.<br/>
230 261 * @return
  262 + * @throws Exception
231 263 */
232 264 @ApiOperation("企业云平台->停车时长折线图－>按月")
233 265 @PostMapping("/queryEchartsForParkDurationForMonth")
234   - public BizResultVO<List<ParkDurationDTO>> queryEchartsForParkDurationForMonth(@RequestBody ParkDurationRequest parkDurationRequest){
235   - BizResult<List<ParkDurationDTO>> result = cloudsParDurationService.queryEchartsForParkDurationForMonth(parkDurationRequest);
236   - return new BizResultVO<List<ParkDurationDTO>>(result);
  266 + public BizResultVO<Map<String,Object>> queryEchartsForParkDurationForMonth(@RequestBody ParkDurationRequest parkDurationRequest) throws Exception{
  267 + BizResult<Map<String,Object>> result = cloudsParDurationService.queryEchartsForParkDurationForMonth(parkDurationRequest);
  268 + return new BizResultVO<Map<String,Object>>(result);
237 269 }
238 270  
239 271 /**
... ... @@ -298,4 +330,5 @@ public class CloudsParDurationController extends BizController{
298 330  
299 331  
300 332  
  333 +
301 334 }
... ...