attiya/ebike-plus
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: attiya:d94dfa14a9c6559f235fd27319954b8216795c757d8bc9c30c16682f938d0200
Branches Tags
attiya:main
attiya:dev
..
compare: attiya:1a08cca193f17ea0d6ab28fc842cc70a9b1bf305d6422bae0e18bfdb3a8e5127
Branches Tags
attiya:main
attiya:dev

No commits in common. "d94dfa14a9c6559f235fd27319954b8216795c757d8bc9c30c16682f938d0200" and "1a08cca193f17ea0d6ab28fc842cc70a9b1bf305d6422bae0e18bfdb3a8e5127" have entirely different histories.
d94dfa14a9 ... 1a08cca193

3 changed files with 3 additions and 35 deletions
Show Stats Expand all files Collapse all files

8
ebike-operations/src/main/java/com/cdzy/operations/component/SafeOrderExpirationListener.java
View File

@ -234,11 +234,9 @@ public class SafeOrderExpirationListener {
*/
private void processCreateInspectionOrderBusiness(String bikeCode) {
try {
//生成巡检工单
orderService.createInspectionOrderByBikeCode(bikeCode);
//重新添加Key，实现循环定期巡检
log.info("重新添加定期巡检任务: bikeCode={}",bikeCode );
redisUtil.saveInspectionOrder(bikeCode,null,30L,TimeUnit.DAYS);
//TODO: 生成巡检工单
// orderService.createInspectionSwapOrder(bikeCode);
System.out.println("生成巡检工单");
} catch (Exception e) {
log.error("生成巡检工单业务异常: orderId={}", bikeCode, e);
throw e;

6
ebike-operations/src/main/java/com/cdzy/operations/service/EbikeBikeOrderService.java
View File

@ -171,10 +171,4 @@ public interface EbikeBikeOrderService extends IService<EbikeBikeOrder> {
* @param dispatchVo 调度信息
*/
void batchFinishDispatch(EbikeBatchDispatchVo dispatchVo);
/**
* 根据车辆编号生成巡检工单
* @param bikeCode 车辆编号
*/
void createInspectionOrderByBikeCode(String bikeCode);
}

24
ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
View File

@ -1035,30 +1035,6 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
}
}
@Override
public void createInspectionOrderByBikeCode(String bikeCode) {
EbikeBikeInfo bikeInfo = checkBikeCode(bikeCode);
QueryWrapper queryWrapper = QueryWrapper.create()
.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeInfo.getBikeCode()))
.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.INSPECTION))
.where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)));
EbikeBikeOrder bikeOrder = this.mapper.selectOneByQuery(queryWrapper);
if (bikeOrder != null) {
log.error("车辆已存在巡检工单 ,bikeCode={} ", bikeInfo.getBikeCode());
return;
}
EbikeBikeOrder ebikeBikeOrder = EbikeBikeOrder.builder()
.bikeCode(bikeInfo.getBikeCode())
.orderCode(snowFlakeIDKeyGenerator.nextId())
.orderType(BikeOrderType.INSPECTION)
.operatorId(bikeInfo.getOperatorId())
.remarks("定期巡检任务")
.handleState(OrderHandleState.UNPROCESSED)
.isUserReporting(Boolean.FALSE)
.build();
this.mapper.insert(ebikeBikeOrder);
}
EbikeBikeInfo checkBikeCode(String bikeCode) {
QueryWrapper queryWrapper = QueryWrapper.create()
.where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode))