完成调度完善

This commit is contained in:
attiya 2025-12-23 15:33:09 +08:00
parent 58eaf37bf6
commit b62dba7be0

View File

@ -105,6 +105,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
@Resource @Resource
private EbikeOrderPartMapper ebikeOrderPartMapper; private EbikeOrderPartMapper ebikeOrderPartMapper;
@Resource
private EbikeDispatchConfigurationMapper ebikeDispatchConfigurationMapper;
@Override @Override
public void createBatterySwapOrder(String ecuSn) { public void createBatterySwapOrder(String ecuSn) {
QueryWrapper queryWrapper = QueryWrapper.create() QueryWrapper queryWrapper = QueryWrapper.create()
@ -568,7 +571,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.DISPATCH)); .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.DISPATCH));
EbikeBikeOrder bikeOrder = getOne(queryWrapper); EbikeBikeOrder bikeOrder = getOne(queryWrapper);
if (bikeOrder == null) { if (bikeOrder == null) {
throw new EbikeException("该工单不存在或已作废"); throw new EbikeException("该工单不存在或已完成、已作废");
} }
Long receiverId = bikeOrder.getReceiverId(); Long receiverId = bikeOrder.getReceiverId();
long loginId = StpUtil.getLoginIdAsLong(); long loginId = StpUtil.getLoginIdAsLong();
@ -581,6 +584,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
} }
bikeOrder.setSiteId(doneDispatchOrderVo.getSiteId()); bikeOrder.setSiteId(doneDispatchOrderVo.getSiteId());
bikeOrder.setHandleState(OrderHandleState.PROCESSED); bikeOrder.setHandleState(OrderHandleState.PROCESSED);
bikeOrder.setRemarks(doneDispatchOrderVo.getRemarks());
List<String> fileUrls = doneDispatchOrderVo.getFileUrls(); List<String> fileUrls = doneDispatchOrderVo.getFileUrls();
List<EbikeOrderFile> list = new ArrayList<>(); List<EbikeOrderFile> list = new ArrayList<>();
@ -600,7 +604,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
//TODO:车辆状态 //TODO:车辆状态
bikeOrder.setHandleAt(LocalDateTime.now()); bikeOrder.setHandleAt(LocalDateTime.now());
updateById(bikeOrder); updateById(bikeOrder);
redisUtil.saveDispatchOrder(bikeOrder.getOrderId(),bikeOrder,5L, TimeUnit.SECONDS); queryWrapper.clear();
EbikeDispatchConfiguration dispatchConfiguration = ebikeDispatchConfigurationMapper.selectOneByQuery(queryWrapper);
redisUtil.saveDispatchOrder(bikeOrder.getOrderId(),bikeOrder,dispatchConfiguration!=null?dispatchConfiguration.getDispatchDuration():24L, TimeUnit.SECONDS);
} }
@Override @Override