chenxiaofei 1 сар өмнө
parent
commit
01d06870ad

+ 4 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/common/config/UrlConfigProperties.java

@@ -18,5 +18,9 @@ public class UrlConfigProperties {
      * API基础地址
      */
     private String apiBaseUrl;
+    /**
+     * 分钟
+     */
+    private Long minute;
 
 }

+ 11 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/VehicleExceptionVo.java

@@ -130,4 +130,15 @@ public class VehicleExceptionVo {
      */
     @Schema(description = "卸货地址纬度")
     private String endLat;
+
+    /**
+     * 运单id
+     */
+    @Schema(description = "运单id")
+    private Long waybillId;
+    /**
+     * 运单号
+     */
+    @Schema(description = "运单号")
+    private String waybillNo;
 }

+ 2 - 0
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/VehicleExceptionService.java

@@ -170,6 +170,8 @@ public class VehicleExceptionService {
         vo.setUnloadAddress(unLoadAdd.getDetailAddress());
         vo.setEndLng(unLoadAdd.getLng());
         vo.setEndLat(unLoadAdd.getLat());
+        vo.setWaybillId(subtask.getWOrderId());
+        vo.setWaybillNo(subtask.getWOrderNo());
         return vo;
     }
     

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

@@ -1062,7 +1062,8 @@ public class kwfTruckTraceService {
     private Map<String, VehicleLocationInfo> queryVehicleLocationBatch(List<String> truckNos) {
         Map<String, VehicleLocationInfo> locationInfoMap = new HashMap<>();
         LocalDateTime now = LocalDateTime.now();
-        LocalDateTime thirtyMinutesAgo = now.minusMinutes(30);
+        log.info("获取配置时间:{}", urlConfigProperties.getMinute());
+        LocalDateTime thirtyMinutesAgo = now.minusMinutes(urlConfigProperties.getMinute());
         if (CollectionUtils.isEmpty(truckNos)){
             return locationInfoMap;
         }