|
@@ -210,11 +210,23 @@ public class VirtualParkingSlotServiceImpl extends ServiceImpl<VirtualParkingSlo
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public void updateSlotType(List<VirtualParkingSlot> list,Contract contract){
|
|
|
+ public void updateSlotType(List<VirtualParkingSlot> virtualParkingSlots,Contract contract){
|
|
|
+ Integer samllOccupy = 0;
|
|
|
+ List<VirtualParkingSlot> list = new ArrayList<>();
|
|
|
+ for (VirtualParkingSlot virtualParkingSlot : virtualParkingSlots) {
|
|
|
+ if(StrUtil.equals(virtualParkingSlot.getStatus(),"0")){
|
|
|
+ list.add(virtualParkingSlot);
|
|
|
+ }else if(StrUtil.equals(virtualParkingSlot.getStatus(),"1") && StrUtil.equals(virtualParkingSlot.getSlotType(),"small")){
|
|
|
+ samllOccupy = samllOccupy + 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ log.info("小型车占用数:{},总车位数:{}",samllOccupy,list.size());
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
// 更新非停用得
|
|
|
if(!StrUtil.equals(list.get(i).getStatus(),"2")){
|
|
|
- if(i < contract.getMaxParkingLotNum() - contract.getSmallParkingLotNum()){
|
|
|
+ // 大型车位数 = 所有虚拟车位 + 小型车已占用的车位数 - 小型车位
|
|
|
+ // if(i < (contract.getMaxParkingLotNum() + samllOccupy - contract.getSmallParkingLotNum())){
|
|
|
+ if(i < (list.size() + samllOccupy - contract.getSmallParkingLotNum())){
|
|
|
list.get(i).setSlotType("large");
|
|
|
}else{
|
|
|
list.get(i).setSlotType("small");
|