Commit 724041a63d3f25fb29f724b3c9f74e843202a676
1 parent
da00abba
tijiao
Showing
1 changed file
with
47 additions
and
2 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/RealTimeMonitorController.java
... | ... | @@ -28,8 +28,10 @@ import com.zteits.clouds.api.apibase.bean.PageBean; |
28 | 28 | import com.zteits.clouds.api.apibase.constants.ErrorType; |
29 | 29 | import com.zteits.clouds.api.apibase.exception.BizException; |
30 | 30 | import com.zteits.clouds.api.dto.clouds.param.RealTimeMonitoringRequest; |
31 | +import com.zteits.clouds.api.dto.park.dto.BerthsDTO; | |
31 | 32 | import com.zteits.clouds.api.dto.park.dto.ParkOccupancyRateDTO; |
32 | 33 | import com.zteits.clouds.api.dto.park.dto.TpPEqpLogDTO; |
34 | +import com.zteits.clouds.api.dto.park.param.QueryBerthForPageRequest; | |
33 | 35 | import com.zteits.clouds.api.dto.sys.SysOpDTO; |
34 | 36 | import com.zteits.clouds.api.dto.sys.SysOrgDTO; |
35 | 37 | import com.zteits.clouds.api.dto.sys.SysRoleDTO; |
... | ... | @@ -38,6 +40,7 @@ import com.zteits.clouds.api.dto.sys.param.SysOpForPageRequest; |
38 | 40 | import com.zteits.clouds.api.dto.sys.param.SysOpSaveOrModfiyRequest; |
39 | 41 | import com.zteits.clouds.api.dto.sys.param.SysOrgPageQueryRequest; |
40 | 42 | import com.zteits.clouds.api.dto.sys.param.SysRolePageQueryRequest; |
43 | +import com.zteits.clouds.api.service.park.BerthManageService; | |
41 | 44 | import com.zteits.clouds.api.service.park.EqpBerthsService; |
42 | 45 | |
43 | 46 | import io.swagger.annotations.Api; |
... | ... | @@ -67,6 +70,8 @@ public class RealTimeMonitorController extends BizController { |
67 | 70 | |
68 | 71 | @Autowired |
69 | 72 | private EqpBerthsService eqpBerthsService; |
73 | + @Autowired | |
74 | + private BerthManageService berthManageService; | |
70 | 75 | |
71 | 76 | |
72 | 77 | /** |
... | ... | @@ -78,8 +83,8 @@ public class RealTimeMonitorController extends BizController { |
78 | 83 | * langlw 2017-08-30 |
79 | 84 | */ |
80 | 85 | @ApiOperation("分页查询停车场设备日志数据") |
81 | - @PostMapping("/queryOpsBySysCode") | |
82 | - public BizResultVO<EasyUIDataGridVO<TpPEqpLogDTO>> queryUsersPageList( | |
86 | + @PostMapping("/queryParkEqpForPageByPlNo") | |
87 | + public BizResultVO<EasyUIDataGridVO<TpPEqpLogDTO>> queryParkEqpForPageByPlNo( | |
83 | 88 | @RequestBody RealTimeMonitoringRequest request) |
84 | 89 | throws Exception { |
85 | 90 | logger.info("调用分页查询停车场设备日志数据dubbo服务入参:request={}"+JSONObject.toJSONString(request)); |
... | ... | @@ -109,4 +114,44 @@ public class RealTimeMonitorController extends BizController { |
109 | 114 | logger.info("调用分组查询停车场占用率dubbo服务返回信息:request={}"+JSONObject.toJSONString(result)); |
110 | 115 | return new BizResultVO<List<ParkOccupancyRateDTO>>(result); |
111 | 116 | } |
117 | + | |
118 | + | |
119 | + | |
120 | + /** | |
121 | + * 通过车位对象分页查询车位信息 | |
122 | + * query berths by berth for page | |
123 | + * langlw 2017-8-31 | |
124 | + * @param request | |
125 | + * @return | |
126 | + * @throws Exception | |
127 | + */ | |
128 | + @ApiOperation("通过车位对象分页查询车位信息") | |
129 | + @PostMapping("/queryBerthByBerthForPage") | |
130 | + public BizResultVO<EasyUIDataGridVO<BerthsDTO>> queryBerthByBerthForPage( | |
131 | + @RequestBody QueryBerthForPageRequest request) | |
132 | + throws Exception { | |
133 | + logger.info("通过车位对象分页查询车位信息dubbo服务入参:request={}"+JSONObject.toJSONString(request)); | |
134 | + BizResult<PageBean<BerthsDTO>> result = berthManageService.queryBerthByBerth(request); | |
135 | + logger.info("通过车位对象分页查询车位信息dubbo服务返回信息:response={}"+JSONObject.toJSONString(result)); | |
136 | + return returnJqGridData(result, BerthsDTO.class); | |
137 | + } | |
138 | + | |
139 | + /** | |
140 | + * 分组查询停车场占用率 | |
141 | + * | |
142 | + * @param request | |
143 | + * @return | |
144 | + * @throws Exception | |
145 | + * langlw 2017-08-31 | |
146 | + */ | |
147 | + @ApiOperation("分组查询停车场占用率") | |
148 | + @PostMapping("/queryParkBerthOccupancyRate") | |
149 | + public BizResultVO<List<ParkOccupancyRateDTO>> queryParkBerthOccupancyRate( | |
150 | + @RequestBody QueryBerthForPageRequest request) | |
151 | + throws Exception { | |
152 | + logger.info("调用分组查询停车场占用率dubbo服务入参:request={}"+JSONObject.toJSONString(request)); | |
153 | + BizResult<List<ParkOccupancyRateDTO>> result = berthManageService.queryParkOccupancyRate(request); | |
154 | + logger.info("调用分组查询停车场占用率dubbo服务返回信息:request={}"+JSONObject.toJSONString(result)); | |
155 | + return new BizResultVO<List<ParkOccupancyRateDTO>>(result); | |
156 | + } | |
112 | 157 | } | ... | ... |