提交

王富生
1 parent f35d61ab
Showing 6 changed files with 149 additions and 345 deletions
src/main/java/com/zteits/irain/portal/web/fangle/FangleEqpController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BillManageController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/CloudsParDurationController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/MonthBillManagementController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/YearMonthCardStatisticController.java
src/main/resources/dubbo/dubbo-park-consumer.xml
-package com.zteits.irain.portal.web.fangle;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.clouds.common.web.BizController;
-import com.zteits.clouds.api.apibase.bean.BaseInfo;
-import com.zteits.clouds.api.apibase.bean.BizResult;
-import com.zteits.clouds.api.dto.park.param.EqpLogRequest;
-import com.zteits.clouds.api.service.park.EqpBerthsService;
-import com.zteits.irain.portal.vo.fangle.BerthStateRequest;
-import com.zteits.irain.portal.vo.fangle.EqpHeartBeatRequest;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-/**
- * Copyright: Copyright (c) 2017  ZTE-ITS
- * 
- * @ClassName: FangleEqpController.java
- * @Description:方格尔设备同步
- * @version: v1.0.0
- * @author: wangfei
- * @date: 2017年4月20日   下午17:51:45 
- * Modification History:
- * Date             Author          Version            Description
- *---------------------------------------------------------*
- * 2017年8月21日      wangfei           v1.0.0               创建
- */
-@Api(value="方格尔设备同步",description="方格尔设备同步")
-@RestController
-@RequestMapping("/fangle")
-public class FangleEqpController extends BizController{
-	
-	
-	private static final Logger logger = LoggerFactory.getLogger(FangleEqpController.class);
-	@Value("${project.syscode}")
-	private String sysCode;
-	@Autowired
-	private EqpBerthsService eqpBerthsService;
-	
-	@ApiOperation("泊位信息同步")
-	@RequestMapping(value = "/synBerthInfo",method = RequestMethod.POST)
-	public BizResult<Map<String, String>> synBerthInfo(@RequestBody String param){
-		logger.info("同步入参：" + param);
-		
-		JSONObject jsonObject = JSONObject.parseObject(param);
-		String reqList = jsonObject.getString("pushdata");
-		JSONArray jsonArray = JSON.parseArray(reqList);
-		BerthStateRequest request = JSON.parseObject(jsonArray.getString(0),BerthStateRequest.class);
-		BaseInfo info = new BaseInfo();
-		request.setBaseRequest(info);
-		request.setSysCode(sysCode);
-		//数据转换
-		EqpLogRequest eqpLogRequest = new EqpLogRequest();
-		BeanUtils.copyProperties(request, eqpLogRequest);
-		eqpLogRequest.setBerthOutNo(request.getBerthcode());
-		eqpLogRequest.setEqpType(1);//地磁
-		if(request.getBerthstatus().equals("1") || request.getBerthstatus().equals("2")){
-			eqpLogRequest.setEqpStatus("1");//设备状态 1-正常
-		}
-		if(request.getBerthstatus().equals("3")){
-			eqpLogRequest.setEqpStatus("0");//设备状态 0-故障
-		}
-		if(request.getBerthstatus().equals("2")){
-			eqpLogRequest.setBerthState("0");//泊位状态 0-空闲
-		}
-		if(request.getBerthstatus().equals("1")){
-			eqpLogRequest.setBerthState("1");//泊位状态 1- 占用
-		}
-		eqpLogRequest.setElectricity(request.getElectricity());
-		eqpLogRequest.setVoltag(request.getVoltage());
-		
-		BizResult<Map<String, String>> result = eqpBerthsService.synEqpInfo(eqpLogRequest);
-		return result;
-	}
-	
-	@ApiOperation("设备心跳信息同步")
-	@RequestMapping(value = "/synEqpHeartBeatInfo",method = RequestMethod.POST)
-	public BizResult<Map<String, String>> synEqpHeartBeatInfo(@RequestBody String param){
-		logger.info("同步入参：" + param);
-		
-		JSONObject jsonObject = JSONObject.parseObject(param);
-		String reqList = jsonObject.getString("pushdata");
-		JSONArray jsonArray = JSON.parseArray(reqList);
-		EqpHeartBeatRequest request = JSON.parseObject(jsonArray.getString(0),EqpHeartBeatRequest.class);
-		BaseInfo info = new BaseInfo();
-		request.setBaseRequest(info);
-		request.setSysCode(sysCode);
-		
-		//数据转换
-		EqpLogRequest eqpLogRequest = new EqpLogRequest();
-		BeanUtils.copyProperties(request, eqpLogRequest);
-		eqpLogRequest.setEqpNo(request.getEquipmentCode());
-		if(request.getEquipmentType().equals("1")){
-			eqpLogRequest.setEqpType(4);//设备类型 4-车检器
-		}
-		if(request.getEquipmentType().equals("2")){
-			eqpLogRequest.setEqpType(5);//设备类型 5-网关
-		}
-		if(request.getEquipmentType().equals("3")){
-			eqpLogRequest.setEqpType(6);//设备类型 6-中继器
-		}
-		if(request.getEquipmentStatus().equals("1")){
-			eqpLogRequest.setEqpStatus("1");//设备状态 1-正常
-		}
-		if(request.getEquipmentStatus().equals("2")){
-			eqpLogRequest.setEqpStatus("0");//设备状态 0-故障
-		}
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");  
-	    Date date;
-		try {
-			date = sdf.parse(request.getPushTime());
-			eqpLogRequest.setHeartbeatTime(date);
-		} catch (ParseException e) {
-			e.printStackTrace();
-		}
-		BizResult<Map<String, String>> result = eqpBerthsService.synEqpInfo(eqpLogRequest);
-		return result;
-	}
-	 
-}
@@ -3,7 +3,6 @@ package com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -15,13 +14,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-
-import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.clouds.common.constants.SessionEnum;
@@ -30,7 +29,6 @@ import com.clouds.common.utils.excle.ExcelUtil;
 import com.clouds.common.utils.excle.ExcleFillDateManager;
 import com.clouds.common.utils.excle.Layouter;
 import com.clouds.common.web.BizController;
