修改车辆轨迹查询

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/kwfTruckTraceService.java

@@ -52,7 +52,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -76,6 +75,7 @@ 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;
 
@@ -263,8 +263,8 @@ public class kwfTruckTraceService {
         RedissonUtils.putString(CommonConstants.TRUCK_LOCATION + truckId +CommonConstants.UNDERSCORE+ wOrderNo, JSON.toJSONString(truckDto),10,TimeUnit.DAYS);
     }
 
-    @NotNull
-    private String getTaskAddress(KwtWaybillOrderSubtask subtask) {
+
+    public String getTaskAddress(KwtWaybillOrderSubtask subtask) {
         String startPoint = "";
         String endPoint = "";
         if (Objects.nonNull(subtask)){
@@ -436,7 +436,7 @@ public class kwfTruckTraceService {
         return JSON.parseObject(data, VehicleReturnData.class);
     }
 
-    private static CurrentTaskTraceReqVo.CurrentTaskTrace getCurrentTaskTrace(VehicleReturnData e) {
+    private  CurrentTaskTraceReqVo.CurrentTaskTrace getCurrentTaskTrace(VehicleReturnData e) {
         CurrentTaskTraceReqVo.CurrentTaskTrace currentTaskTrace = new CurrentTaskTraceReqVo.CurrentTaskTrace();
         currentTaskTrace.setLongitude(e.getLongitude());
         currentTaskTrace.setLatitude(e.getLatitude());
@@ -539,22 +539,8 @@ public class kwfTruckTraceService {
         truckDto.setLocationTime(DateUtils.format(LocalDateTime.now(), DateUtils.DATE_TIME_PATTERN));
         truckDto.setLOrderNo(req.getLOrderNo());
         KwtWaybillOrderSubtask subtask = kwtWaybillOrderSubtaskRepository.findOneByWOrderNo(wOrderNo);
-        String startPoint = "";
-        String endPoint = "";
-        if (Objects.nonNull(subtask)){
-            List<KwtWaybillOrderAddress> kwtWaybillOrderAddresses = kwtWaybillOrderAddressRepository.queryByWOrderId(subtask.getWOrderId());
-            if (CollectionUtils.isNotEmpty(kwtWaybillOrderAddresses)){
-                for (KwtWaybillOrderAddress e : kwtWaybillOrderAddresses) {
-                    if (Objects.equals(e.getAddressType(), AddressTypeEnum.SHIPMENT.getCode())) {
-                        startPoint = e.getDetailAddress();
-                    }
-                    if (Objects.equals(e.getAddressType(), AddressTypeEnum.TAKE.getCode())) {
-                        endPoint = e.getDetailAddress();
-                    }
-                }
-            }
-        }
-        truckDto.setTaskAddress(startPoint+"-"+endPoint);
+        String taskAddress = kwfTruckTraceService.getTaskAddress(subtask);
+        truckDto.setTaskAddress(taskAddress);
         return truckDto;
     }
 }