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