diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/RealTimeMonitorController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/RealTimeMonitorController.java index 4e238e0..1431e95 100644 --- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/RealTimeMonitorController.java +++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/RealTimeMonitorController.java @@ -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> queryUsersPageList( + @PostMapping("/queryParkEqpForPageByPlNo") + public BizResultVO> 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>(result); } + + + + /** + * 通过车位对象分页查询车位信息 + * query berths by berth for page + * langlw 2017-8-31 + * @param request + * @return + * @throws Exception + */ + @ApiOperation("通过车位对象分页查询车位信息") + @PostMapping("/queryBerthByBerthForPage") + public BizResultVO> queryBerthByBerthForPage( + @RequestBody QueryBerthForPageRequest request) + throws Exception { + logger.info("通过车位对象分页查询车位信息dubbo服务入参:request={}"+JSONObject.toJSONString(request)); + BizResult> 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> queryParkBerthOccupancyRate( + @RequestBody QueryBerthForPageRequest request) + throws Exception { + logger.info("调用分组查询停车场占用率dubbo服务入参:request={}"+JSONObject.toJSONString(request)); + BizResult> result = berthManageService.queryParkOccupancyRate(request); + logger.info("调用分组查询停车场占用率dubbo服务返回信息:request={}"+JSONObject.toJSONString(result)); + return new BizResultVO>(result); + } }