|
@@ -9,12 +9,11 @@ import com.sckw.core.exception.BusinessException;
|
|
|
import com.sckw.core.model.constant.UrlConstants;
|
|
import com.sckw.core.model.constant.UrlConstants;
|
|
|
import com.sckw.core.model.enums.AddressTypeEnum;
|
|
import com.sckw.core.model.enums.AddressTypeEnum;
|
|
|
import com.sckw.core.model.enums.CarWaybillEnum;
|
|
import com.sckw.core.model.enums.CarWaybillEnum;
|
|
|
-import com.sckw.core.model.page.PageResult;
|
|
|
|
|
|
|
|
|
|
-import com.sckw.core.reponse.CollectZjxlResponse;
|
|
|
|
|
-import com.sckw.core.service.VehicleCollectService;
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
import com.sckw.core.web.response.result.PageDataResult;
|
|
import com.sckw.core.web.response.result.PageDataResult;
|
|
|
-import com.sckw.fleet.api.model.vo.RDriverDetailVo;
|
|
|
|
|
|
|
+
|
|
|
import com.sckw.fleet.api.model.vo.RDriverVo;
|
|
import com.sckw.fleet.api.model.vo.RDriverVo;
|
|
|
import com.sckw.fleet.api.model.vo.RFleetDriverVo;
|
|
import com.sckw.fleet.api.model.vo.RFleetDriverVo;
|
|
|
import com.sckw.transport.common.config.UrlConfigProperties;
|
|
import com.sckw.transport.common.config.UrlConfigProperties;
|
|
@@ -47,6 +46,8 @@ import com.sckw.transport.model.vo.TruckInfoVo;
|
|
|
import com.sckw.transport.repository.KwtWaybillOrderAddressRepository;
|
|
import com.sckw.transport.repository.KwtWaybillOrderAddressRepository;
|
|
|
import com.sckw.transport.repository.KwtWaybillOrderRepository;
|
|
import com.sckw.transport.repository.KwtWaybillOrderRepository;
|
|
|
import com.sckw.transport.repository.KwtWaybillOrderSubtaskRepository;
|
|
import com.sckw.transport.repository.KwtWaybillOrderSubtaskRepository;
|
|
|
|
|
+import com.sckw.transport.response.CollectZjxlResponse;
|
|
|
|
|
+import com.sckw.transport.service.zj.VehicleCollectService;
|
|
|
import jakarta.annotation.Resource;
|
|
import jakarta.annotation.Resource;
|
|
|
import jakarta.validation.Valid;
|
|
import jakarta.validation.Valid;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
@@ -226,10 +227,12 @@ public class kwfTruckTraceService {
|
|
|
TruckInfoVo instance = TruckInfoVo.getInstance();
|
|
TruckInfoVo instance = TruckInfoVo.getInstance();
|
|
|
instance.setWOrderNo(wOrderNo);
|
|
instance.setWOrderNo(wOrderNo);
|
|
|
instance.setTruckNo(truckNo);
|
|
instance.setTruckNo(truckNo);
|
|
|
- instance.setGpsStatus(collectZjxlResponse.getResult().getFirstVcl().getSpd());
|
|
|
|
|
- instance.setLongitude(collectZjxlResponse.getResult().getFirstVcl().getLon());
|
|
|
|
|
- instance.setLatitude(collectZjxlResponse.getResult().getFirstVcl().getLat());
|
|
|
|
|
- instance.setLocationTime(collectZjxlResponse.getResult().getFirstVcl().getOfflineTime());
|
|
|
|
|
|
|
+ if (Objects.nonNull(collectZjxlResponse) && Objects.nonNull(collectZjxlResponse.getResult()) && Objects.nonNull(collectZjxlResponse.getResult().getFirstVcl())){
|
|
|
|
|
+ instance.setGpsStatus(collectZjxlResponse.getResult().getFirstVcl().getSpd());
|
|
|
|
|
+ instance.setLongitude(collectZjxlResponse.getResult().getFirstVcl().getLon());
|
|
|
|
|
+ instance.setLatitude(collectZjxlResponse.getResult().getFirstVcl().getLat());
|
|
|
|
|
+ instance.setLocationTime(collectZjxlResponse.getResult().getFirstVcl().getOfflineTime());
|
|
|
|
|
+ }
|
|
|
//查询关联订单号
|
|
//查询关联订单号
|
|
|
KwtWaybillOrder oneByTruckNo = kwtWaybillOrderRepository.findOneByTruckNo(truckNo);
|
|
KwtWaybillOrder oneByTruckNo = kwtWaybillOrderRepository.findOneByTruckNo(truckNo);
|
|
|
|
|
|