提交修改配置

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

@@ -55,6 +55,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.poi.ss.formula.functions.T;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -216,6 +217,11 @@ public class kwfTruckTraceService {
             return buildTruckInfo(wOrderNo, vehicleReturnData);
         }
         //todo 查询中交 如果数据中台没有数据则查询中交
+        return getTruckInfoVoByZj(truckNo, wOrderNo);
+    }
+
+
+    private TruckInfoVo getTruckInfoVoByZj(String truckNo, String wOrderNo) {
         CollectZjxlResponse collectZjxlResponse = vehicleCollectService.transTimeManage(truckNo);
         TruckInfoVo instance = TruckInfoVo.getInstance();
         instance.setWOrderNo(wOrderNo);
@@ -266,7 +272,24 @@ public class kwfTruckTraceService {
         truckInfoVo.setLocationTime(Objects.isNull(vehicleReturn.getTs())? "" : DateUtils.format(vehicleReturn.getTs(),DateUtils.DATE_TIME_PATTERN));
         KwtWaybillOrderSubtask subtask = kwtWaybillOrderSubtaskRepository.findOneByWOrderNo(wOrderNo);
         truckInfoVo.setLOrderNo(Objects.isNull(subtask) ? "" : String.valueOf(subtask.getLOrderId()));
-        truckInfoVo.setTaskAddress("");
+        if (Objects.isNull(subtask)){
+            return truckInfoVo;
+        }
+        List<KwtWaybillOrderAddress> kwtWaybillOrderAddresses = kwtWaybillOrderAddressRepository.queryByWOrderId(subtask.getWOrderId());
+        if (CollectionUtils.isEmpty(kwtWaybillOrderAddresses)){
+            return truckInfoVo;
+        }
+        String startPoint = "";
+        String endPoint = "";
+        for (KwtWaybillOrderAddress kwtWaybillOrderAddress : kwtWaybillOrderAddresses) {
+            if (Objects.equals(kwtWaybillOrderAddress.getAddressType(), AddressTypeEnum.SHIPMENT.getCode())) {
+                startPoint = kwtWaybillOrderAddress.getDetailAddress();
+            }
+            if (Objects.equals(kwtWaybillOrderAddress.getAddressType(), AddressTypeEnum.TAKE.getCode())) {
+               endPoint = kwtWaybillOrderAddress.getDetailAddress();
+            }
+        }
+        truckInfoVo.setTaskAddress(startPoint+"-"+endPoint);
         return truckInfoVo;
     }