BJ_ZTEITS-Developers / zteits-bcp-portal

Commit a07ba3bda62ac27a54803b0ba4d73db9ccf5b0bb

Authored by 王彪总
1 parent 5c2a812e

过车查询

Inline Side-by-side
Showing 2 changed files with 32 additions and 3 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/devicemanagement/PdaController.java
  View file @a07ba3b
... ... @@ -34,9 +34,12 @@ import com.zteits.clouds.api.apibase.bean.PageBean;
34 34 import com.zteits.clouds.api.apibase.constants.ErrorType;
35 35 import com.zteits.clouds.api.apibase.exception.BizException;
36 36 import com.zteits.clouds.api.dto.park.dto.TpPPdaDTO;
  37 +import com.zteits.clouds.api.dto.park.dto.TpPTgsPassedcarDTO;
37 38 import com.zteits.clouds.api.dto.park.param.TpPPdaRequest;
38 39 import com.zteits.clouds.api.dto.park.param.TpPPdaSRequest;
  40 +import com.zteits.clouds.api.dto.park.param.TpPTgsPassedcarRequest;
39 41 import com.zteits.clouds.api.service.park.TpPPdaService;
  42 +import com.zteits.clouds.api.service.park.TpPTgsPassedcarService;
40 43 import com.zteits.irain.portal.web.parkinglotcloudplatform.datastatistic.InOutParkStatisticController;
41 44  
42 45 import io.swagger.annotations.ApiOperation;
... ... @@ -63,10 +66,31 @@ public class PdaController extends BizController {
63 66  
64 67 @Autowired
65 68 private TpPPdaService tpPPdaService;
  69 + @Autowired
  70 + private TpPTgsPassedcarService tpPTgsPassedcarService;
66 71  
67 72 @Value("${project.syscode}")
68 73 private String sysCode;
69 74  
  75 +
  76 +
  77 + @ApiOperation("PDA信息信息")
  78 + @PostMapping("/queryPassedca4pabe")
  79 + public BizResultVO<EasyUIDataGridVO<TpPTgsPassedcarDTO>> queryPassedca4pabe(@RequestBody TpPTgsPassedcarRequest tpPTgsPassedcarRequest, HttpServletRequest request,
  80 + HttpServletResponse response){
  81 + BizResult<PageBean<TpPTgsPassedcarDTO>> bizResult = new BizResult<PageBean<TpPTgsPassedcarDTO>>();
  82 + try {
  83 + tpPTgsPassedcarRequest.setSysCode(sysCode);
  84 + bizResult = tpPTgsPassedcarService.queryPassedcar4Page(tpPTgsPassedcarRequest);
  85 + if(bizResult.isSuccess()){
  86 + return returnJqGridData(bizResult, TpPTgsPassedcarDTO.class);
  87 + }
  88 + } catch (Exception e) {
  89 + logger.debug("分页查询过车信息异常:{}",bizResult.getErrMsg());
  90 + }
  91 + return new BizResultVO<EasyUIDataGridVO<TpPTgsPassedcarDTO>>();
  92 + }
  93 +
70 94 @ApiOperation("PDA信息信息")
71 95 @PostMapping("/queryPdaInfo4pabe")
72 96 public BizResultVO<EasyUIDataGridVO<TpPPdaDTO>> queryPdaInfo4pabe(@RequestBody TpPPdaRequest tpPPdaRequest, HttpServletRequest request,
... ... @@ -155,7 +179,7 @@ public class PdaController extends BizController {
155 179 }
156 180  
157 181 @ApiOperation("pda信息导出excel")
158   - @GetMapping("exportpdaExcel")
  182 + @PostMapping("exportpdaExcel")
159 183 public void exportBerthInfoExcel(@RequestBody TpPPdaRequest tpPPdaRequest, HttpServletRequest requests, HttpServletResponse response) {
160 184 tpPPdaRequest.setSysCode(sysCode);
161 185 BizResult<List<TpPPdaDTO>> list = tpPPdaService.queryPdaInfo(tpPPdaRequest);
... ... @@ -192,7 +216,7 @@ public class PdaController extends BizController {
192 216  
193 217  
194 218 @ApiOperation("pda信息 导入模板下载")
195   - @GetMapping("exportpdaExcel")
  219 + @GetMapping("exportModelExcel")
196 220 public void exportModelExcel(HttpServletRequest requests, HttpServletResponse response) {
197 221 String[] title = new String[] { "设备编号", "设备名称", "设备类型","停车场编号","sim卡号","持有人编号","持有人名称","状态","资源描述" };
198 222 String fileName = "PDA信息导入模板";
... ... @@ -202,7 +226,7 @@ public class PdaController extends BizController {
202 226 Layouter.buildReport(workSheet, title, 0, 0);
203 227 // 3.填充数据
204 228 ExcleFillDateManager fillUserManager = new ExcleFillDateManager();
205   - fillUserManager.fillSalesOrga(workSheet, title, null, 2);
  229 + fillUserManager.fillSalesOrga(workSheet, title, Lists.newArrayList(), 2);
206 230 // 4.excel输出配置
207 231 ExcelUtil.write(response, workSheet, fileName);
208 232 }
... ...
src/main/resources/dubbo/dubbo-park-consumer.xml
  View file @a07ba3b
... ... @@ -162,4 +162,9 @@
162 162 <dubbo:reference id="tpPPdaService" interface="com.zteits.clouds.api.service.park.TpPPdaService"
163 163 version="${spring.dubbo.provider.version}"
164 164 timeout="30000"/>
  165 +
  166 + <dubbo:reference id="tpPTgsPassedcarService" interface="com.zteits.clouds.api.service.park.TpPTgsPassedcarService"
  167 + version="${spring.dubbo.provider.version}"
  168 + timeout="30000"/>
  169 +
165 170 </beans>
166 171 \ No newline at end of file
... ...