From a07ba3bda62ac27a54803b0ba4d73db9ccf5b0bb Mon Sep 17 00:00:00 2001
From: wangbiao <thisjava@163.com>
Date: Fri, 1 Sep 2017 11:58:45 +0800
Subject: [PATCH] 过车查询

---
 src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java | 30 +++++++++++++++++++++++++++---
 src/main/resources/dubbo/dubbo-park-consumer.xml                                                      |  5 +++++
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java
index e6c0a62..0f2606c 100644
--- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java
+++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java
@@ -34,9 +34,12 @@ 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.dto.TpPTgsPassedcarDTO;
 import com.zteits.clouds.api.dto.park.param.TpPPdaRequest;
 import com.zteits.clouds.api.dto.park.param.TpPPdaSRequest;
+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;
@@ -63,10 +66,31 @@ public class PdaController extends BizController {
 	
 	@Autowired
 	private TpPPdaService tpPPdaService;
+	@Autowired
+	private TpPTgsPassedcarService tpPTgsPassedcarService;
 	
 	@Value("${project.syscode}")
     private String sysCode;
 	
+	
+	
+	@ApiOperation("PDA信息信息")
+	@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("PDA信息信息")
 	@PostMapping("/queryPdaInfo4pabe")
 	public BizResultVO<EasyUIDataGridVO<TpPPdaDTO>> queryPdaInfo4pabe(@RequestBody TpPPdaRequest tpPPdaRequest, HttpServletRequest request,
@@ -155,7 +179,7 @@ public class PdaController extends BizController {
 	}
 	
 	@ApiOperation("pda信息导出excel")
-	@GetMapping("exportpdaExcel")
+	@PostMapping("exportpdaExcel")
 	public void exportBerthInfoExcel(@RequestBody TpPPdaRequest tpPPdaRequest, HttpServletRequest requests, HttpServletResponse response) {
 		tpPPdaRequest.setSysCode(sysCode);
 		BizResult<List<TpPPdaDTO>> list = tpPPdaService.queryPdaInfo(tpPPdaRequest);
@@ -192,7 +216,7 @@ public class PdaController extends BizController {
 	
 	
 	@ApiOperation("pda信息 导入模板下载")
-	@GetMapping("exportpdaExcel")
+	@GetMapping("exportModelExcel")
 	public void exportModelExcel(HttpServletRequest requests, HttpServletResponse response) {
 		String[] title = new String[] { "设备编号", "设备名称", "设备类型","停车场编号","sim卡号","持有人编号","持有人名称","状态","资源描述" };
 		String fileName = "PDA信息导入模板";
@@ -202,7 +226,7 @@ public class PdaController extends BizController {
 		Layouter.buildReport(workSheet, title, 0, 0);
 		// 3.填充数据
 		ExcleFillDateManager fillUserManager = new ExcleFillDateManager();
-		fillUserManager.fillSalesOrga(workSheet, title, null, 2);
+		fillUserManager.fillSalesOrga(workSheet, title, Lists.newArrayList(), 2);
 		// 4.excel输出配置
 		ExcelUtil.write(response, workSheet, fileName);
 	}
diff --git a/src/main/resources/dubbo/dubbo-park-consumer.xml b/src/main/resources/dubbo/dubbo-park-consumer.xml
index 3bc8e2d..1554b4a 100644
--- a/src/main/resources/dubbo/dubbo-park-consumer.xml
+++ b/src/main/resources/dubbo/dubbo-park-consumer.xml
@@ -162,4 +162,9 @@
       <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"/>
+      
 </beans>
\ No newline at end of file
--
libgit2 0.21.4