-import com.clouds.common.web.SessionCommUtil;
 import com.clouds.common.web.vo.BizResultVO;
 import com.zteits.clouds.api.apibase.bean.BizResult;
 import com.zteits.clouds.api.apibase.bean.PageBean;
@@ -39,7 +37,6 @@ import com.zteits.clouds.api.dto.clouds.param.BillQueryRequest;
 import com.zteits.clouds.api.dto.pay.param.TdCompanyParkQueryRequest;
 import com.zteits.clouds.api.service.clouds.BillManageForDayService;
 import com.zteits.clouds.api.service.pay.TdCustCompanyService;
-import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.CustIncomeTotalVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -71,16 +68,10 @@ public class BillManageController extends BizController {
 	@Autowired
 	private TdCustCompanyService tdCustCompanyService;
-	@Autowired
-	private SessionCommUtil sessionCommUtil;
-	
-	@Autowired
-	private Map<String,TdCustCompanyService> map;
-
-	private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 	@ApiOperation("日账统计图汇总")
 	@PostMapping("/queryBillforDayTotal")
+	@ResponseBody
 	public BizResultVO<BillManageDTO> queryBillforDayTotal(@RequestBody BillQueryRequest billQueryRequest, HttpServletRequest request,
 			HttpServletResponse response){
 		BizResult<BillManageDTO> result = billManageForDayService.queryBillforDayTotal(billQueryRequest);
@@ -92,59 +83,13 @@ public class BillManageController extends BizController {
 	@ResponseBody
 	public void queryBillforDayTotalForPage(@RequestBody BillQueryRequest billQueryRequest, HttpServletRequest request,
 			HttpServletResponse response) throws Exception {
-		TdCustCompanyService sert = map.get("tdCustCompanyService");
 		logger.info("---begin--日账汇总单查询调用后场dubbo服务,入参＝{}", JSONObject.toJSON(billQueryRequest));
-		System.out.println("seesionId="+request.getSession().getId());
-		UserInfo userInfo = sessionCommUtil.getUserInfo();
-		logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo));
-		TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
-		if (userInfo != null) {
-			
-			tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode());
-			tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds());
-			tdCompanyParkQueryRequest.setSessionId(request.getSession().getId());
-			billQueryRequest.setParkIdList(userInfo.getOrgIds());
-		}
-		
 		BizResult<PageBean<BillManageDTO>> result = billManageForDayService.queryBillforDayTotalForPage(billQueryRequest);
