Merge branch 'branch_0808' of

http://192.168.1.195:9998/ZTEITS-Developers/zteits-bcp-portal.git into branch_0808 Conflicts: src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java

Merge branch 'branch_0808' of
http://192.168.1.195:9998/ZTEITS-Developers/zteits-bcp-portal.git into branch_0808 Conflicts: src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java
xiejp
2 parents b5d36fb2 8a9d1db2
Showing 4 changed files with 291 additions and 160 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/berthmanage/BerthManageController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/IndexPageStatisticController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java
src/main/resources/dubbo/dubbo-park-consumer.xml
@@ -3,12 +3,15 @@ package com.zteits.irain.portal.web.parkinglotcloudplatform.berthmanage;
 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.poi.xssf.usermodel.XSSFSheet;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,7 +34,10 @@ import com.zteits.clouds.api.apibase.bean.PageBean;
 import com.zteits.clouds.api.apibase.exception.BizException;
 import com.zteits.clouds.api.dto.park.dto.BerthsDTO;
 import com.zteits.clouds.api.dto.park.param.BerthManageRequest;
+import com.zteits.clouds.api.dto.sys.SysCodeValueDTO;
+import com.zteits.clouds.api.dto.sys.param.SysCodeValueByKindQueryRequest;
 import com.zteits.clouds.api.service.park.BerthManageService;
