diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/VehicleAccessApi.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/VehicleAccessApi.java index 7911dc32b..9f83cf441 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/VehicleAccessApi.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/VehicleAccessApi.java @@ -1,6 +1,7 @@ package cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess; import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.AreaDataVO; +import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.EntryRecordVo; import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.ParkingLotDataVO; import cn.iocoder.yudao.module.datacenter.controller.app.vehicleaccess.vo.RevenueVO; import cn.iocoder.yudao.module.datacenter.dal.dataobject.vehicleaccess.*; @@ -93,6 +94,22 @@ public class VehicleAccessApi { LocalDateTime endOfDay = LocalDateTime.of(today, LocalTime.MAX); List entryRecords = entryRecordRepository.findByCreateTimeBetween(startOfDay, endOfDay); parkingLotDataVO.setIntoNum(entryRecords.size());//车辆进入数 + //固定车临时车 + int temporaryCar = 0; + int fixationCar = 0; + for (int i = 0; i < entryRecords.size(); i++) { + for (int j = 0; j < entryRecords.get(i).getDatas().size(); j++) { + EntryRecordVo entryRecordVo = entryRecords.get(i).getDatas().get(j); + if (entryRecordVo.getCarType().equals("临时车")){ + temporaryCar ++ ; + } + if (entryRecordVo.getCarType().equals("固定车")){ + fixationCar ++ ; + } + } + } + parkingLotDataVO.setTemporaryCar(temporaryCar); + parkingLotDataVO.setFixationCar(fixationCar); List appearanceRecords = appearanceRecordRepository.findByCreateTimeBetween(startOfDay, endOfDay); parkingLotDataVO.setOutNum(appearanceRecords.size());//车辆出入数 diff --git a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/ParkingLotDataVO.java b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/ParkingLotDataVO.java index ce2b1c605..4057eb158 100644 --- a/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/ParkingLotDataVO.java +++ b/ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/vehicleaccess/vo/ParkingLotDataVO.java @@ -32,6 +32,12 @@ public class ParkingLotDataVO { //总利用率 private Double useRatio; + //临时车数量 + private int temporaryCar; + + //固定车数量 + private int fixationCar; + //区域停车场数据集合 private List areaDataVOList = new ArrayList<>(); diff --git a/ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/ParkingServerApplication.java b/ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/ParkingServerApplication.java index 080d346a7..09b0f5473 100644 --- a/ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/ParkingServerApplication.java +++ b/ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/ParkingServerApplication.java @@ -10,6 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication //@MapperScan("cn.iocoder.yudao.module.parking.dal.mysql.channelinformation.ChannelInformationMapper") public class ParkingServerApplication { + //测试 public static void main(String[] args) { SpringApplication.run(ParkingServerApplication.class, args); diff --git a/ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/service/warning/WarningServiceImpl.java b/ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/service/warning/WarningServiceImpl.java index 4e7c198ae..4bb918917 100644 --- a/ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/service/warning/WarningServiceImpl.java +++ b/ludu-module-parking/ludu-module-parking-biz/src/main/java/cn/iocoder/yudao/module/parking/service/warning/WarningServiceImpl.java @@ -48,6 +48,14 @@ public class WarningServiceImpl implements WarningService { warningMapper.updateById(updateObj); } + //public void updateWarning(WarningSaveReqVO updateReqVO) { + // // 校验存在 + // validateWarningExists(updateReqVO.getId()); + // // 更新 + // WarningDO updateObj = BeanUtils.toBean(updateReqVO, WarningDO.class); + // warningMapper.updateById(updateObj); + // } + @Override public void deleteWarning(String id) { // 校验存在