diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java index c0a88fa..e3ba890 100644 --- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java +++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java @@ -470,29 +470,27 @@ public class BerthsStatisticController extends BizController { @ApiOperation("获取停车场信息统计和今日收益") @PostMapping("getParkStaticsticAndTodayAmount") public BizResultVO> getParkStaticsticAndTodayAmount(@RequestBody QueryTodayOrderRequest request) throws Exception{ - // 1.调用接口查询当前登录人管辖的停车场名称 - UserInfo userInfo = sessionCommUtil.getUserInfo(); - List plNos=Lists.newArrayList(); - if(null != userInfo){ - plNos= userInfo.getOrgIds(); - } + if(CollectionUtils.isEmpty(request.getPlNos())){ + throw new BizException(ErrorType.PARAMM_NULL, "入参不能为空!"); + } + //今日收益 List listVO= new ArrayList(); BizResult> result = tdBOrderService.queryTodayAmountSumByPlno(request); Map mapAmount=ResultUtils.getBizResultData(result); //空闲车位数 ParkFreeBerthGetByPlnoRequest parkFreeBerthGetByPlnoRequest = new ParkFreeBerthGetByPlnoRequest(); - request.setPlNos(plNos); - request.setSysCode(sysCode); + parkFreeBerthGetByPlnoRequest.setPlNos(request.getPlNos()); + parkFreeBerthGetByPlnoRequest.setSysCode(request.getSysCode()); BizResult> freeBerthsNumBizResult = parkFreeBerthService.getParkFreeBerthByPlno(parkFreeBerthGetByPlnoRequest); Map freeBerthsNumMap = ResultUtils.getBizResultData(freeBerthsNumBizResult); - for (String plNo : plNos) { + for (String plNo : request.getPlNos()) { //先查询缓存 ParkingLotDTO lotDTO = ParkingLotCacheUtil.getParkLotByPlNo(plNo); if(lotDTO == null){ //查询数据库 QueryParkLotInfoByPkNoRequest request1 = new QueryParkLotInfoByPkNoRequest(); - request1.setSysCode(sysCode); + request1.setSysCode(request.getSysCode()); request1.setPklNo(plNo); BizResult bizResult2 = parkingLotQueryService.QueryParkingLotByPkNo(request1); lotDTO = ResultUtils.getBizResultData(bizResult2);