diff --git a/src/main/java/org/springblade/modules/business/controller/CarAdminController.java b/src/main/java/org/springblade/modules/business/controller/CarAdminController.java index 9930171..cadc845 100644 --- a/src/main/java/org/springblade/modules/business/controller/CarAdminController.java +++ b/src/main/java/org/springblade/modules/business/controller/CarAdminController.java @@ -71,6 +71,7 @@ public class CarAdminController extends BladeController { BeanUtils.copyProperties(carAdminVo, carAdmin); if (carAdmin.getId() == null) { // 新增车辆信息 + carAdmin.setAmount((long) carAdminVo.getCarLiveChannelVoList().size()); carService.save(carAdmin); // 获取新增车辆信息的id Long carId = carAdmin.getId(); @@ -82,9 +83,9 @@ public class CarAdminController extends BladeController { carLiveChannelVo.setCarId(carId); CarLiveChannel carLiveChannel = new CarLiveChannel(); BeanUtils.copyProperties(carLiveChannelVo, carLiveChannel); - if (carLiveChannelVo.getStatus() == 1) { + if (carLiveChannelVo.getStatus().equals(CarChannelEnum.DEFAULT.getName())) { if (hasDefault) { - carLiveChannelVo.setStatus(2); // 如果已经存在默认通道,则将当前通道设置为非默认通道 + carLiveChannelVo.setStatus(CarChannelEnum.NO_DEFAULT.getName()); // 如果已经存在默认通道,则将当前通道设置为非默认通道 } else { hasDefault = true; } @@ -93,13 +94,11 @@ public class CarAdminController extends BladeController { } } } else { - // 1. 修改车辆信息 - carService.updateById(carAdmin); - // 2. 根据车辆id删除原有通道 + // 1. 根据车辆id删除原有通道 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("car_id",carAdmin.getId()); carLiveChannelService.remove(queryWrapper); - // 3. 遍历直播通道列表,设置外键为新增车辆信息的id,然后新增直播通道 + // 2. 遍历直播通道列表,设置外键为新增车辆信息的id,然后新增直播通道 Long carId = carAdmin.getId(); List carLiveChannelVoList = carAdminVo.getCarLiveChannelVoList(); if (CollectionUtils.isNotEmpty(carLiveChannelVoList)) { @@ -115,6 +114,9 @@ public class CarAdminController extends BladeController { hasDefault = true; } } + //3. 设置修改直播数量 + carAdmin.setAmount((long)carLiveChannelVoList.size()); + carService.updateById(carAdmin); carLiveChannelService.save(carLiveChannel); } }