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-01-27 16:54:11 +08:00
parent d01b043e25
commit d74ae44913
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanInfoDto.java
View File

@ -67,6 +67,16 @@ public class EbikeScanInfoDto implements Serializable {
*/ */
private Long ecuId; private Long ecuId;
/**
* 中控SN
*/
private String ecuSn;
/**
* 电量百分比
*/
private Integer soc;
/** /**
* 头盔ID * 头盔ID
*/ */

18
ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
View File

@ -577,10 +577,24 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
@Override @Override
public EbikeScanInfoDto scanInfo(String bikeCode) { public EbikeScanInfoDto scanInfo(String bikeCode) {
QueryWrapper queryWrapper = QueryWrapper.create() QueryWrapper queryWrapper = QueryWrapper.create()
.select(EBIKE_BIKE_INFO.ALL_COLUMNS, EBIKE_REGION.REGION_NAME) .select(EBIKE_BIKE_INFO.ALL_COLUMNS, EBIKE_REGION.REGION_NAME, EBIKE_ECU_INFO.ECU_SN)
.leftJoin(EBIKE_REGION).on(EBIKE_REGION.REGION_ID.eq(EBIKE_BIKE_INFO.REGION_ID)) .leftJoin(EBIKE_REGION).on(EBIKE_REGION.REGION_ID.eq(EBIKE_BIKE_INFO.REGION_ID))
.leftJoin(EBIKE_ECU_INFO).on(EBIKE_ECU_INFO.ECU_ID.eq(EBIKE_BIKE_INFO.ECU_ID))
.where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode)); .where(EBIKE_BIKE_INFO.BIKE_CODE.eq(bikeCode));
EbikeScanInfoDto ebikeScanInfoDto = this.mapper.selectOneByQueryAs(queryWrapper, EbikeScanInfoDto.class); EbikeScanInfoDto ebikeScanInfoDto = this.mapper.selectOneByQueryAs(queryWrapper, EbikeScanInfoDto.class);
int soc = 0;
if (ebikeScanInfoDto != null) {
String ecuSn = ebikeScanInfoDto.getEcuSn();
if (ecuSn != null) {
ResGPSDto resGPSDto = (ResGPSDto) redisUtil.getEcu(ecuSn);
if (resGPSDto != null) {
soc = resGPSDto.getSoc();
}
}
} else {
throw new EbikeException("车辆编号错误");
}
ebikeScanInfoDto.setSoc(soc);
queryWrapper.clear(); queryWrapper.clear();
queryWrapper.select( queryWrapper.select(
EBIKE_BIKE_ORDER.ORDER_ID, EBIKE_BIKE_ORDER.ORDER_ID,
@ -598,7 +612,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
for (EbikeScanOrderDto order : list) { for (EbikeScanOrderDto order : list) {
if (order.getReceiverId() != null) { if (order.getReceiverId() != null) {
order.setAccepted(Boolean.TRUE); order.setAccepted(Boolean.TRUE);
if (order.getReceiverId() == staffId){ if (order.getReceiverId() == staffId) {
order.setAcceptSelf(Boolean.TRUE); order.setAcceptSelf(Boolean.TRUE);
} }
} }