|
@@ -76,13 +76,13 @@ public class WorkerController {
|
|
|
@ApiOperation(value = "运单详情", notes = "必传参数:订单id")
|
|
@ApiOperation(value = "运单详情", notes = "必传参数:订单id")
|
|
|
@PostMapping("/find_order_info")
|
|
@PostMapping("/find_order_info")
|
|
|
public Result<WorkOrderVO> findOrderInfo(@RequestHeader(value = "orgId") Long orgId,
|
|
public Result<WorkOrderVO> findOrderInfo(@RequestHeader(value = "orgId") Long orgId,
|
|
|
- @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
|
|
|
|
|
- log.info("运单详情,/tms/worker/find_order_info,参数:{}", JSON.toJSONString(workOrder));
|
|
|
|
|
- if (workOrder == null || workOrder.getId() == null) {
|
|
|
|
|
|
|
+ @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrderParam) {
|
|
|
|
|
+ log.info("运单详情,/tms/worker/find_order_info,参数:{}", JSON.toJSONString(workOrderParam));
|
|
|
|
|
+ if (workOrderParam == null || workOrderParam.getId() == null) {
|
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
return new Result(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
|
|
|
}
|
|
}
|
|
|
WorkOrderVO vo = new WorkOrderVO();
|
|
WorkOrderVO vo = new WorkOrderVO();
|
|
|
- WorkOrder workOrder1 = workOrderService.getById(workOrder.getId());
|
|
|
|
|
|
|
+ WorkOrder workOrder1 = workOrderService.getById(workOrderParam.getId());
|
|
|
if (workOrder1 != null) {
|
|
if (workOrder1 != null) {
|
|
|
BeanUtils.copyProperties(workOrder1, vo);
|
|
BeanUtils.copyProperties(workOrder1, vo);
|
|
|
|
|
|
|
@@ -93,7 +93,7 @@ public class WorkerController {
|
|
|
vo.setLatitude(locationVO.getLatitude());
|
|
vo.setLatitude(locationVO.getLatitude());
|
|
|
vo.setLongitude(locationVO.getLongitude());
|
|
vo.setLongitude(locationVO.getLongitude());
|
|
|
}
|
|
}
|
|
|
- List<String> routeGps = commonService.getLocationtrip(workOrder.getTruckId(), workOrder.getGotoSpotTime(), LocalDateTime.now());
|
|
|
|
|
|
|
+ List<String> routeGps = commonService.getLocationtrip(workOrderParam.getTruckId(), workOrder1.getGotoSpotTime(), LocalDateTime.now());
|
|
|
vo.setRouteGps(routeGps);
|
|
vo.setRouteGps(routeGps);
|
|
|
}
|
|
}
|
|
|
|
|
|