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/parklotmanage/ParkLotManageController.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/parklotmanage/ParkLotManageController.java
xiejp
2 parents 40e8a524 5c2a812e
Showing 9 changed files with 368 additions and 18 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthManageController.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/ParkLotStatisticController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/RealTimeMonitorController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java
src/main/resources/dubbo/dubbo-park-consumer.xml
@@ -5,15 +5,21 @@ import java.util.List;
 import javax.servlet.http.HttpSession;
 import com.clouds.common.utils.ResultUtils;
+import com.clouds.common.web.SessionCommUtil;
 import com.clouds.common.web.vo.BizResultVO;
 import com.clouds.common.web.vo.EasyUIDataGridVO;
 import com.zteits.clouds.api.apibase.bean.BaseRequest;
 import com.zteits.clouds.api.apibase.bean.BizResult;
+import com.zteits.clouds.api.dto.park.param.ParkInfoByAreaBlockIdsRequest;
 import com.zteits.clouds.api.dto.sys.AreaTreeDTO;
+import com.zteits.clouds.api.dto.sys.TbAreaDTO;
 import com.zteits.clouds.api.dto.sys.param.AreaBlockByOrgIdQueryRequest;
+import com.zteits.clouds.api.dto.sys.param.AreaBlockQueryByParentIdRequest;
+import com.zteits.clouds.api.service.park.ParkingLotService;
 import com.zteits.clouds.api.service.sys.TbAreaService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jdk.nashorn.internal.objects.annotations.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,6 +51,12 @@ public class AreaManageController {
     @Autowired
     private TbAreaService tbAreaService;
+    @Autowired
+    private ParkingLotService parkingLotService;
+
+    @Autowired
+    private SessionCommUtil sessionCommUtil;
+
     @ApiOperation("根据归属组织ID查询区域与区块树")
     @PostMapping("/queryAreaAndBlockTree")
     public BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> queryAreaAndBlockTree(@RequestBody BaseRequest baseRequest) {
@@ -53,8 +65,7 @@ public class AreaManageController {
         EasyUIDataGridVO<AreaTreeDTO> easyUIDataGridVO = new EasyUIDataGridVO<>();
         AreaBlockByOrgIdQueryRequest request = new AreaBlockByOrgIdQueryRequest();
         request.setSysCode(baseRequest.getSysCode());
-        // TODO 此处orgId 从当前登录操作人中取，现在先不限制
-        request.setOrgId(1L);
+        request.setOrgId(sessionCommUtil.getUserInfo().getOrgId());
         BizResult<List<AreaTreeDTO>> result = tbAreaService.queryAreaBlockByOrgId(request);
         if (ResultUtils.isSuccess(result)) {
             easyUIDataGridVO.setRows(result.getData());
@@ -68,4 +79,26 @@ public class AreaManageController {
         return resultVO;
     }
+    @ApiOperation("根据区块ID查询区块下停车场数量")
+    @PostMapping("/queryParkInfoNumByAreaBlockIds")
+    public BizResultVO<Integer> queryParkInfoNumByAreaBlockIds(@RequestBody ParkInfoByAreaBlockIdsRequest request){
+        BizResult<List<AreaTreeDTO>> bizResult =  parkingLotService.queryParkInfoByAreaBlockIds(request);
+        BizResultVO<Integer> bizResultVO = new BizResultVO<>();
+        Integer num;
+        if(ResultUtils.isSuccess(bizResult)){
+            List<AreaTreeDTO> list = bizResult.getData();
+            if(list != null){
+                num = list.size();
+            }else {
+                num = 0;
+            }
+            bizResultVO.setData(num);
+        }else{
+            bizResultVO.setCode(bizResult.getErrCode().getCode());
+            bizResultVO.setMsg(bizResult.getErrMsg());
+        }
+
+        return bizResultVO;
+    }
+
 }
@@ -135,6 +135,8 @@ public class BerthManageController extends BizController {
 		BerthManageRequest request = new BerthManageRequest();
 		request.setSysCode(sysCode);
 		request.setPlNos(plNos);
+		request.setParkTypes(parkTypes);
+		request.setParkAreaCodes(parkAreaCodes);
 		request.setBaseRequest(new BaseInfo(1, 1000));
 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{
+	
 }
@@ -255,7 +255,7 @@ public class MonthBillManagementController extends BizController {
         throws Exception {
         // 2.调用接口查询当前登录人管辖的停车场名称
         UserInfo userInfo = sessionCommUtil.getUserInfo();
-        List<String> plNos = userInfo.getOrgIds();
+        List<String> plNos = userInfo.getPlNos();
         //        UserInfo userInfo = sessionCommUtil.getUserInfo();
         //        List<String> plNos = new ArrayList<>();
         //        if (userInfo != null) {
@@ -291,7 +291,7 @@ public class MonthBillManagementController extends BizController {
         throws Exception {
         // 2.调用接口查询当前登录人管辖的停车场名称
         UserInfo userInfo = sessionCommUtil.getUserInfo();
-        List<String> plNos = userInfo.getOrgIds();
+        List<String> plNos = userInfo.getPlNos();
         //        List<String> plNos = new ArrayList<>();
         //        if (userInfo != null) {
         //            TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
@@ -441,7 +441,7 @@ public class MonthBillManagementController extends BizController {
             billQueryRequest.setBaseRequest(new BaseInfo(1, 0));
             // 2.调用接口查询当前登录人管辖的停车场名称
             UserInfo userInfo = sessionCommUtil.getUserInfo();
-            List<String> plNos = userInfo.getOrgIds();
+            List<String> plNos = userInfo.getPlNos();
             //            // 2.调用接口查询当前登录人管辖的停车场名称
             //            UserInfo userInfo = sessionCommUtil.getUserInfo();
             //            List<String> plNos = new ArrayList<>();
@@ -118,7 +118,7 @@ public class ParkLotStatisticController {
         UserInfo userInfo = sessionCommUtil.getUserInfo();
         List<String> plNos=Lists.newArrayList();
         if(null != userInfo){
-        	plNos= userInfo.getOrgIds();
+        	plNos= userInfo.getPlNos();
         }
 //		if(userInfo!=null){
 //			TdCompanyParkQueryRequest tdCompanyParkQueryRequest = new TdCompanyParkQueryRequest();
@@ -28,8 +28,10 @@ import com.zteits.clouds.api.apibase.bean.PageBean;
 import com.zteits.clouds.api.apibase.constants.ErrorType;
 import com.zteits.clouds.api.apibase.exception.BizException;
 import com.zteits.clouds.api.dto.clouds.param.RealTimeMonitoringRequest;
+import com.zteits.clouds.api.dto.park.dto.BerthsDTO;
 import com.zteits.clouds.api.dto.park.dto.ParkOccupancyRateDTO;
 import com.zteits.clouds.api.dto.park.dto.TpPEqpLogDTO;
+import com.zteits.clouds.api.dto.park.param.QueryBerthForPageRequest;
 import com.zteits.clouds.api.dto.sys.SysOpDTO;
 import com.zteits.clouds.api.dto.sys.SysOrgDTO;
 import com.zteits.clouds.api.dto.sys.SysRoleDTO;
@@ -38,6 +40,7 @@ import com.zteits.clouds.api.dto.sys.param.SysOpForPageRequest;
 import com.zteits.clouds.api.dto.sys.param.SysOpSaveOrModfiyRequest;
 import com.zteits.clouds.api.dto.sys.param.SysOrgPageQueryRequest;
 import com.zteits.clouds.api.dto.sys.param.SysRolePageQueryRequest;
+import com.zteits.clouds.api.service.park.BerthManageService;
 import com.zteits.clouds.api.service.park.EqpBerthsService;
 import io.swagger.annotations.Api;
@@ -67,6 +70,8 @@ public class RealTimeMonitorController extends BizController {
 	@Autowired
 	private EqpBerthsService eqpBerthsService;
+	@Autowired
+	private BerthManageService berthManageService;
     /**
@@ -78,8 +83,8 @@ public class RealTimeMonitorController extends BizController {
      * langlw 2017-08-30
      */
     @ApiOperation("分页查询停车场设备日志数据")
-    @PostMapping("/queryOpsBySysCode")
-    public BizResultVO<EasyUIDataGridVO<TpPEqpLogDTO>> queryUsersPageList(
+    @PostMapping("/queryParkEqpForPageByPlNo")
+    public BizResultVO<EasyUIDataGridVO<TpPEqpLogDTO>> queryParkEqpForPageByPlNo(
         @RequestBody RealTimeMonitoringRequest request)
         throws Exception {
     	logger.info("调用分页查询停车场设备日志数据dubbo服务入参：request={}"+JSONObject.toJSONString(request));
@@ -109,4 +114,44 @@ public class RealTimeMonitorController extends BizController {
 		logger.info("调用分组查询停车场占用率dubbo服务返回信息：request={}"+JSONObject.toJSONString(result));
         return new BizResultVO<List<ParkOccupancyRateDTO>>(result);
     }
+    
+    
+    
+    /**
+     * 通过车位对象分页查询车位信息
+     * query berths by berth for page
+     * langlw 2017-8-31
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ApiOperation("通过车位对象分页查询车位信息")
+    @PostMapping("/queryBerthByBerthForPage")
+    public BizResultVO<EasyUIDataGridVO<BerthsDTO>> queryBerthByBerthForPage(
+        @RequestBody QueryBerthForPageRequest request)
+        throws Exception {
+    	logger.info("通过车位对象分页查询车位信息dubbo服务入参：request={}"+JSONObject.toJSONString(request));
+		BizResult<PageBean<BerthsDTO>> result = berthManageService.queryBerthByBerth(request);
+		logger.info("通过车位对象分页查询车位信息dubbo服务返回信息：response={}"+JSONObject.toJSONString(result));
+        return returnJqGridData(result, BerthsDTO.class);
+    }
+    
+    /**
+     * 分组查询停车场占用率
+     *
+     * @param request
+     * @return
+     * @throws Exception
+     * langlw 2017-08-31
+     */
+    @ApiOperation("分组查询停车场占用率")
+    @PostMapping("/queryParkBerthOccupancyRate")
+    public BizResultVO<List<ParkOccupancyRateDTO>> queryParkBerthOccupancyRate(
+        @RequestBody QueryBerthForPageRequest request)
+        throws Exception {
+    	logger.info("调用分组查询停车场占用率dubbo服务入参：request={}"+JSONObject.toJSONString(request));
+		BizResult<List<ParkOccupancyRateDTO>> result = berthManageService.queryParkOccupancyRate(request);
+		logger.info("调用分组查询停车场占用率dubbo服务返回信息：request={}"+JSONObject.toJSONString(result));
+        return new BizResultVO<List<ParkOccupancyRateDTO>>(result);
+    }
 }
+package com.zteits.irain.portal.web.parkinglotcloudplatform.devicemanagement;
+
+import java.io.IOException;
+import java.util.ArrayList;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.clouds.common.utils.DateUtil;
+import com.clouds.common.utils.excle.ExcelReadUtil;
+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.vo.BizResultVO;
+import com.clouds.common.web.vo.EasyUIDataGridVO;
+import com.google.common.collect.Lists;
+import com.xiaoleilu.hutool.util.CollectionUtil;
+import com.zteits.clouds.api.apibase.bean.BizResult;
+import com.zteits.clouds.api.apibase.bean.PageBean;
+import com.zteits.clouds.api.apibase.constants.ErrorType;
+import com.zteits.clouds.api.apibase.exception.BizException;
+import com.zteits.clouds.api.dto.park.dto.TpPPdaDTO;
+import com.zteits.clouds.api.dto.park.param.TpPPdaRequest;
+import com.zteits.clouds.api.dto.park.param.TpPPdaSRequest;
+import com.zteits.clouds.api.service.park.TpPPdaService;
+import com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic.InOutParkStatisticController;
+
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * PDA管理控制器
+ * 
+ * Copyright: Copyright (c) 2017  ZTE-ITS
+ * 
+ * @ClassName: PdaController.java
+ * @Description: 
+ * @version: v1.0.0
+ * @author: wangbiao
+ * @date: 2017年8月31日   下午3:05:03 
+ * Modification History:
+ * Date             Author          Version            Description
+ *---------------------------------------------------------*
+ * 2017年8月31日      wangbiao           v1.0.0               创建
+ */
+@RestController
+public class PdaController extends BizController {
+	
+	private static final Logger logger = LoggerFactory.getLogger(InOutParkStatisticController.class);
+	
+	@Autowired
+	private TpPPdaService tpPPdaService;
+	
+	@Value("${project.syscode}")
+    private String sysCode;
+	
+	@ApiOperation("PDA信息信息")
+	@PostMapping("/queryPdaInfo4pabe")
+	public BizResultVO<EasyUIDataGridVO<TpPPdaDTO>> queryPdaInfo4pabe(@RequestBody TpPPdaRequest tpPPdaRequest, HttpServletRequest request,
+			HttpServletResponse response){
+		BizResult<PageBean<TpPPdaDTO>> bizResult = new BizResult<PageBean<TpPPdaDTO>>();
+		try {
+			tpPPdaRequest.setSysCode(sysCode);
+			bizResult = tpPPdaService.queryPdaInfo4pabe(tpPPdaRequest);
+			if(bizResult.isSuccess()){
+				return returnJqGridData(bizResult, TpPPdaDTO.class);
+			}
+		} catch (Exception e) {
+			logger.debug("分页查询pda信息异常:{}",bizResult.getErrMsg());
+		}
+		return new BizResultVO<EasyUIDataGridVO<TpPPdaDTO>>();
+	}
+	
+	@ApiOperation("新增PDA信息信息")
+	@PostMapping("/insertPda")
+	public BizResultVO<Integer> insertPda(@RequestBody TpPPdaRequest tpPPdaRequest, HttpServletRequest request,
+			HttpServletResponse response){
+		tpPPdaRequest.setSysCode(sysCode);
+		BizResult<Integer> bizResult = tpPPdaService.insertPda(tpPPdaRequest);
+		if(bizResult.isSuccess()){
+			return new BizResultVO<Integer>(bizResult);
+		}else{
+			logger.debug("新增PDA信息信息异常 :{}",bizResult.getErrMsg());
+		}
+		return new BizResultVO<Integer>();
+	}
+	
+	@ApiOperation("删除PDA信息信息")
+	@PostMapping("/deletePda")
+	public BizResultVO<Integer> deletePda(@RequestBody TpPPdaRequest tpPPdaRequest, HttpServletRequest request,
+			HttpServletResponse response){
+		tpPPdaRequest.setSysCode(sysCode);
+		BizResult<Integer> bizResult = tpPPdaService.deletetPda(tpPPdaRequest);
+		if(bizResult.isSuccess()){
+			return new BizResultVO<Integer>(bizResult);
+		}else{
+			logger.debug("删除PDA信息信息异常 :{}",bizResult.getErrMsg());
+		}
+		return new BizResultVO<Integer>();
+	}
+	
+	@ApiOperation("删除PDA信息信息")
+	@PostMapping("/deleteBatchPda")
+	public BizResultVO<Integer> deleteBatchPda(@RequestBody TpPPdaSRequest tpPPdaSRequest, HttpServletRequest request,
+			HttpServletResponse response){
+		tpPPdaSRequest.setSysCode(sysCode);
+		BizResult<Integer> bizResult = tpPPdaService.deleteBatchPda(tpPPdaSRequest);
+		if(bizResult.isSuccess()){
+			return new BizResultVO<Integer>(bizResult);
+		}else{
+			logger.debug("删除PDA信息信息异常 :{}",bizResult.getErrMsg());
+		}
+		return new BizResultVO<Integer>();
+	}
+	
+	@ApiOperation("根据id查询PDA信息")
+	@PostMapping("/queryPdaById")
+	public BizResultVO<TpPPdaDTO> queryPdaById(@RequestBody TpPPdaRequest tpPPdaRequest, HttpServletRequest request,
+			HttpServletResponse response){
+		tpPPdaRequest.setSysCode(sysCode);
+		BizResult<TpPPdaDTO> bizResult = tpPPdaService.queryPdaById(tpPPdaRequest);
+		if(bizResult.isSuccess()){
+			return new BizResultVO<TpPPdaDTO>(bizResult);
+		}else{
+			logger.debug("根据id查询PDA信息异常 :{}",bizResult.getErrMsg());
+		}
+		return new BizResultVO<TpPPdaDTO>();
+	}
+	
+	@ApiOperation("修改PDA信息")
+	@PostMapping("/updatePda")
+	public BizResultVO<Integer> updatePda(@RequestBody TpPPdaRequest tpPPdaRequest, HttpServletRequest request,
+			HttpServletResponse response){
+		tpPPdaRequest.setSysCode(sysCode);
+		BizResult<Integer> bizResult = tpPPdaService.updatePda(tpPPdaRequest);
+		if(bizResult.isSuccess()){
+			return new BizResultVO<Integer>(bizResult);
+		}else{
+			logger.debug("修改PDA信息异常 :{}",bizResult.getErrMsg());
+		}
+		return new BizResultVO<Integer>();
+	}
+	
+	@ApiOperation("pda信息导出excel")
+	@GetMapping("exportpdaExcel")
+	public void exportBerthInfoExcel(@RequestBody TpPPdaRequest tpPPdaRequest, HttpServletRequest requests, HttpServletResponse response) {
+		tpPPdaRequest.setSysCode(sysCode);
+		BizResult<List<TpPPdaDTO>> list = tpPPdaService.queryPdaInfo(tpPPdaRequest);
+		String[] title = new String[] { "序号","设备编号", "设备名称", "设备类型", "状态","持有人","资源描述" };
+		String sheetName = "PDA信息";
+		String fileName = sheetName+DateUtil.getDate();
+		// 1.创建excel信息
+		XSSFSheet workSheet = ExcelUtil.createExcel(fileName);
+		// 2.设置excel表头和表体
+		Layouter.buildReport(workSheet, title, 0, 0);
+		// 3.填充数据
+		List<Object[]> contentList = new ArrayList<Object[]>();
+		int number = 1;
+		if(list.isSuccess()  && CollectionUtil.isNotEmpty(list.getData())){
+			for (TpPPdaDTO b : list.getData()) {
+				Object[] obj = new Object[title.length];
+				int index = 0;
+				obj[index++] = number++;
+				obj[index++] = b.getId();
+				obj[index++] = b.getPdaNo();
+				obj[index++] = b.getPdaName();
+				obj[index++] = b.getPdaType();
+				obj[index++] = b.getPdaStatus();
+				obj[index++] = b.getOwnerName();
+				obj[index++] = b.getRemark();
+				contentList.add(obj);
+			}
+		}
+		ExcleFillDateManager fillUserManager = new ExcleFillDateManager();
+		fillUserManager.fillSalesOrga(workSheet, title, contentList, 2);
+		// 4.excel输出配置
+		ExcelUtil.write(response, workSheet, fileName);
+	}
+	
+	
+	@ApiOperation("pda信息 导入模板下载")
+	@GetMapping("exportpdaExcel")
+	public void exportModelExcel(HttpServletRequest requests, HttpServletResponse response) {
+		String[] title = new String[] { "设备编号", "设备名称", "设备类型","停车场编号","sim卡号","持有人编号","持有人名称","状态","资源描述" };
+		String fileName = "PDA信息导入模板";
+		// 1.创建excel信息
+		XSSFSheet workSheet = ExcelUtil.createExcel(fileName);
+		// 2.设置excel表头和表体
+		Layouter.buildReport(workSheet, title, 0, 0);
+		// 3.填充数据
+		ExcleFillDateManager fillUserManager = new ExcleFillDateManager();
+		fillUserManager.fillSalesOrga(workSheet, title, null, 2);
+		// 4.excel输出配置
+		ExcelUtil.write(response, workSheet, fileName);
+	}
+	
+	
+    @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中存的就是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);  
+        }
+        TpPPdaSRequest  TpPPdaSRequest  = new TpPPdaSRequest();
+        TpPPdaSRequest.setPadList(padList);
+        BizResult<Integer> rsInteger = tpPPdaService.insertBatchPda(TpPPdaSRequest);
+        return new BizResultVO<Integer>(rsInteger);
+    }
+	
+}
@@ -127,7 +127,7 @@ public class ParkLotManageController extends BizController{
 		UserInfo userInfo = sessionCommUtil.getUserInfo();
         List<String> plNos  =new ArrayList<>();
 		if(null !=userInfo){
-            plNos = userInfo.getOrgIds();
+            plNos = userInfo.getPlNos();
         }
 		return plNos;
 	}
@@ -157,4 +157,9 @@
       <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"/>
 </beans>
 \ No newline at end of file