+import com.zteits.clouds.api.service.sys.SysCommonService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -57,6 +63,8 @@ import io.swagger.annotations.ApiOperation;
 public class BerthManageController extends BizController {
 	@Autowired
 	private BerthManageService berthManageService;
+	@Autowired
+	private SysCommonService sysCommonService;
 	/**
@@ -125,6 +133,18 @@ public class BerthManageController extends BizController {
 		request.setBaseRequest(new BaseInfo(1, 1000));
 		request.setSysCode(sysCode);
+		//查询字典值
+		Map<String,String> codes = new HashMap<>();
+		SysCodeValueByKindQueryRequest codeValueRequest = new SysCodeValueByKindQueryRequest();
+		BeanUtils.copyProperties(request, codeValueRequest);
+		codeValueRequest.setSysCodeKind("SYS_CODE_PARK_STYLE");
+		BizResult<List<SysCodeValueDTO>> codeValueDTO = sysCommonService.querySysCodeValueByKind(codeValueRequest);
+		if(CollectionUtils.isNotEmpty(codeValueDTO.getData())){
+			for (SysCodeValueDTO dto : codeValueDTO.getData()) {
+				codes.put(dto.getCodeValue(), dto.getCodeValueName());
+			}
+		}
+		
 		BizResult<PageBean<BerthsDTO>> bizResult = berthManageService.queryBerthByCondition(request);
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String[] title = new String[] { "序号","泊位编号", "所属停车场", "所属泊位区间", "停车方式" };
@@ -148,7 +168,7 @@ public class BerthManageController extends BizController {
 			obj[index++] = b.getBerthNo();
 			obj[index++] = b.getPlName();
 			obj[index++] = b.getParkAreaName();
-			obj[index++] = b.getParkType();
+			obj[index++] = codes.get(b.getParkType());
 			contentList.add(obj);
 		}
 		ExcleFillDateManager fillUserManager = new ExcleFillDateManager();
 package com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -32,12 +31,14 @@ import com.zteits.clouds.api.dto.clouds.dto.CustIncomeTotalDTO;
 import com.zteits.clouds.api.dto.clouds.dto.CustIncomeTotalParkDTO;
 import com.zteits.clouds.api.dto.clouds.dto.ParkingCountDTO;
 import com.zteits.clouds.api.dto.clouds.param.CustIncomeTotalQueryRequset;
+import com.zteits.clouds.api.dto.park.dto.IndexSignRecordDTO;
 import com.zteits.clouds.api.dto.park.dto.ParkLotEqpTypeCountStatisticByCountryDTO;
 import com.zteits.clouds.api.dto.park.dto.ParkingLotDTO;
 import com.zteits.clouds.api.dto.park.dto.ParkingLotUseStatisticDTO;
 import com.zteits.clouds.api.dto.park.dto.TodayVehicleFlowOccupyRateAndTurnOverDTO;
 import com.zteits.clouds.api.dto.park.param.CommonPlnosQueryRequest;
 import com.zteits.clouds.api.dto.park.param.EqpTypeQueryByPlNosRequest;
+import com.zteits.clouds.api.dto.park.param.IndexSignRecordQueryRequest;
 import com.zteits.clouds.api.dto.park.param.ParkingLotUseStatisticForPageRequest;
 import com.zteits.clouds.api.dto.park.param.RealTimeVehicleFlowQueryRequest;
 import com.zteits.clouds.api.service.clouds.CustIncomeService;
@@ -46,9 +47,9 @@ import com.zteits.clouds.api.service.park.ParkingLotBerthsService;
 import com.zteits.clouds.api.service.park.ParkingLotEqpService;
 import com.zteits.clouds.api.service.park.ParkingLotQueryService;
 import com.zteits.clouds.api.service.park.ParkingLotUseStatisticService;
+import com.zteits.clouds.api.service.park.SignRecordService;
 import com.zteits.irain.portal.constant.ParkConstant;
 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.BerthsAndFlowLineChartVO;
-import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.CustIncomeForPayTypeResVO;
 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.CustIncomeTotalParkVO;
 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.CustIncomeTotalVO;
 import com.zteits.irain.portal.vo.parkinglotcloudplatform.datastatistic.LineChartVO;
@@ -102,6 +103,9 @@ public class IndexPageStatisticController extends BizController {
     @Autowired
     private ParkingLotBerthsService parkingLotBerthsService;
+    @Autowired
+    private SignRecordService signRecordService;
+
     /**
      * 云平台首页－>企业客户负责所有的停车场汇总.<br/>
      *
@@ -113,7 +117,7 @@ public class IndexPageStatisticController extends BizController {
     public BizResultVO<CustIncomeTotalVO> queryCustIncomeTotal(
         @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset)
         throws Exception {
-        logger.info("---begin企业云平台首页-实际收入查询,入参={}",JSONObject.toJSON(custIncomeTotalQueryRequset));
+        logger.info("---begin企业云平台首页-实际收入查询,入参={}", JSONObject.toJSON(custIncomeTotalQueryRequset));
         BizResultVO<CustIncomeTotalVO> bizResultVO = new BizResultVO<>();
         BizResult<CustIncomeTotalDTO> result = cusIncomeService.queryCustIncomeTotal(custIncomeTotalQueryRequset);
@@ -136,7 +140,7 @@ public class IndexPageStatisticController extends BizController {
     /**
      * 云平台首页－>企业客户负责某个停车收入情况.<br/>
-     * 
+     *
      * @return
      * @throws Exception
      */
@@ -192,16 +196,18 @@ public class IndexPageStatisticController extends BizController {
     /**
      * 云平台首页－>企业客户负责某个停车不同的支付方式收入情况.<br/>
      * 说明:
-     *  1.2017-08-22将支付方式更改为饼图.<br/>
+     * 1.2017-08-22将支付方式更改为饼图.<br/>
+     *
      * @return
      * @throws Exception
      */
-    
+
     @ApiOperation("企业客户负责某个停车不同的支付方式收入情况")
     @PostMapping("/queryCustIncomeForPayType")
     public BizResultVO<List<CustIncomeForPayTypeDTO>> queryCustIncomeForPayType(
         @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception {
-        logger.info("...begin企业客户负责某个停车不同的支付方式收入情况,入参为: request={}", JSONObject.toJSONString(custIncomeTotalQueryRequset));
+        logger.info("...begin企业客户负责某个停车不同的支付方式收入情况,入参为: request={}",
+            JSONObject.toJSONString(custIncomeTotalQueryRequset));
         BizResult<List<CustIncomeForPayTypeDTO>> result = cusIncomeService.queryCustIncomeForPayType(
             custIncomeTotalQueryRequset);
         logger.info("...end企业客户负责某个停车不同的支付方式收入情况,响应为: result={}", JSONObject.toJSONString(result));
@@ -425,34 +431,34 @@ public class IndexPageStatisticController extends BizController {
      */
     @ApiOperation("实时查询当前周转率")
     @PostMapping("/realtimeTurnoverRate")
-    public BizResultVO<Map<String,Object>> realtimeTurnoverRate(@RequestBody CommonPlnosQueryRequest request) {
-        BizResultVO<Map<String,Object>> res = new BizResultVO<>();
-        Map<String,Object> resMap = new HashMap<>();
+    public BizResultVO<Map<String, Object>> realtimeTurnoverRate(@RequestBody CommonPlnosQueryRequest request) {
+        BizResultVO<Map<String, Object>> res = new BizResultVO<>();
+        Map<String, Object> resMap = new HashMap<>();
         //1、查询截止当前进场停车次数
         BizResult<Long> bizResult = iInOutParkingService.queryRealTimeInParkNumOfPlNos(request);
-        if(ResultUtils.isError(bizResult)){
+        if (ResultUtils.isError(bizResult)) {
             res.setCode(bizResult.getErrCode().getCode());
             res.setMsg(bizResult.getErrMsg());
             return res;
         }
         //2、根据停车场编号查询停车场总车位数
         BizResult<Long> berthResult = parkingLotQueryService.queryBerthNumByPlNos(request);
-        if(ResultUtils.isError(berthResult)){
+        if (ResultUtils.isError(berthResult)) {
             res.setCode(berthResult.getErrCode().getCode());
             res.setMsg(berthResult.getErrMsg());
             return res;
         }
         //停车次数
-        resMap.put("parkNum",bizResult.getData());
+        resMap.put("parkNum", bizResult.getData());
         //总车位数
-        resMap.put("allBerthNum",berthResult.getData());
+        resMap.put("allBerthNum", berthResult.getData());
         double rate = bizResult.getData() * 1.0 / berthResult.getData() * 100;
         String rateStr = new DecimalFormat("#.00").format(rate);
-        if(rate == 0){
+        if (rate == 0) {
             rateStr = "0.00";
         }
-        resMap.put("rate",rateStr);
+        resMap.put("rate", rateStr);
         res.setData(resMap);
         return res;
     }
@@ -466,35 +472,35 @@ public class IndexPageStatisticController extends BizController {
      */
     @ApiOperation("实时查询当前占用率")
     @PostMapping("/realtimeoccupationRate")
-    public BizResultVO<Map<String,Object>> realtimeoccupationRate(@RequestBody CommonPlnosQueryRequest request) {
-        BizResultVO<Map<String,Object>> res = new BizResultVO<>();
-        Map<String,Object> resMap = new HashMap<>();
+    public BizResultVO<Map<String, Object>> realtimeoccupationRate(@RequestBody CommonPlnosQueryRequest request) {
+        BizResultVO<Map<String, Object>> res = new BizResultVO<>();
+        Map<String, Object> resMap = new HashMap<>();
         //1、查询截止当前空余车位数
         BizResult<Long> bizResult = parkingLotBerthsService.queryAllFreeBerthNum(request);
-        if(ResultUtils.isError(bizResult)){
+        if (ResultUtils.isError(bizResult)) {
             res.setCode(bizResult.getErrCode().getCode());
             res.setMsg(bizResult.getErrMsg());
             return res;
         }
         //2、根据停车场编号查询停车场总车位数
         BizResult<Long> berthResult = parkingLotQueryService.queryBerthNumByPlNos(request);
-        if(ResultUtils.isError(berthResult)){
+        if (ResultUtils.isError(berthResult)) {
             res.setCode(berthResult.getErrCode().getCode());
             res.setMsg(berthResult.getErrMsg());
             return res;
         }
         //空余车位数
-        resMap.put("freeBerthNum",bizResult.getData());
+        resMap.put("freeBerthNum", bizResult.getData());
         //总车位数
-        resMap.put("allBerthNum",berthResult.getData());
+        resMap.put("allBerthNum", berthResult.getData());
-        double rate = (1-bizResult.getData() * 1.0 / berthResult.getData()) * 100;
+        double rate = (1 - bizResult.getData() * 1.0 / berthResult.getData()) * 100;
         String rateStr = new DecimalFormat("#.00").format(rate);
-        if(rate == 0){
+        if (rate == 0) {
             rateStr = "0.00";
         }
-        resMap.put("rate",rateStr);
+        resMap.put("rate", rateStr);
         res.setData(resMap);
         return res;
@@ -570,19 +576,22 @@ public class IndexPageStatisticController extends BizController {
     }
     /**
-	 * 企业云平台首页-->停车次数统计(饼图).<br/>
-	 * 说明:从订单表中统计(逃逸，免费，月卡年卡，临时)停车次数.<br/>
-	 * @param custIncomeTotalQueryRequset
-	 * @return
-	 * @throws Exception
-	 */
+     * 企业云平台首页-->停车次数统计(饼图).<br/>
+     * 说明:从订单表中统计(逃逸，免费，月卡年卡，临时)停车次数.<br/>
+     *
+     * @param custIncomeTotalQueryRequset
+     * @return
+     * @throws Exception
+     */
     @ApiOperation("企业云平台首页-->停车次数统计(饼图)")
     @PostMapping("/queryParingCount")
-    public BizResultVO<List<ParkingCountDTO>> queryParingCount(@RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception{
-    	logger.info("...begin停车次数统计->调用后场dubbo服务,入参为: request={}", JSONObject.toJSONString(custIncomeTotalQueryRequset));
-    	BizResult<List<ParkingCountDTO>> result =cusIncomeService.queryParingCount(custIncomeTotalQueryRequset);
-    	logger.info("...end停车次数统计->调用后场dubbo服务...");
-    	return new BizResultVO<List<ParkingCountDTO>>(result);
+    public BizResultVO<List<ParkingCountDTO>> queryParingCount(
+        @RequestBody CustIncomeTotalQueryRequset custIncomeTotalQueryRequset) throws Exception {
+        logger.info("...begin停车次数统计->调用后场dubbo服务,入参为: request={}",
+            JSONObject.toJSONString(custIncomeTotalQueryRequset));
+        BizResult<List<ParkingCountDTO>> result = cusIncomeService.queryParingCount(custIncomeTotalQueryRequset);
+        logger.info("...end停车次数统计->调用后场dubbo服务...");
+        return new BizResultVO<List<ParkingCountDTO>>(result);
     }
     /**
@@ -607,4 +616,20 @@ public class IndexPageStatisticController extends BizController {
         }
         return new BizResult<>(resultList);
     }
+
+    /**
+     * 查询首页签到记录
+     *
+     * @param request
+     * @return
+     */
+    @ApiOperation(value = "首页签到记录")
+    @PostMapping("/queryIndexSignRecord")
+    @ResponseBody
+    public BizResultVO<List<IndexSignRecordDTO>> queryIndexSignRecord(
+        @RequestBody IndexSignRecordQueryRequest request) {
+        BizResult<List<IndexSignRecordDTO>> dtos = signRecordService.queryIndexSignRecord(request);
+        return new BizResultVO<>(dtos);
+    }
+
 }
@@ -2,25 +2,16 @@ package com.zteits.irain.portal.web.parkinglotcloudplatform.devicemanagement;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
+import com.alibaba.fastjson.JSONObject;
 import com.clouds.common.utils.DateUtil;
+import com.clouds.common.utils.ResultUtils;
 import com.clouds.common.utils.excle.ExcelReadUtil;
 import com.clouds.common.utils.excle.ExcelUtil;
 import com.clouds.common.utils.excle.ExcleFillDateManager;
@@ -43,56 +34,132 @@ import com.zteits.clouds.api.dto.park.param.TpPTgsPassedcarRequest;
 import com.zteits.clouds.api.service.park.TpPPdaService;
 import com.zteits.clouds.api.service.park.TpPTgsPassedcarService;
 import com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic.InOutParkStatisticController;
-
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.GetMapping;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 /**
  * PDA管理控制器
- * 
+ *
  * Copyright: Copyright (c) 2017  ZTE-ITS
- * 
+ *
  * @ClassName: PdaController.java
- * @Description: 
+ * @Description:
  * @version: v1.0.0
  * @author: wangbiao
- * @date: 2017年8月31日   下午3:05:03 
+ * @date: 2017年8月31日   下午3:05:03
  * Modification History:
  * Date             Author          Version            Description
- *---------------------------------------------------------*
+ * ---------------------------------------------------------*
  * 2017年8月31日      wangbiao           v1.0.0               创建
  */
 @RestController
 @RequestMapping("/padinfo")
 public class PdaController extends BizController {
-	
-	private static final Logger logger = LoggerFactory.getLogger(InOutParkStatisticController.class);
-	
-	@Autowired
-	private TpPPdaService tpPPdaService;
-	@Autowired
-	private TpPTgsPassedcarService tpPTgsPassedcarService;
-	
-	@Value("${project.syscode}")
+
+    private static final Logger logger = LoggerFactory.getLogger(InOutParkStatisticController.class);
+
+    @Autowired
+    private TpPPdaService tpPPdaService;
+    @Autowired
+    private TpPTgsPassedcarService tpPTgsPassedcarService;
+
+    @Value("${project.syscode}")
     private String sysCode;
-	@ApiOperation("过车查询")
-	@PostMapping("/queryPassedca4pabe")
-	public BizResultVO<EasyUIDataGridVO<TpPTgsPassedcarDTO>> queryPassedca4pabe(@RequestBody TpPTgsPassedcarRequest tpPTgsPassedcarRequest, HttpServletRequest request,
-			HttpServletResponse response){
-		BizResult<PageBean<TpPTgsPassedcarDTO>> bizResult = new BizResult<PageBean<TpPTgsPassedcarDTO>>();
-		try {
-			tpPTgsPassedcarRequest.setSysCode(sysCode);
-			bizResult = tpPTgsPassedcarService.queryPassedcar4Page(tpPTgsPassedcarRequest);
-			if(bizResult.isSuccess()){
-				return returnJqGridData(bizResult, TpPTgsPassedcarDTO.class);
-			}
-		} catch (Exception e) {
-			logger.debug("分页查询过车信息异常:{}",bizResult.getErrMsg());
-		}
-		return new BizResultVO<EasyUIDataGridVO<TpPTgsPassedcarDTO>>();
-	}
+    @ApiOperation("过车查询")
+    @PostMapping("/queryPassedca4pabe")
+    public BizResultVO<EasyUIDataGridVO<TpPTgsPassedcarDTO>> queryPassedca4pabe(
+        @RequestBody TpPTgsPassedcarRequest tpPTgsPassedcarRequest, HttpServletRequest request,
+        HttpServletResponse response) {
+        BizResult<PageBean<TpPTgsPassedcarDTO>> bizResult = new BizResult<PageBean<TpPTgsPassedcarDTO>>();
+        try {
+            tpPTgsPassedcarRequest.setSysCode(sysCode);
+            bizResult = tpPTgsPassedcarService.queryPassedcar4Page(tpPTgsPassedcarRequest);
+            if (bizResult.isSuccess()) {
+                return returnJqGridData(bizResult, TpPTgsPassedcarDTO.class);
+            }
+        } catch (Exception e) {
+            logger.debug("分页查询过车信息异常:{}", bizResult.getErrMsg());
+        }
+        return new BizResultVO<EasyUIDataGridVO<TpPTgsPassedcarDTO>>();
+    }
+
+    @ApiOperation("过车信息下载")
+    @GetMapping("/exportPassCarInfoExcel")
+    public void exportPassCarInfoExcel(@RequestParam String clicensetype, @RequestParam String ccarnumber,
+        @RequestParam String s_dcollectiondate, @DateTimeFormat
+    @RequestParam String e_dcollectiondate, @RequestParam String cdevicecodes, HttpServletRequest request,
+        HttpServletResponse response) {
+        TpPTgsPassedcarRequest req = new TpPTgsPassedcarRequest();
+        req.setCcarnumber(ccarnumber);
+        if(null !=cdevicecodes){
+            List<String> data = JSONObject.parseArray(cdevicecodes,String.class);
+            req.setCdevicecodes(data);
+        }
+        req.setClicensetype(clicensetype);
+        if(null != s_dcollectiondate){
+            req.setS_dcollectiondate(new Date(Long.parseLong(s_dcollectiondate)));
+        }
+
+        if(null != e_dcollectiondate){
+            req.setE_dcollectiondate(new Date(Long.parseLong(e_dcollectiondate)));
+        }
+
+        //设置导出信息
+        req.getBaseRequest().setPageNum(1);
+        req.getBaseRequest().setPageSize(0);
+        req.setSysCode(sysCode);
+        BizResult<PageBean<TpPTgsPassedcarDTO>> bizResult = tpPTgsPassedcarService.queryPassedcar4Page(req);
+        if (ResultUtils.isError(bizResult)) {
+            return;
+        }
+        List<TpPTgsPassedcarDTO> listData = bizResult.getData().getDataList();
+
+        String[] title = new String[] {"车牌号", "停车点", "车辆类型", "采集时间", "车道", "车速", "行驶方向"};
+        String sheetName = "过车信息";
+        String fileName = sheetName + com.xiaoleilu.hutool.date.DateUtil.format(new Date(),
+            com.xiaoleilu.hutool.date.DateUtil.NORM_DATETIME_PATTERN);
+        // 1.创建excel信息
+        XSSFSheet workSheet = ExcelUtil.createExcel(sheetName);
+        // 2.设置excel表头和表体
+        Layouter.buildReport(workSheet, title, 0, 0);
+        // 3.填充数据
+        List<Object[]> contentList = new ArrayList<Object[]>();
+        int number = 1;
+        for (TpPTgsPassedcarDTO b : listData) {
+            Object[] obj = new Object[title.length];
+            int index = 0;
+            obj[index++] = b.getCcarnumber();
+            obj[index++] = b.getCdevicecode();
+            obj[index++] = b.getClicensetype();
+            obj[index++] = b.getDcollectiondate() == null ? "" : com.xiaoleilu.hutool.date.DateUtil.format(
+                b.getDcollectiondate(), com.xiaoleilu.hutool.date.DateUtil.NORM_DATETIME_PATTERN);
+            obj[index++] = b.getClanenumber();
+            obj[index++] = b.getNvehiclespeed();
+            obj[index++] = b.getNderictrion();
+            contentList.add(obj);
+        }
+        ExcleFillDateManager fillUserManager = new ExcleFillDateManager();
+        fillUserManager.fillSalesOrga(workSheet, title, contentList, 2);
+        // 4.excel输出配置
+        ExcelUtil.write(response, workSheet, fileName);
+
+    }
+
 	@ApiOperation("PDA分页查询信息")
 	@PostMapping("/queryPdaInfo4pabe")
@@ -234,25 +301,28 @@ public class PdaController extends BizController {
 	}
-    @PostMapping("/importPda")   
-    public BizResultVO<Integer> importPda(@RequestParam(value="excelFile") MultipartFile file,HttpServletRequest request) throws IOException{
-    	if(file==null){
-    		throw new BizException(ErrorType.PARAMM_NULL, "导入文件不能为空");	
-    	}
+	 @PostMapping("/importPda")
+    public BizResultVO<Integer> importPda(@RequestParam(value = "excelFile") MultipartFile file,
+        HttpServletRequest request) throws IOException {
+        if (file == null) {
+            throw new BizException(ErrorType.PARAMM_NULL, "导入文件不能为空");
+        }
         //读取Excel数据到List中  
-        List<ArrayList<String>> list =  ExcelReadUtil.readExcel(file);  
+        List<ArrayList<String>> list = ExcelReadUtil.readExcel(file);
         //list中存的就是excel中的数据，可以根据excel中每一列的值转换成你所需要的值（从0开始），如：  
-        TpPPdaRequest tpPPdaRequest = null;  
-        List<TpPPdaRequest> padList = Lists.newArrayList();  
-        for(ArrayList<String> arr:list){                        
-        	tpPPdaRequest= new TpPPdaRequest();                         
-        	tpPPdaRequest.setPdaNo(arr.get(0));
-        	padList.add(tpPPdaRequest);  
+        TpPPdaRequest tpPPdaRequest = null;
+        List<TpPPdaRequest> padList = Lists.newArrayList();
+        for (ArrayList<String> arr : list) {
+            tpPPdaRequest = new TpPPdaRequest();
+            tpPPdaRequest.setPdaNo(arr.get(0));
+            padList.add(tpPPdaRequest);
         }
-        TpPPdaSRequest  TpPPdaSRequest  = new TpPPdaSRequest();
+        TpPPdaSRequest TpPPdaSRequest = new TpPPdaSRequest();
         TpPPdaSRequest.setPadList(padList);
         BizResult<Integer> rsInteger = tpPPdaService.insertBatchPda(TpPPdaSRequest);
         return new BizResultVO<Integer>(rsInteger);
-    }
-	
+    }
+
+  
+
 }
@@ -81,7 +81,7 @@
     <dubbo:reference interface="com.zteits.clouds.api.service.park.RefreshParkCacheService"
                      version="${spring.dubbo.provider.version}"
                      id="refreshSysCacheService" timeout="30000"/>
-	<!-- 刷新Sys缓存 -->
+    <!-- 刷新Sys缓存 -->
     <dubbo:reference interface="com.zteits.clouds.api.service.sys.RefreshSysCacheService"
                      version="${spring.dubbo.provider.version}"
                      id="refreshParkCacheService" timeout="30000"/>
@@ -89,17 +89,18 @@
     <!-- 通过企业客户Ids查询停车场编码 -->
     <dubbo:reference id="tdCustCompanyService" interface="com.zteits.clouds.api.service.pay.TdCustCompanyService"
                      version="${spring.dubbo.provider.version}" timeout="30000"/>
-                  
-      <!--#########################政府云平台#################################################-->
+
+    <!--#########################政府云平台#################################################-->
     <!-- 诱导屏dubbo接口-->
     <dubbo:reference id="guideScreenService" interface="com.zteits.clouds.api.service.park.GuideScreenService"
                      version="${spring.dubbo.provider.version}" timeout="30000"/>
-    
+
     <!-- 政府云平台->停车线上线下排行service -->
-     <dubbo:reference id="parkTransactionService" interface="com.zteits.clouds.api.service.govclouds.ParkTransactionService"
-           version="${spring.dubbo.provider.version}" timeout="30000"/>
+    <dubbo:reference id="parkTransactionService"
+                     interface="com.zteits.clouds.api.service.govclouds.ParkTransactionService"
+                     version="${spring.dubbo.provider.version}" timeout="30000"/>
     <dubbo:reference id="guideParkRelService" interface="com.zteits.clouds.api.service.park.GuideParkRelService"
                      version="${spring.dubbo.provider.version}" timeout="30000"/>
     <!-- 停车场LBS-查询停车场经纬度 -->
@@ -109,64 +110,79 @@
     <dubbo:reference id="tdCFileService" interface="com.zteits.clouds.api.service.pay.TdCFileService"
                      version="${spring.dubbo.provider.version}"
                      timeout="30000"/>
-     <!-- 停车轨迹 -->
-    <dubbo:reference id="parkPreferenceService" interface="com.zteits.clouds.api.service.govclouds.ParkPreferenceService"
+    <!-- 停车轨迹 -->
+    <dubbo:reference id="parkPreferenceService"
+                     interface="com.zteits.clouds.api.service.govclouds.ParkPreferenceService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+    <!-- 热点区域 -->
+    <dubbo:reference id="hotSpotAreaService" interface="com.zteits.clouds.api.service.govclouds.HotSpotAreaService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <!-- sys区域查询 -->
+    <dubbo:reference id="tbAreaService" interface="com.zteits.clouds.api.service.sys.TbAreaService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+    <!-- 企业云平台->数据统计->进出场上报 -->
+    <dubbo:reference id="inOutParkStatisticService"
+                     interface="com.zteits.clouds.api.service.clouds.InOutParkStatisticService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+
+    <!-- 企业云平台->数据统计->年卡月卡统计 -->
+    <dubbo:reference id="yearMonthCardStatisticService"
+                     interface="com.zteits.clouds.api.service.clouds.YearMonthCardStatisticService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <!-- 结算管理 账单管理 月账单管理统计汇总查询 -->
+    <dubbo:reference id="monthBillManagementService"
+                     interface="com.zteits.clouds.api.service.clouds.MonthBillManagementService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <!-- 泊位状态同步 -->
+    <dubbo:reference id="eqpBerthsService" interface="com.zteits.clouds.api.service.park.EqpBerthsService"
+                     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"/>
+
+    <!--企业云平台－>基础信息->泊位区间管理 -->
+    <dubbo:reference id="tpPRegionAreaService" interface="com.zteits.clouds.api.service.park.TpPRegionAreaService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <!--企业云平台－基础信息-泊位管理 -->
+    <dubbo:reference id="berthManageService" interface="com.zteits.clouds.api.service.park.BerthManageService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <!--企业云平台－设备管理 -pda管理-->
+    <dubbo:reference id="tpPPdaService" interface="com.zteits.clouds.api.service.park.TpPPdaService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+
+    <dubbo:reference id="tpPTgsPassedcarService" interface="com.zteits.clouds.api.service.park.TpPTgsPassedcarService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+    <!-- 地磁管理 -->
+    <dubbo:reference id="geomagneticManagementService"
+                     interface="com.zteits.clouds.api.service.park.GeomagneticManagementService"
+                     version="${spring.dubbo.provider.version}" timeout="30000"/>
+
+    <!-- sys 字典获取 -->
+    <dubbo:reference id="sysCommonService" interface="com.zteits.clouds.api.service.sys.SysCommonService"
+                     version="${spring.dubbo.provider.version}"
+                     timeout="30000"/>
+    <!--签到记录服务-->
+    <dubbo:reference id="signRecordService" interface="com.zteits.clouds.api.service.park.SignRecordService"
                      version="${spring.dubbo.provider.version}"
                      timeout="30000"/>
-     <!-- 热点区域 --> 
-     <dubbo:reference id="hotSpotAreaService" interface="com.zteits.clouds.api.service.govclouds.HotSpotAreaService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/>
-      
-      <!-- sys区域查询 --> 
-     <dubbo:reference id="tbAreaService" interface="com.zteits.clouds.api.service.sys.TbAreaService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/>
-    <!-- 企业云平台->数据统计->进出场上报 --> 
-     <dubbo:reference id="inOutParkStatisticService" interface="com.zteits.clouds.api.service.clouds.InOutParkStatisticService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/>
-      
-      
-     <!-- 企业云平台->数据统计->年卡月卡统计 --> 
-     <dubbo:reference id="yearMonthCardStatisticService" interface="com.zteits.clouds.api.service.clouds.YearMonthCardStatisticService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/>
-      
-      <!-- 结算管理 账单管理 月账单管理统计汇总查询 -->      
-      <dubbo:reference id="monthBillManagementService" interface="com.zteits.clouds.api.service.clouds.MonthBillManagementService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/> 
-      
-      <!-- 泊位状态同步 -->
-      <dubbo:reference id="eqpBerthsService" interface="com.zteits.clouds.api.service.park.EqpBerthsService"
-      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"/> 
-      
-      <!--企业云平台－>基础信息->泊位区间管理 -->
-      <dubbo:reference id="tpPRegionAreaService" interface="com.zteits.clouds.api.service.park.TpPRegionAreaService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/> 
-    
-      <!--企业云平台－基础信息-泊位管理 -->
-      <dubbo:reference id="berthManageService" interface="com.zteits.clouds.api.service.park.BerthManageService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/> 
-      
-       <!--企业云平台－设备管理 -pda管理-->
-      <dubbo:reference id="tpPPdaService" interface="com.zteits.clouds.api.service.park.TpPPdaService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/>
-      
-       <dubbo:reference id="tpPTgsPassedcarService" interface="com.zteits.clouds.api.service.park.TpPTgsPassedcarService"
-      version="${spring.dubbo.provider.version}"
-      timeout="30000"/>
-      <!-- 地磁管理 --> 
-      <dubbo:reference id="geomagneticManagementService" interface="com.zteits.clouds.api.service.park.GeomagneticManagementService"
-	      version="${spring.dubbo.provider.version}" timeout="30000"/>
 </beans>
 \ No newline at end of file