|
|
@@ -75,7 +75,6 @@ public class kwfTruckTraceService {
|
|
|
private final KwtWaybillOrderSubtaskRepository kwtWaybillOrderSubtaskRepository;
|
|
|
private final VehicleCollectService vehicleCollectService;
|
|
|
private final KwtLogisticsOrderUnitRepository kwtLogisticsOrderUnitRepository;
|
|
|
- private final kwfTruckTraceService kwfTruckTraceService;
|
|
|
@DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
|
|
|
RemoteSystemService remoteSystemService;
|
|
|
|
|
|
@@ -436,7 +435,7 @@ public class kwfTruckTraceService {
|
|
|
return JSON.parseObject(data, VehicleReturnData.class);
|
|
|
}
|
|
|
|
|
|
- private CurrentTaskTraceReqVo.CurrentTaskTrace getCurrentTaskTrace(VehicleReturnData e) {
|
|
|
+ private static CurrentTaskTraceReqVo.CurrentTaskTrace getCurrentTaskTrace(VehicleReturnData e) {
|
|
|
CurrentTaskTraceReqVo.CurrentTaskTrace currentTaskTrace = new CurrentTaskTraceReqVo.CurrentTaskTrace();
|
|
|
currentTaskTrace.setLongitude(e.getLongitude());
|
|
|
currentTaskTrace.setLatitude(e.getLatitude());
|
|
|
@@ -539,7 +538,7 @@ public class kwfTruckTraceService {
|
|
|
truckDto.setLocationTime(DateUtils.format(LocalDateTime.now(), DateUtils.DATE_TIME_PATTERN));
|
|
|
truckDto.setLOrderNo(req.getLOrderNo());
|
|
|
KwtWaybillOrderSubtask subtask = kwtWaybillOrderSubtaskRepository.findOneByWOrderNo(wOrderNo);
|
|
|
- String taskAddress = kwfTruckTraceService.getTaskAddress(subtask);
|
|
|
+ String taskAddress = getTaskAddress(subtask);
|
|
|
truckDto.setTaskAddress(taskAddress);
|
|
|
return truckDto;
|
|
|
}
|