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

获取用户信息后台直接取

Browse Source
This commit is contained in:
小朱 2025-04-30 15:40:33 +08:00
parent 8d369d9965
commit 1abef6f0bc
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/model/dto/request/ReqWorkOrderDispatchDto.java
View File

@ -25,5 +25,5 @@ public class ReqWorkOrderDispatchDto {
/**
* 调度工单类型
*/
private String DispatchType;
private String dispatchType;
}

17
ebike-maintenance/src/main/java/com/cdzy/ebikemaintenance/service/impl/EbikeBikeInfoServiceImpl.java
View File

@ -620,6 +620,15 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
if (faultIds == null || bikeCode.isEmpty()) {
return "";
}
String tokenValue = StpUtil.getTokenValue();
JsonResult<StaffFeign> result = staffFeignClient.getInfoByToken(tokenValue);
if (result.getCode() != Code.SUCCESS) {
throw new RuntimeException("获取用户信息失败");
}
StaffFeign staffFeign = result.getData();
// 获取当前操作用户
String userId = staffFeign.getStaffId().toString();
//生成工单编号
SnowFlakeIDKeyGenerator snowFlakeIDKeyGenerator = new SnowFlakeIDKeyGenerator();
long dataCenterId = snowFlakeIDKeyGenerator.nextId();
@ -631,7 +640,7 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
ebikeBikeOrder.setBikeId(ebikeBikeInfo.getBikeId());
ebikeBikeOrder.setOrderCode(dataCenterId);
ebikeBikeOrder.setOrderType("1");
ebikeBikeOrder.setReceiverId(reqEbikeBikeOrderDto.getReceiverId());
ebikeBikeOrder.setReceiverId(userId);
ebikeBikeOrderMapper.insert(ebikeBikeOrder);
query.clear();
query.in(EBIKE_BIKE_FAULT_REPORT.FAULT_REPORT_ID.getName(), Arrays.stream(faultIds).toList());
@ -1189,7 +1198,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
ebikeScheduleWorkOrderExtension.setId(ebikeBikeOrder.getOrderId());
ebikeScheduleWorkOrderExtension.setDispatchType(eqWorkOrderDispatchDto.getDispatchType());
ebikeScheduleWorkOrderExtension.setSiteId(eqWorkOrderDispatchDto.getSiteId());//站点id
ebikeScheduleWorkOrderExtension.setDispatchType(eqWorkOrderDispatchDto.getDispatchType());
ebikeScheduleWorkOrderExtensionMapper.insert(ebikeScheduleWorkOrderExtension);
// 创建并保存调度记录
List<EbikeDispatchRecords> records = new ArrayList<>();
@ -1365,7 +1373,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
* @return
*/
public JsonResult<?> completeDeployment(Map<String,Object> param) {
String orderId = MapUtil.getStr(param, "orderId");
List<Map<String,Object>> fileLists = (List<Map<String,Object>>) param.get("fileLists");
//设置一个关联ID
@ -1375,7 +1382,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
ebikeScheduleWorkOrderExtension.setAfterDispatchPhoto(after_dispatch_photo);
ebikeScheduleWorkOrderExtension.setId(orderId);
ebikeScheduleWorkOrderExtensionMapper.update(ebikeScheduleWorkOrderExtension);
for (Map<String,Object> fileList : fileLists) {
EbikeVehicleDispatchFile ebikeVehicleDispatchFile = new EbikeVehicleDispatchFile();
ebikeVehicleDispatchFile.setFileName(fileList.get("fileName") != null ? fileList.get("fileName").toString() : "");
@ -1389,14 +1395,12 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
ebikeVehicleDispatchFileMapper.insert(ebikeVehicleDispatchFile);
}
}
//根据orderId 完成订单
EbikeBikeOrder ebikeBikeOrder = new EbikeBikeOrder();
ebikeBikeOrder.setOrderId(orderId);
ebikeBikeOrder.setHandleState("1");
ebikeBikeOrder.setUpdatedAt(LocalDateTime.now());
ebikeBikeOrderMapper.update(ebikeBikeOrder);
//根据订单ID 查出需要投放的车辆 进行修改状态
QueryWrapper query = QueryWrapper.create();
query.eq("order_id",orderId);
@ -1409,7 +1413,6 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
reqVehicleStatusUpdateDto.setState("2");
updateVehicleStatus(reqVehicleStatusUpdateDto);
}
return JsonResult.success("投放成功");
}
}