司机端关联车辆数据列表

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/LoadingTypeEnum.java

@@ -17,12 +17,12 @@ public enum LoadingTypeEnum {
     /**
      * 装载
      */
-    LOADING(0,  "装载"),
+    LOADING(0,  "装载任务"),
 
     /**
      * 补货
      */
-    SUPPLEMENT(1, "补货"),
+    SUPPLEMENT(1, "补货任务"),
 
     ;
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/AssociatedTrackRequest.java

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -20,11 +21,11 @@ public class AssociatedTrackRequest {
     private Long entId;
 
     /**
-     * 司机id
+     * 司机手机号
      */
-    @Schema(description = "司机id")
-    @NotNull(message = "司机主键id不能为空!")
-    private Long driverId;
+    @Schema(description = "司机手机号")
+    @NotBlank(message = "司机手机号不能为空!")
+    private String driverPhone;
 
 
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -112,6 +112,8 @@ public class KwfDriverService {
     private KwfDriverMapper driverMapper;
     @Autowired
     KwfTruckService truckService;
+    @Autowired
+    KwfDriverRepository driverRepository;
 
     /**
      * @param key 逐渐id
@@ -1276,8 +1278,13 @@ public class KwfDriverService {
      */
     public List<KwfDriverAssociatedTrackVO> queryAssociatedTrack(AssociatedTrackRequest request) {
         log.info("查询司机关联车辆信息：{}", JSON.toJSONString(request));
+        KwfDriver driver = driverRepository.queryOneByPhone(request.getDriverPhone());
+        if (driver == null) {
+            throw new BusinessPlatfromException(ErrorCodeEnum.DRIVER_NOT_FOUND, "车辆信息不存在!");
+        }
+
         List<KwfDriverAssociatedTruck> associatedTrackList = driverAssociatedTruckRepository
-                .queryByEntIdAndDriverId(request.getEntId(),request.getDriverId());
+                .queryByEntIdAndDriverId(request.getEntId(), driver.getId());
         if (CollectionUtils.isEmpty(associatedTrackList)) {
             return Collections.emptyList();
         }