提交全图监控

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/GenerateTraceReq.java

@@ -25,7 +25,7 @@ public class GenerateTraceReq implements Serializable {
 
     @Schema(description = "运单号", example = "T88565469682136456969", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "运单号不能为空")
-    private String wOrderNo;
+    private String wayOrderNo;
 
     @Schema(description = "车牌号", example = "川A888528", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotBlank(message = "车牌号不能为空")
@@ -35,6 +35,9 @@ public class GenerateTraceReq implements Serializable {
     @NotBlank(message = "当前位置不能为空")
     private String currentLocation;
 
+    @Schema(description = "异常位置详细地址")
+    private String exceptionLocation;
+
     @Schema(description = "异常类型（1-车辆偏航，2-急刹车，3-超速，4-异常停车）")
     private Integer exceptionType;
 }

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

@@ -41,6 +41,7 @@ import com.sckw.transport.model.dto.TruckDto;
 import com.sckw.transport.api.feign.VehicleTraceClient;
 import com.sckw.transport.api.model.dto.VehicleDataDTO;
 import com.sckw.transport.api.model.dto.VehicleReturnData;
+import com.sckw.transport.model.enuma.VehicleExceptionTypeEnum;
 import com.sckw.transport.model.param.*;
 import com.sckw.transport.model.dto.GenerateTraceReq;
 import com.sckw.transport.model.vo.CurrentTaskTraceReqVo;
@@ -1252,12 +1253,12 @@ public class kwfTruckTraceService {
         String longitude = location[0];
         String latitude = location[1];
 
-        KwtWaybillOrder order = kwtWaybillOrderRepository.queryByWayOrderNo(req.getWOrderNo());
+        KwtWaybillOrder order = kwtWaybillOrderRepository.queryByWayOrderNo(req.getWayOrderNo());
         if (Objects.isNull(order)){
             throw new BusinessException("运单不存在");
         }
         //查询子运单
-        KwtWaybillOrder subOrders = kwtWaybillOrderRepository.queryByBillOrderId(order.getLOrderId());
+        KwtWaybillOrderSubtask subOrders = kwtWaybillOrderSubtaskRepository.queryByBillOrderId(order.getId());
         if (Objects.isNull(subOrders)){
             throw new BusinessException("子运单不存在");
         }
@@ -1280,7 +1281,7 @@ public class kwfTruckTraceService {
             // 如果有异常类型，同时保存到本地车辆异常表
             saveException(req, order, longitude, latitude);
 
-            log.info("生成车辆轨迹成功，运单号：{}，车牌号：{}", req.getWOrderNo(), req.getTruckNo());
+            log.info("生成车辆轨迹成功，运单号：{}，车牌号：{}", req.getWayOrderNo(), req.getTruckNo());
         } catch (Exception e) {
             log.error("生成车辆轨迹异常：", e);
             throw new BusinessException("生成轨迹失败：" + e.getMessage());
@@ -1296,11 +1297,13 @@ public class kwfTruckTraceService {
             vehicleException.setEntId(order.getEntId());
             vehicleException.setTruckId(order.getTruckId());
             vehicleException.setTruckNo(req.getTruckNo());
-            vehicleException.setWOrderNo(req.getWOrderNo());
+            vehicleException.setWOrderNo(req.getWayOrderNo());
             vehicleException.setDriverId(order.getDriverId());
             vehicleException.setDriverName(order.getDriverName());
             vehicleException.setDriverPhone(order.getDriverPhone());
             vehicleException.setExceptionType(req.getExceptionType());
+            vehicleException.setDescription(VehicleExceptionTypeEnum.getName(req.getExceptionType()));
+            vehicleException.setLocation(req.getExceptionLocation());
             vehicleException.setLongitude(longitude);
             vehicleException.setLatitude(latitude);
             vehicleException.setExceptionTime(new Date());
@@ -1334,7 +1337,7 @@ public class kwfTruckTraceService {
         if (req.getExceptionType() != null){
             vehiclesTrajectoryReq.setStatus(String.valueOf(req.getExceptionType()));
         }
-        vehiclesTrajectoryReq.setWOrderNo(req.getWOrderNo());
+        vehiclesTrajectoryReq.setWOrderNo(req.getWayOrderNo());
         vehiclesTrajectoryReq.setLOrderNo(Optional.ofNullable(logisticsOrder).map(KwtLogisticsOrder::getLOrderNo).orElse( ""));
         VehiclesTrajectoryReq.VehicleDataVO vehicleDataVO = new VehiclesTrajectoryReq.VehicleDataVO();
         vehicleDataVO.setCarNo(req.getTruckNo());