-		result.setErrMsg(billQueryRequest.getParkIdList().toString());
 		logger.info("---end--日账汇总单查询调用后场dubbo服务,结果＝{}", JSONObject.toJSONString(result));
 		this.returnJsonDataGrid(response, result);
 	}
-	
-	/**
-	 * 查询日账单.<br/>
-	 * 
-	 * @param request
-	 * @param response
-	 * @throws Exception
-	 */
-	@ApiOperation("日账单查看")
-	@RequestMapping(value = "/queryBillForDay", method = RequestMethod.POST)
-	@ResponseBody
-	public void queryBillForDay(@RequestBody BillQueryRequest billQueryRequest, HttpServletRequest request,
-			HttpServletResponse response) throws Exception {
-		BizResult<PageBean<BillManageDTO>> result = new BizResult<PageBean<BillManageDTO>>();
-		logger.info("---begin---日账单查看调用后场dubbo服务,入参={}", JSONObject.toJSONString(billQueryRequest));
-		TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
-		UserInfo userInfo = (UserInfo) request.getSession().getAttribute(SessionEnum.USER_INFO.key());
-		logger.info("从session中获取的用户信息={}" + JSONObject.toJSONString(userInfo));
-		if (userInfo != null) {
-			
-			tdCompanyParkQueryRequest.setSysCode(billQueryRequest.getSysCode());
-			tdCompanyParkQueryRequest.setCustIdList(userInfo.getOrgIds());
-			tdCompanyParkQueryRequest.setSessionId(request.getSession().getId());
-			billQueryRequest.setUserName(userInfo.getName());
-			billQueryRequest.setParkIdList(this.queryParkNoByCustIds(tdCompanyParkQueryRequest));
-			
-		}
-		result = billManageForDayService.queryBillforDayDeatilPage(billQueryRequest);
-		logger.info("---end---日账单查看调用后场dubbo服务,结果＝{}", JSONObject.toJSON(result));
-
-		this.returnJsonDataGrid(response, result);
-	}
 	/**
 	 * 获取登录用户信息.<br/>
@@ -171,94 +116,47 @@ public class BillManageController extends BizController {
 	 * @throws Exception 
 	 */
 	@RequestMapping("/exportToExcleForBillForDay")
