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

分页查询

Browse Source
This commit is contained in:
PC 2026-02-10 10:15:16 +08:00
parent 3559b0200a
commit 18a6405e58
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
private EbikeDispatchConfigurationMapper ebikeDispatchConfigurationMapper; private EbikeDispatchConfigurationMapper ebikeDispatchConfigurationMapper;
@Override @Override
public void createBatterySwapOrder(String ecuSn,Boolean acceptOrder) { public void createBatterySwapOrder(String ecuSn, Boolean acceptOrder) {
QueryWrapper queryWrapper = QueryWrapper.create() QueryWrapper queryWrapper = QueryWrapper.create()
.select(EBIKE_BIKE_INFO.ALL_COLUMNS) .select(EBIKE_BIKE_INFO.ALL_COLUMNS)
.where(EBIKE_ECU_INFO.ECU_SN.eq(ecuSn)) .where(EBIKE_ECU_INFO.ECU_SN.eq(ecuSn))
@ -134,7 +134,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
.operatorId(bikeInfo.getOperatorId()) .operatorId(bikeInfo.getOperatorId())
.handleState(OrderHandleState.UNPROCESSED) .handleState(OrderHandleState.UNPROCESSED)
.build(); .build();
if (acceptOrder){ if (acceptOrder) {
ebikeBikeOrder.setReceiverId(StpUtil.getLoginIdAsLong()); ebikeBikeOrder.setReceiverId(StpUtil.getLoginIdAsLong());
ebikeBikeOrder.setHandleState(OrderHandleState.ACCEPTED); ebikeBikeOrder.setHandleState(OrderHandleState.ACCEPTED);
} }
@ -163,9 +163,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
.remarks(inspectionSwapOrderVo.getRemarks()) .remarks(inspectionSwapOrderVo.getRemarks())
.handleState(OrderHandleState.UNPROCESSED) .handleState(OrderHandleState.UNPROCESSED)
.build(); .build();
if (inspectionSwapOrderVo.getIsUserReporting()!=null && inspectionSwapOrderVo.getIsUserReporting()){ if (inspectionSwapOrderVo.getIsUserReporting() != null && inspectionSwapOrderVo.getIsUserReporting()) {
ebikeBikeOrder.setIsUserReporting(Boolean.TRUE); ebikeBikeOrder.setIsUserReporting(Boolean.TRUE);
}else { } else {
ebikeBikeOrder.setIsUserReporting(Boolean.FALSE); ebikeBikeOrder.setIsUserReporting(Boolean.FALSE);
} }
this.mapper.insert(ebikeBikeOrder); this.mapper.insert(ebikeBikeOrder);
@ -203,7 +203,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeInfo.getBikeCode())) .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeInfo.getBikeCode()))
.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.DISPATCH)) .where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(BikeOrderType.DISPATCH))
.where(EBIKE_BIKE_ORDER.DISPATCH_STATE.eq(OrderDispatchState.PROCESSED)); .where(EBIKE_BIKE_ORDER.DISPATCH_STATE.eq(OrderDispatchState.PROCESSED));
EbikeBikeOrder order = this.mapper.selectOneByQuery( queryWrapper); EbikeBikeOrder order = this.mapper.selectOneByQuery(queryWrapper);
if (order != null) { if (order != null) {
log.error("车辆存在已完成但暂未生效的调度工单,bikeCode={} ", bikeInfo.getBikeCode()); log.error("车辆存在已完成但暂未生效的调度工单,bikeCode={} ", bikeInfo.getBikeCode());
throw new EbikeException("车辆短时间内不能多次调度"); throw new EbikeException("车辆短时间内不能多次调度");
@ -368,9 +368,9 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
if (record == null) { if (record == null) {
throw new EbikeException("请领取电池后再尝试归还"); throw new EbikeException("请领取电池后再尝试归还");
} }
if (batteryClaimVo.getCodes().size()!=record.getBorrowNum()){ if (batteryClaimVo.getCodes().size() != record.getBorrowNum()) {
throw new EbikeException("归还数量与领取数量不一致"); throw new EbikeException("归还数量与领取数量不一致");
} }
record.setIsReturn(Boolean.TRUE); record.setIsReturn(Boolean.TRUE);
batteryRecordMapper.update(record); batteryRecordMapper.update(record);
List<String> codes = batteryClaimVo.getCodes(); List<String> codes = batteryClaimVo.getCodes();
@ -419,7 +419,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
} }
if (bikeOrder.getReceiverId() != StpUtil.getLoginIdAsLong()) { if (bikeOrder.getReceiverId() != StpUtil.getLoginIdAsLong()) {
if (bikeOrder.getReceiverId() != null) { if (bikeOrder.getReceiverId() != null) {
throw new EbikeException("其他用户已接单为该车辆换电") ; throw new EbikeException("其他用户已接单为该车辆换电");
} else { } else {
//无人接单则自动接单 //无人接单则自动接单
bikeOrder.setReceiverId(StpUtil.getLoginIdAsLong()); bikeOrder.setReceiverId(StpUtil.getLoginIdAsLong());
@ -438,7 +438,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
.leftJoin(EBIKE_BATTERY_INFO).on(EBIKE_BATTERY_INFO.BATTERY_ID.eq(EBIKE_BIKE_INFO.BATTERY_ID)) .leftJoin(EBIKE_BATTERY_INFO).on(EBIKE_BATTERY_INFO.BATTERY_ID.eq(EBIKE_BIKE_INFO.BATTERY_ID))
.where(EBIKE_BATTERY_INFO.BATTERY_CODE.eq(batteryCode)); .where(EBIKE_BATTERY_INFO.BATTERY_CODE.eq(batteryCode));
EbikeBikeInfo ebikeBikeInfo = bikeInfoMapper.selectOneByQuery(queryWrapper); EbikeBikeInfo ebikeBikeInfo = bikeInfoMapper.selectOneByQuery(queryWrapper);
if (ebikeBikeInfo != null){ if (ebikeBikeInfo != null) {
throw new EbikeException("该电池编号已绑定其他车辆"); throw new EbikeException("该电池编号已绑定其他车辆");
} }
@ -459,7 +459,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
.leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID)) .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID))
.where(EBIKE_ECU_INFO.ECU_SN.eq(batteryCode)); .where(EBIKE_ECU_INFO.ECU_SN.eq(batteryCode));
EbikeBikeInfo ebikeBikeInfo = bikeInfoMapper.selectOneByQuery(queryWrapper); EbikeBikeInfo ebikeBikeInfo = bikeInfoMapper.selectOneByQuery(queryWrapper);
if (ebikeBikeInfo != null){ if (ebikeBikeInfo != null) {
throw new EbikeException("该中控编号已绑定其他车辆"); throw new EbikeException("该中控编号已绑定其他车辆");
} }
@ -530,7 +530,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
} }
@Override @Override
public List<EbikeOrderBikeListDto> bikeList(Long regionId,String bikeCode,Integer bikeStatus,Boolean acceptOrder,Integer orderType) throws IOException { public List<EbikeOrderBikeListDto> bikeList(Long regionId, String bikeCode, Integer bikeStatus, Boolean acceptOrder, Integer orderType) throws IOException {
QueryWrapper queryWrapper = QueryWrapper.create() QueryWrapper queryWrapper = QueryWrapper.create()
.select( .select(
@ -622,12 +622,10 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
.where(EBIKE_BIKE_INFO.STATUS.eq(BikeStatus.LAUNCH)) .where(EBIKE_BIKE_INFO.STATUS.eq(BikeStatus.LAUNCH))
.where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode, StringUtil.hasText(bikeCode))) .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode, StringUtil.hasText(bikeCode)))
.where(EBIKE_BIKE_INFO.USAGE_STATUS.eq(bikeStatus, Objects.nonNull(bikeStatus))) .where(EBIKE_BIKE_INFO.USAGE_STATUS.eq(bikeStatus, Objects.nonNull(bikeStatus)))
.leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID)) .leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID));
.leftJoin(EBIKE_BIKE_ORDER).on(EBIKE_BIKE_ORDER.BIKE_CODE.eq(EBIKE_BIKE_INFO.BIKE_CODE)) if (acceptOrder != null && acceptOrder) {
.where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)));
if (acceptOrder!=null && acceptOrder){
queryWrapper.where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(StpUtil.getLoginIdAsLong())); queryWrapper.where(EBIKE_BIKE_ORDER.RECEIVER_ID.eq(StpUtil.getLoginIdAsLong()));
} else if (orderType!=null) { } else if (orderType != null) {
queryWrapper.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType)); queryWrapper.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType));
} }
List<EbikeOrderBikeListDto> list = bikeInfoMapper.selectListByQueryAs(queryWrapper, EbikeOrderBikeListDto.class); List<EbikeOrderBikeListDto> list = bikeInfoMapper.selectListByQueryAs(queryWrapper, EbikeOrderBikeListDto.class);
@ -793,7 +791,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
if (point != null) { if (point != null) {
String loginId = StpUtil.getLoginIdAsString(); String loginId = StpUtil.getLoginIdAsString();
CommonStaffInfo staffInfo = (CommonStaffInfo) StpUtil.getSession().get(loginId); CommonStaffInfo staffInfo = (CommonStaffInfo) StpUtil.getSession().get(loginId);
return regionMapper.findAllRegionsOrderByDistance(point,staffInfo.getOperatorId()); return regionMapper.findAllRegionsOrderByDistance(point, staffInfo.getOperatorId());
} else { } else {
return regionMapper.selectAll(); return regionMapper.selectAll();
} }