提交app端接口开发

.gitignore

@@ -27,3 +27,5 @@ logs
 
 .flattened-pom.xml
 
+/sckw-modules/.yapix
+/sckw-modules/sckw-transport/openapi.yaml

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

@@ -13,10 +13,9 @@ import java.io.Serializable;
 /**
  * @author PC
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
 @Valid
-public class DeleteTruckRoteReq extends PageReq implements Serializable {
+public class DeleteTruckRoteReq  implements Serializable {
     @Serial
     private static final long serialVersionUID = 2817549090778895464L;
     @NotNull(message = "id不能为空")

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

@@ -23,17 +23,21 @@ public class TruckInfoReq extends PageReq implements Serializable {
     /**
      * 企业id
      */
+    @Schema(description = "企业id")
     private Long entId;
     /**
      * 是否是外部车辆(0-自有车辆 1-外部车辆)
      */
+    @Schema(description = "是否是外部车辆(0-自有车辆 1-外部车辆)")
     private String truckMark;
     /**
      * 开始时间
      */
+    @Schema(description = "开始时间")
     private String startTime;
     /**
      * 结束时间
      */
+    @Schema(description = "结束时间")
     private String endTime;
 }

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

@@ -13,10 +13,9 @@ import java.io.Serializable;
 /**
  * @author PC
  */
-@EqualsAndHashCode(callSuper = true)
 @Data
 @Valid
-public class TruckRoteDetailReq extends PageReq implements Serializable {
+public class TruckRoteDetailReq implements Serializable {
     @Serial
     private static final long serialVersionUID = 2817549090778895464L;
     /**
@@ -28,9 +27,11 @@ public class TruckRoteDetailReq extends PageReq implements Serializable {
     /**
      * 装货点
      */
+    @Schema(description = "装货点")
     private String startPoint;
     /**
      * 卸货点
      */
+    @Schema(description = "卸货点")
     private String unloadingPoint;
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/AppTruckInfoVo.java

@@ -27,6 +27,7 @@ public class AppTruckInfoVo implements Serializable {
     /**
      * 司机id
      */
+    @Schema(description = "司机id")
     private String driverId;
     /**
      * 司机名称
@@ -36,14 +37,17 @@ public class AppTruckInfoVo implements Serializable {
     /**
      * 司机手机号
      */
+    @Schema(description = "司机手机号")
     private String driverPhone;
     /**
      * 车队id
      */
+    @Schema(description = "车队id")
     private String fleetId;
     /**
      * 车队名称
      */
+    @Schema(description = "车队名称")
     private String fleetName;
     /**
      * 车辆id
@@ -79,27 +83,17 @@ public class AppTruckInfoVo implements Serializable {
     /**
      * 车辆类型(0-自有车辆，1-外部车辆)
      */
+    @Schema(description = "车辆类型(0-自有车辆，1-外部车辆)")
     private String truckMark;
     /**
      * 运单号
      */
-    private String wOrderNo;
+    @Schema(description = "运单号")
+    private String orderNo;
     /**
      * 运单id
      */
-    private String wOrderId;
+    @Schema(description = "运单id")
+    private String orderId;
 
-
-//    /**
-//     * 车辆数据
-//     */
-//    @Schema(description = "车辆数据")
-//    private List<TruckData> truck;
-//
-//    @Data
-//    public static class TruckData implements Serializable{
-//        @Serial
-//        private static final long serialVersionUID = -8647322705630318076L;
-//
-//    }
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/QueryTruckRoteVo.java

@@ -58,5 +58,9 @@ public class QueryTruckRoteVo implements Serializable {
      */
     @Schema(description = "最快耗时")
     private String sortedTime;
+    /**
+     * 车辆id
+     */
+    @Schema(description = "车辆id")
     private String id;
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/vo/TruckRoteDetailVo.java

@@ -34,18 +34,21 @@ public class TruckRoteDetailVo implements Serializable {
     @Data
     public static class TruckRoteDetail {
         /**
-         * 时间戳
+         * 定位时间
          */
+        @Schema(description = "定位时间")
         private LocalDateTime ts;
 
         /**
          * 经度
          */
+        @Schema(description = "经度")
         private String longitude;
 
         /**
          * 纬度
          */
+        @Schema(description = "纬度")
         private String latitude;
     }
 }

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

@@ -1686,8 +1686,8 @@ public class KwfTruckService {
         }
         List<RWaybillOrderVo> rWaybillOrderVos = finalTruckIdAndWaybillOrderMap.get(t.getId());
         if (CollectionUtils.isNotEmpty(rWaybillOrderVos)){
-            truckInfoVo.setWOrderNo(rWaybillOrderVos.get(0).getWOrderNo());
-            truckInfoVo.setWOrderId(String.valueOf(rWaybillOrderVos.get(0).getId()));
+            truckInfoVo.setOrderNo(rWaybillOrderVos.get(0).getWOrderNo());
+            truckInfoVo.setOrderId(String.valueOf(rWaybillOrderVos.get(0).getId()));
         }
         truckInfoVo.setTruckMark(String.valueOf(t.getTruckMark()));
         truckInfoVo.setBusinessStatus(String.valueOf(t.getBusinessStatus()));

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/WaybillOrderDetailVo.java

@@ -1,6 +1,7 @@
 package com.sckw.transport.model.vo;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.Map;
@@ -17,59 +18,70 @@ public class WaybillOrderDetailVo {
      * 运单ID
      */
     @JsonProperty("wOrderId")
+    @Schema(description = "运单ID")
     private Long wOrderId;
 
     /**
      * 运单号
      */
     @JsonProperty("wOrderNo")
+    @Schema(description = "运单号")
     private String wOrderNo;
 
     /**
      * 车辆ID
      */
+    @Schema(description = "车辆ID")
     private Long truckId;
 
     /**
      * 车牌号
      */
+    @Schema(description = "车牌号")
     private String truckNo;
 
 
     /**
      * 司机ID
      */
+    @Schema(description = "司机ID")
     private Long driverId;
 
     /**
      * 司机姓名
      */
+    @Schema(description = "司机姓名")
     private String driverName;
 
     /**
      * 车队ID
      */
+    @Schema(description = "车队ID")
     private Long fleetId;
 
     /**
      * 车队名称
      */
+    @Schema(description = "车队名称")
     private String fleetName;
 
     /**
      * 企业ID
      */
+    @Schema(description = "企业ID")
     private Long entId;
 
     /**
      * 企业名称
      */
+    @Schema(description = "企业名称")
     private String entName;
 
 
     /**
      * 地址信息(key: 地址类型（1装货地址、2卸货地址）， value: 地址名称)
      */
+    @Schema(description = "地址信息(key: 地址类型（1装货地址、2卸货地址）， value: 地址名称)")
     private Map<Integer, String> addresses;