-	public void exportToExcleForBillForDay(String sysCode, String beginTime, String endTime, String aliTotalFee ,
-			String aliDealCount,String wxTotalFee,String wxDealCount,String cashTotalFee,String cashDealCount,
-			String orderTotalFee,String orderDealCount,
-			HttpServletRequest request,String parkIds,String userName,
-			HttpServletResponse response) throws Exception {
-		
-		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		//获取session中的用户信息
-		UserInfo userInfo = sessionCommUtil.getUserInfo();
-		BillQueryRequest billQueryRequest  = new BillQueryRequest();
-		
-		billQueryRequest.setBeginTime(format.parse(beginTime));
-		billQueryRequest.setEndTime(format.parse(endTime));
-		billQueryRequest.setSysCode(sysCode);
+	public void exportToExcleForBillForDay(@RequestParam String beginTime,@RequestParam String endTime,@RequestParam List<String> parkIdList,
+			HttpServletRequest request,HttpServletResponse response) throws Exception {
+		SimpleDateFormat format_yyy = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		BillQueryRequest billQueryRequest = new BillQueryRequest();
+		billQueryRequest.setSysCode("1001");
 		billQueryRequest.getBaseRequest().setPageSize(0);
-		List<String> parkList= new ArrayList<String>();
-		if(StringUtils.isNotEmpty(parkIds)){
-			for(String str :parkIds.split(",")){
-				if(StringUtils.isNotEmpty(str)){
-					parkList.add(str.trim());
-				}
-			}
-		}
-		billQueryRequest.setParkIdList(parkList);
-		/**查询日账单汇总信息.*/
-		BizResult<PageBean<BillManageDTO>> result = billManageForDayService.queryBillforDayDeatilPage(billQueryRequest);
-		String[] titleOne = new String[2];      
-		titleOne[0] = "用户: " + (StringUtils.isNotEmpty(userName) ? userName : "");
-		titleOne[1] = "时间: "+beginTime+" "+endTime;
-		String[] titleTwo = new String[] {"","现金", "微信", "支付宝", "合计"};
-		String[] titleThree = new String[] { "停车场名称", "现金", "微信", "支付宝", "合计"};
-		String sheetName = "日账单";
-		String fileName = "日账单管理" + format.format(new Date());
-	    
-		
+		billQueryRequest.setParkIdList(parkIdList);
+		billQueryRequest.setBeginTime(format_yyy.parse(beginTime));
+		billQueryRequest.setEndTime(format_yyy.parse(endTime));
+		BizResult<PageBean<BillManageDTO>> result = billManageForDayService.queryBillforDayTotalForPage(billQueryRequest);
+		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+		String[] title = new String[]{"时间","停车场名称","现金(元)","支付宝(元)","微信(元)","总收入(元)"};	
+		String sheetName="日账单";
+		String fileName = "日账单"; 
 		// 1.创建excel信息
 		XSSFSheet workSheet = ExcelUtil.createExcel(sheetName);
 		// 2.设置excel表头和表体
-		Layouter.buildBillForDay(workSheet, titleOne, 0, 0);//创建第一行标题
-		Layouter.buildHeaders(workSheet, titleTwo, 0, 0);//创建第2行标题
-		Layouter.buildHeaders(workSheet, titleThree, 3, 0);//创建第3行标题
-		// 3.填充数据
-		List<Object[]> contentListTwo = new ArrayList<Object[]>();
-		for(int i = 0;i<2;i++){
-			Object[] str = new Object[titleTwo.length];
-			if(i == 0){
-				str[0] = "交易笔数";
-				str[1] = (cashDealCount == null ? "0" : cashDealCount);
-				str[2] = (wxDealCount== null ? "0" : wxDealCount);
-				str[3] = (aliDealCount== null ? "0" : aliDealCount);
-				str[4] = (orderDealCount== null ? "0" : orderDealCount);
-			}else{
-				str[0] = "总收入(元)";
-				str[1] = (cashTotalFee == null ? "0" : new BigDecimal(cashTotalFee).divide(new BigDecimal("100"),2, BigDecimal.ROUND_HALF_UP)) ;
-				str[2] = (wxTotalFee== null ? "0" : new BigDecimal(wxTotalFee).divide(new BigDecimal("100"),2, BigDecimal.ROUND_HALF_UP)) ;
-				str[3] = (aliTotalFee== null ? "0" : new BigDecimal(aliTotalFee).divide(new BigDecimal("100"),2, BigDecimal.ROUND_HALF_UP)) ;
-				str[4] = (orderTotalFee== null ? "0" : new BigDecimal(orderTotalFee).divide(new BigDecimal("100"),2, BigDecimal.ROUND_HALF_UP)) ;
-			}
-			contentListTwo.add(str);
-		}
-		ExcleFillDateManager fillUserManagerTwo = new ExcleFillDateManager();
-		fillUserManagerTwo.fillSalesOrga(workSheet, titleTwo, contentListTwo, 2); //第2行标题
-		
-		//
-		List<Object[]> contentList = new ArrayList<Object[]>();
-		if(result != null && result.getData() != null){
+		Layouter.buildReport(workSheet,title,0, 0);
+		//3.填充数据
+		List<Object[]> contentList=new ArrayList<Object[]>();
+		if(result != null && !CollectionUtils.isEmpty(result.getData().getDataList())){
 			List<BillManageDTO> list = result.getData().getDataList();
-			if(list != null && list.size()>0){
-				for (int i = 0; i < list.size(); i++) {
-					BillManageDTO e = list.get(i);
-					Object[] obj = new Object[titleThree.length];
-					int index = 0;
-					obj[index++] = e.getParkName();
-					obj[index++] = (e.getCashTotalFee()== null ? "0" : e.getCashTotalFee().divide(new BigDecimal("100"),2, BigDecimal.ROUND_HALF_UP)) ;
-					obj[index++] = (e.getWxTotalFee()== null ? "0" :  e.getWxTotalFee().divide(new BigDecimal("100"),2, BigDecimal.ROUND_HALF_UP)) ;
-					obj[index++] = (e.getAliTotalFee()== null ? "0" :  e.getAliTotalFee().divide(new BigDecimal("100"),2, BigDecimal.ROUND_HALF_UP)) ;
-					obj[index++] = (e.getAliTotalFee()== null ? "0" : e.getAliTotalFee().divide(new BigDecimal("100"),2, BigDecimal.ROUND_HALF_UP)) ;
-					contentList.add(obj);
+			for (BillManageDTO e: list) {
+				if(e != null){
+				 Object[] obj=new Object[title.length];
+				 int index=0;
+				 obj[index++]=(e.getBillDayTime() != null ? format.format(e.getBillDayTime()) : "");
+				 obj[index++]=e.getParkName();
+				 obj[index++]=(e.getCashTotalFee() == null ? "0" : e.getCashTotalFee().divide(new BigDecimal("100"),2, BigDecimal.ROUND_HALF_UP)) ;
+				 obj[index++]=(e.getAliTotalFee() == null ? "0" : e.getAliTotalFee().divide(new BigDecimal("100"),2, BigDecimal.ROUND_HALF_UP)) ;
+				 obj[index++]=(e.getWxTotalFee() == null ? "0" : e.getWxTotalFee().divide(new BigDecimal("100"),2, BigDecimal.ROUND_HALF_UP)) ;
+				 obj[index++]=(e.getOrderTotalFee() == null ? "0" : e.getOrderTotalFee().divide(new BigDecimal("100"),2, BigDecimal.ROUND_HALF_UP)) ;
+				 contentList.add(obj);
 				}
 			}
 		}
-		
-		ExcleFillDateManager fillUserManager = new ExcleFillDateManager();
-		fillUserManager.fillSalesOrga(workSheet, titleThree, contentList, 5);
+		ExcleFillDateManager fillUserManager=new ExcleFillDateManager();
+		fillUserManager.fillSalesOrga(workSheet,title,contentList,2);
 		// 4.excel输出配置
 		ExcelUtil.write(response, workSheet, fileName);
-		
 	}
 	/**
+package com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+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.ParkDurationDTO;
+import com.zteits.clouds.api.dto.clouds.param.ParkDurationRequest;
+import com.zteits.clouds.api.service.clouds.CloudsParDurationService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+@Api(value = "企业云平台－停车时长", description = "企业云平台－停车时长")
+@RestController
+@RequestMapping("/parkDuration")
+public class CloudsParDurationController extends BizController{
+
+	@Autowired
+	private CloudsParDurationService cloudsParDurationService;
+	/**
+	 * 企业云平台->停车时长折线图－>按日.<br/>
+	 * @return
+	 */
+	@ApiOperation("企业云平台->停车时长折线图－>按日")
+	@PostMapping("/queryEchartsForParkDurationForDay")
+	public BizResultVO<List<ParkDurationDTO>> queryEchartsForParkDurationForDay(@RequestBody ParkDurationRequest parkDurationRequest){
+		BizResult<List<ParkDurationDTO>> result  = cloudsParDurationService.queryEchartsForParkDurationForDay(parkDurationRequest);
+		return new BizResultVO<List<ParkDurationDTO>>(result);
+	}
+	
+	/**
+	 * 企业云平台->停车时长－>分页.<br/>
+	 * @return
+	 */
+	@ApiOperation("企业云平台->停车时长－>分页")
+	@PostMapping("/queryEchartsForParkDurationDayForPage")
+	public void queryEchartsForParkDurationDayForPage(@RequestBody ParkDurationRequest parkDurationRequest,HttpServletRequest request,
+			HttpServletResponse response){
+		BizResult<PageBean<ParkDurationDTO>> result  = cloudsParDurationService.queryEchartsForParkDurationDayForPage(parkDurationRequest);
+	    this.returnJsonDataGrid(response, result);
+	}
+	
+	
+}
@@ -355,7 +355,7 @@ public class MonthBillManagementController extends BizController {
             yearMonthCardStatisticRequest.setSysCode(sysCode);
             yearMonthCardStatisticRequest.setBeginTime(DateUtil.to_date(beginTime, DateUtil.DATETIME_FORMAT));
             yearMonthCardStatisticRequest.setEndTime(DateUtil.to_date(endTime, DateUtil.DATETIME_FORMAT));
-            yearMonthCardStatisticRequest.setParkIdList(parkIdList);
+            yearMonthCardStatisticRequest.setPlNos(parkIdList);
             yearMonthCardStatisticRequest.setBaseRequest(new BaseInfo(1, 0));
             /** 查询月账单年卡月卡. */
             result = yearMonthCardStatisticService.queryYearMonthCardStatistic(yearMonthCardStatisticRequest);
@@ -377,43 +377,43 @@ public class MonthBillManagementController extends BizController {
             if (CollectionUtils.isNotEmpty(result.getData().getDataList())) {
                 list = result.getData().getDataList();
             }
-            for (YearMonthCardStatisticDTO e : list) {
-                Object[] obj = new Object[title.length];
-                int index = 0;
-                obj[index++] = StringUtils.isNotEmpty(e.getOrderId()) ? e.getOrderId() : "";
-                obj[index++] = e.getPayFinishTime() != null
-                    ? DateUtil.getDateString(e.getPayFinishTime(), DateUtil.DATETIME_FORMAT) : "";
-                String yearOrMonthCard = "";
-                if (null != e.getOrderType()) {
-                    if (2 == e.getOrderType()) {
-                        yearOrMonthCard = "年卡";
-                        obj[index++] = yearOrMonthCard;
-                    } else if (3 == e.getOrderType()) {
-                        yearOrMonthCard = "月卡";
-                        obj[index++] = yearOrMonthCard;
-                    }
-                } else {
-                    obj[index++] = "";
-                }
-                obj[index++] = StringUtils.isNotEmpty(e.getParkName()) ? e.getParkName() + yearOrMonthCard : "";
-
-                obj[index++] = StringUtils.isNotEmpty(e.getCarNumber()) ? e.getCarNumber() : "";
-
-                obj[index++] = e.getAmount() != null ? AmountUtils.changeF2Y(e.getAmount().longValue()) : "0.00";
-                String effDate = "";
-                String expDate = "";
-                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-                if (null != e.getEffDate()) {
-                    effDate = format.format(e.getEffDate());
-                }
-                if (null != e.getExpDate()) {
-                    expDate = format.format(e.getExpDate());
-                }
-
-                obj[index++] = effDate + " - " + expDate;
-
-                contentList.add(obj);
-            }
+//            for (YearMonthCardStatisticDTO e : list) {
+//                Object[] obj = new Object[title.length];
+//                int index = 0;
+//                obj[index++] = StringUtils.isNotEmpty(e.getOrderId()) ? e.getOrderId() : "";
+//                obj[index++] = e.getPayFinishTime() != null
+//                    ? DateUtil.getDateString(e.getPayFinishTime(), DateUtil.DATETIME_FORMAT) : "";
+//                String yearOrMonthCard = "";
+//                if (null != e.getOrderType()) {
+//                    if (2 == e.getOrderType()) {
+//                        yearOrMonthCard = "年卡";
+//                        obj[index++] = yearOrMonthCard;
+//                    } else if (3 == e.getOrderType()) {
+//                        yearOrMonthCard = "月卡";
+//                        obj[index++] = yearOrMonthCard;
+//                    }
+//                } else {
+//                    obj[index++] = "";
+//                }
+//                obj[index++] = StringUtils.isNotEmpty(e.getParkName()) ? e.getParkName() + yearOrMonthCard : "";
+//
+//                obj[index++] = StringUtils.isNotEmpty(e.getCarNumber()) ? e.getCarNumber() : "";
+//
+//                obj[index++] = e.getAmount() != null ? AmountUtils.changeF2Y(e.getAmount().longValue()) : "0.00";
+//                String effDate = "";
+//                String expDate = "";
+//                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+//                if (null != e.getEffDate()) {
+//                    effDate = format.format(e.getEffDate());
+//                }
+//                if (null != e.getExpDate()) {
+//                    expDate = format.format(e.getExpDate());
+//                }
+//
+//                obj[index++] = effDate + " - " + expDate;
+//
+//                contentList.add(obj);
+//            }
             ExcleFillDateManager fillUserManager = new ExcleFillDateManager();
             fillUserManager.fillSalesOrga(workSheet, title, contentList, 2);
@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import com.alibaba.dubbo.common.utils.CollectionUtils;
+import com.alibaba.dubbo.common.utils.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.clouds.common.utils.excle.ExcelUtil;
@@ -100,8 +101,8 @@ public class YearMonthCardStatisticController extends BizController {
     @ApiOperation("导出年卡月卡统计excel")
     @GetMapping("exportYearMonthStatisticExcel")
     public void exportYearMonthStatisticExcel(@RequestParam Long beginTime, @RequestParam Long endTime,
-        @RequestParam List<String> parkIdList, @RequestParam String parkNames,
-        Integer orderType, Integer payType, Integer dataState,
+        @RequestParam List<String> plNos, 
+        Integer orderType,  Integer dataState,
         HttpServletRequest requests, HttpServletResponse response) throws Exception {
         YearMonthCardStatisticRequest request = new YearMonthCardStatisticRequest();
@@ -109,20 +110,19 @@ public class YearMonthCardStatisticController extends BizController {
         request.setBeginTime(new Date(beginTime));
         request.setEndTime(new Date(endTime));
-        request.setParkIdList(parkIdList);
+        request.setPlNos(plNos);
         request.setBaseRequest(new BaseInfo(1, 0));
         request.setOrderType(orderType);
-        request.setPayType(payType);
         request.setDataState(dataState);
         BizResult<PageBean<YearMonthCardStatisticDTO>> bizResult = yearMonthCardStatisticService
             .queryYearMonthCardStatistic(request);
-        BizResult<List<YearMonthCardStatisticSumDTO>> bizResultSum = yearMonthCardStatisticService
-            .queryYearMonthCardStatisticSum(request);
+//        BizResult<List<YearMonthCardStatisticSumDTO>> bizResultSum = yearMonthCardStatisticService
+//            .queryYearMonthCardStatisticSum(request);
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
-        String[] title = new String[] {"交易时间", "停车场", "类型", "车牌号", "支付方式", "支付金额", "有效期", "状态"};
+        String[] title = new String[] {"购买日期", "类型", "车牌号", "停车场",  "车主","手机号", "金额", "有效期", "状态"};
         String sheetName = "年卡月卡统计";
         String fileName = "年卡月卡统计" + format2.format(new Date());
@@ -187,39 +187,21 @@ public class YearMonthCardStatisticController extends BizController {
         for (YearMonthCardStatisticDTO e : list) {
             Object[] obj = new Object[title.length];
             int index = 0;
-            obj[index++] = e.getPayFinishTime() != null ? format.format(e.getPayFinishTime()) : "";
-            obj[index++] = e.getParkName();
+            obj[index++] = e.getCreateTime() != null ? format.format(e.getCreateTime()) : "";
             String cardType="";
             if (null != e.getOrderType()) {
-                if (2 == e.getOrderType()) {
-                    cardType = "年卡";
-                }else{
-                    cardType = "月卡";
-                }
+            	if (2 == e.getOrderType()) {
+            		cardType = "年卡";
+            	}else{
+            		cardType = "月卡";
+            	}
             }
             obj[index++]=cardType;
             obj[index++] = e.getCarNumber();
-            if (e.getPayType() != null) {
-                switch (e.getPayType()) {
-                    case 1:
-                        obj[index++] = "支付宝";
-                        break;
-                    case 2:
-                        obj[index++] = "微信";
-                        break;
-                    case 3:
-                        obj[index++] = "银联";
-                        break;
-                    case 4:
-                        obj[index++] = "微信";
-                        break;
-                    default:
-                        obj[index++] = "现金";
-                        break;
-                }
-            } else {
-                obj[index++] = "";
-            }
+            obj[index++] = e.getParkName();
+            obj[index++] = StringUtils.isEmpty(e.getCustName())?"":e.getCustName();
+            obj[index++] = StringUtils.isEmpty(e.getUserPhone())?"":e.getUserPhone();
+            
             obj[index++] = e.getAmount() != null ? e.getAmount() : "0.00";
             obj[index++] = e.getEffDate() != null ? format.format(e.getEffDate())
                 : "" + "-" + e.getExpDate() != null ? format.format(e.getExpDate()) : "";
@@ -143,4 +143,10 @@
       version="${spring.dubbo.provider.version}"
       timeout="30000"/> 
+      <!--企业云平台－停车时长统计 -->
+      <dubbo:reference id="cloudsParDurationService" interface="com.zteits.clouds.api.service.clouds.CloudsParDurationService"
+      version="${spring.dubbo.provider.version}"
+      timeout="30000"/> 
+    
+      
 </beans>
 \ No newline at end of file