Merge pull request 'sjy' (#16) from sjy into master
All checks were successful
continuous-integration/drone Build is passing
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #16
This commit is contained in:
commit
547ebae6e9
@ -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<EntryRecord> 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<AppearanceRecord> appearanceRecords = appearanceRecordRepository.findByCreateTimeBetween(startOfDay, endOfDay);
|
||||
parkingLotDataVO.setOutNum(appearanceRecords.size());//车辆出入数
|
||||
|
||||
|
@ -32,6 +32,12 @@ public class ParkingLotDataVO {
|
||||
//总利用率
|
||||
private Double useRatio;
|
||||
|
||||
//临时车数量
|
||||
private int temporaryCar;
|
||||
|
||||
//固定车数量
|
||||
private int fixationCar;
|
||||
|
||||
//区域停车场数据集合
|
||||
private List<AreaDataVO> areaDataVOList = new ArrayList<>();
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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) {
|
||||
// 校验存在
|
||||
|
Loading…
Reference in New Issue
Block a user