提交swagger接入

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckController.java

@@ -24,6 +24,8 @@ import com.sckw.fleet.model.request.TruckInfoReq;
 import com.sckw.fleet.model.vo.*;
 import com.sckw.fleet.service.KwfTruckService;
 import com.sckw.system.api.RemoteSystemService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -40,6 +42,7 @@ import java.util.*;
  */
 @RestController
 @RequestMapping("/kwfTruck")
+@Tag(name = "车辆管理模块", description = "车辆管理模块")
 public class KwfTruckController {
 
     @Autowired
@@ -299,6 +302,7 @@ public class KwfTruckController {
      *  获取运力实况
      **/
     @PostMapping("/queryCapacityStatus")
+    @Operation (summary = "获取运力实况", description = "获取运力实况")
     public BaseResult<CapacityStatusVo> queryCapacityStatus( @RequestBody CapacityStatusReq req) {
         return BaseResult.success(truckService.queryCapacityStatus(req));
     }
@@ -307,6 +311,7 @@ public class KwfTruckController {
      *  获取运力实况
      **/
     @GetMapping("/queryTotalCapacityStatus")
+    @Operation(summary = "获取总运力实况", description = "获取总运力实况")
     public BaseResult<CapacityTotalStatusVo> queryTotalCapacityStatus() {
         return BaseResult.success(truckService.queryTotalCapacityStatus());
     }
@@ -316,6 +321,7 @@ public class KwfTruckController {
      *  分页获取车辆信息
      **/
     @GetMapping("/pageTruckInfo")
+    @Operation(summary = "分页获取车辆信息", description = "分页获取车辆信息")
     public BaseResult<PageDataResult<TruckInfoVo>> pageTruckInfo(TruckInfoReq req) {
         return BaseResult.success(truckService.pageTruckInfo(req));
     }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/controller/KwfTruckRouteController.java

@@ -8,6 +8,8 @@ import com.sckw.fleet.model.request.TruckRoteDetailReq;
 import com.sckw.fleet.model.vo.QueryTruckRoteVo;
 import com.sckw.fleet.model.vo.TruckRoteDetailVo;
 import com.sckw.fleet.service.KwfTruckRouteService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -19,12 +21,14 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/truckRoute")
 @RequiredArgsConstructor
+@Tag(name = "卡车线路管理", description = "卡车线路管理")
 public class KwfTruckRouteController {
     private final KwfTruckRouteService truckService;
     /**
      *  分页获取车辆信息
      **/
     @PostMapping("/pageTruckRoute")
+    @Operation(summary = "分页获取车辆惯用路线信息", description = "分页获取车辆惯用路线信息")
     public BaseResult<PageDataResult<QueryTruckRoteVo>> pageTruckRoute(@RequestBody QueryTruckRoteReq req) {
         return BaseResult.success(truckService.pageTruckRoute(req));
     }
@@ -35,11 +39,18 @@ public class KwfTruckRouteController {
      * @return 删除结果
      */
     @PostMapping("/deleteTruckRoute")
+    @Operation(summary = "删除车辆惯用信息", description = "删除车辆惯用信息")
     public BaseResult<Boolean> deleteTruckRoute(@Valid @RequestBody DeleteTruckRoteReq req) {
         return BaseResult.success(truckService.deleteTruckRoute(req));
     }
 
+    /**
+     * 车辆惯用路线详情
+     * @param req 请求参数
+     * @return 详情结果
+     */
     @PostMapping("/truckRouteDetail")
+    @Operation(summary = "车辆惯用路线详情", description = "车辆惯用路线详情")
     public BaseResult<TruckRoteDetailVo> truckRouteDetail(@Valid @RequestBody TruckRoteDetailReq req) {
         return BaseResult.success(truckService.truckRouteDetail(req));
     }

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

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.request;
 
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -15,5 +16,6 @@ public class CapacityStatusReq implements Serializable {
     /**
      * 车队名称
      */
+    @Schema(description = "车队名称")
     private String fleetName;
 }

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

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.request;
 
 import com.sckw.core.web.request.PageReq;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -19,5 +20,6 @@ public class DeleteTruckRoteReq extends PageReq implements Serializable {
     @Serial
     private static final long serialVersionUID = 2817549090778895464L;
     @NotNull(message = "id不能为空")
+    @Schema(description = "id")
     private Long id;
 }

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

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.request;
 
 import com.sckw.core.web.request.PageReq;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -18,21 +19,26 @@ public class QueryTruckRoteReq extends PageReq implements Serializable {
     /**
      * 车牌号
      */
+    @Schema(description = "车牌号")
     private String truckNo;
     /**
      * 起始点
      */
+    @Schema(description = "起始点")
     private String startPoint;
     /**
      * 卸货点
      */
+    @Schema(description = "卸货点")
     private String unloadingPoint;
     /**
      * 车队id
      */
+    @Schema(description = "车队id")
     private String fleetId;
     /*
     * 司机名称
      */
+    @Schema(description = "司机名称")
     private String driverName;
 }

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

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.request;
 
 import com.sckw.core.web.request.PageReq;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,5 +18,6 @@ public class TruckInfoReq extends PageReq implements Serializable {
     /**
      * 车牌号
      */
+    @Schema(description = "车牌号")
     private String truckNo;
 }

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

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.request;
 
 import com.sckw.core.web.request.PageReq;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -22,5 +23,6 @@ public class TruckRoteDetailReq extends PageReq implements Serializable {
      * 司机id
      */
     @NotNull(message = "司机id不能为空")
+    @Schema(description = "司机id")
     private Long driverId;
 }

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

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.vo;
 
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -18,30 +19,9 @@ public class CapacityStatusVo implements Serializable {
     /**
      * 车辆数据
      */
+    @Schema(description = "车辆数据")
     private List<Truck> truck;
 
-    /**
-     * 总车队数量
-     */
-    private String totalNum;
-
-    /**
-     * 总计车数量
-     */
-    private String truckTotalNum;
-
-    /**
-     * 总运行车辆
-     */
-    private String runningTotalTruckNum;
-    /**
-     * 总空闲车辆
-     */
-    private String idleTotalTruckNum;
-    /**
-     * 总异常车辆
-     */
-    private String abnormalTotalTruckNum;
     @Data
     public static class Truck implements Serializable{
         @Serial
@@ -49,23 +29,28 @@ public class CapacityStatusVo implements Serializable {
         /**
          * 车队 ID
          */
+        @Schema(description = "车队ID")
         private String fleetId;
         /**
          * 车队名称
          */
+        @Schema(description = "车队名称")
         private String fleetName;
 
         /**
          * 空闲车辆数
          */
+        @Schema(description = "空闲车辆数")
         private String idleNum;
         /**
          * 运行车辆数
          */
+        @Schema(description = "运行车辆数")
         private String runningNum;
         /**
          * 异常车辆数
          */
+        @Schema(description = "异常车辆数")
         private String abnormalNum;
     }
 

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

@@ -1,6 +1,7 @@
 package com.sckw.fleet.model.vo;
 
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -18,24 +19,29 @@ public class CapacityTotalStatusVo implements Serializable {
     /**
      * 总车队数量
      */
+    @Schema(description = "总车队数量")
     private String fleetTotalNum;
 
     /**
      * 总计车数量
      */
+    @Schema(description = "总计车数量")
     private String truckTotalNum;
 
     /**
      * 总运行车辆
      */
+    @Schema(description = "总运行车辆")
     private String runningTotalTruckNum;
     /**
      * 总空闲车辆
      */
+    @Schema(description = "总空闲车辆")
     private String idleTotalTruckNum;
     /**
      * 总异常车辆
      */
+    @Schema(description = "总异常车辆")
     private String abnormalTotalTruckNum;
 
 

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

@@ -1,5 +1,6 @@
 package com.sckw.fleet.model.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -15,37 +16,46 @@ public class QueryTruckRoteVo implements Serializable {
     /**
      * 车牌号
      */
+    @Schema(description = "车牌号")
     private String truckNo;
     /**
      * 起始点
      */
+    @Schema(description = "起始点")
     private String startPoint;
     /**
      * 卸货点
      */
+    @Schema(description = "卸货点")
     private String unloadingPoint;
     /**
      * 车队id
      */
+    @Schema(description = "车队id")
     private String fleetId;
     /**
      * 车队名称
      */
+    @Schema(description = "车队名称")
     private String fleetName;
     /*
     * 司机名称
      */
+    @Schema(description = "司机名称")
     private String driverName;
     /**
      * 司机id
      */
+    @Schema(description = "司机id")
     private String driverId;
     /**
      * 更新时间
      */
+    @Schema(description = "更新时间")
     private String updateTime;
     /**
      * 最快耗时
      */
+    @Schema(description = "最快耗时")
     private String sortedTime;
 }

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

@@ -1,5 +1,6 @@
 package com.sckw.fleet.model.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -18,12 +19,17 @@ public class TruckInfoVo implements Serializable {
     /**
      * 企业id
      */
+    @Schema(description = "企业id")
     private String entId;
     /**
      * 企业名称
      */
+    @Schema(description = "企业名称")
     private String entName;
-    //车辆数据
+    /**
+     * 车辆数据
+     */
+    @Schema(description = "车辆数据")
     private List<TruckData> truck;
 
     @Data
@@ -33,10 +39,12 @@ public class TruckInfoVo implements Serializable {
         /**
          * 车辆id
          */
+        @Schema(description = "车辆id")
         private String truckId;
         /**
          * 车牌号
          */
+        @Schema(description = "车牌号")
         private String truckNo;
     }
 }

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

@@ -2,6 +2,7 @@
 package com.sckw.fleet.model.vo;
 
 import com.sckw.core.web.request.PageReq;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -20,9 +21,11 @@ public class TruckRoteDetailVo implements Serializable {
     /**
      * 起始点
      */
+    @Schema(description = "起始点")
     private String startPoint;
     /**
      * 卸货点
      */
+    @Schema(description = "卸货点")
     private String unloadingPoint;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwfTaskController.java

@@ -37,6 +37,7 @@ public class KwfTaskController {
      * 获取高德地图apiKey
      */
     @GetMapping("/getMapApikey")
+    @Operation(summary = "获取高德地图apiKey", description = "获取高德地图apiKey")
     public BaseResult<String> getMapApikey()  {
         return BaseResult.success(kwfTaskService.getMapApikey());
     }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/KwfTruckTraceController.java

@@ -1,6 +1,5 @@
 package com.sckw.transport.controller;
 
-import com.sckw.core.model.page.PageResult;
 import com.sckw.core.web.response.BaseResult;
 import com.sckw.core.web.response.result.PageDataResult;
 import com.sckw.transport.model.param.CurrentTaskTraceReq;
@@ -10,6 +9,8 @@ import com.sckw.transport.model.vo.CurrentTaskTraceReqVo;
 import com.sckw.transport.model.vo.KwfTruckTraceReplayVo;
 import com.sckw.transport.model.vo.TruckInfoVo;
 import com.sckw.transport.service.kwfTruckTraceService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/kwfTruckTrace")
 @RequiredArgsConstructor
+@Tag(name = "车辆轨迹相关接口")
 public class KwfTruckTraceController {
     private final kwfTruckTraceService kwfTruckTraceService;
 
@@ -28,6 +30,7 @@ public class KwfTruckTraceController {
      * 获取车辆实时位置信息
      */
     @PostMapping("/queryTruckInfo")
+    @Operation(summary = "获取车辆实时位置信息")
     public BaseResult<TruckInfoVo> queryTruckInfo(@RequestBody TruckInfoReq req )  {
         TruckInfoVo truckInfoVo = kwfTruckTraceService.queryTruckInfo(req);
         return BaseResult.success(truckInfoVo);
@@ -37,6 +40,7 @@ public class KwfTruckTraceController {
      * 查询当前任务的线路
      */
     @PostMapping("/queryCurrentTaskTrace")
+    @Operation(summary = "查询当前任务的线路")
     public BaseResult<CurrentTaskTraceReqVo> queryCurrentTaskTrace(@RequestBody CurrentTaskTraceReq req )  {
         CurrentTaskTraceReqVo taskTrace = kwfTruckTraceService.queryCurrentTaskTrace(req);
         return BaseResult.success(taskTrace);
@@ -46,6 +50,7 @@ public class KwfTruckTraceController {
      * 查询当前车辆的轨迹明细
      */
     @PostMapping("/queryCurrentTruckTrace")
+    @Operation(summary = "查询当前车辆的轨迹明细")
     public BaseResult<CurrentTaskTraceReqVo> queryCurrentTruckTrace(@RequestBody CurrentTaskTraceReq req )  {
         CurrentTaskTraceReqVo taskTrace = kwfTruckTraceService.queryCurrentTruckTrace(req);
         return BaseResult.success(taskTrace);
@@ -56,6 +61,7 @@ public class KwfTruckTraceController {
      * 轨迹回放
      */
     @PostMapping("/replay")
+    @Operation(summary = "轨迹回放")
     public BaseResult<PageDataResult<KwfTruckTraceReplayVo>> findPage(@RequestBody KwfTruckTraceReplayReq req )  {
 
         return BaseResult.success( kwfTruckTraceService.findPage(req));

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppTraceController.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.sckw.core.web.response.BaseResult;
 import com.sckw.transport.model.param.VehiclesTrajectoryReq;
 import com.sckw.transport.service.kwfTruckTraceService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/appTraceController")
 @RequiredArgsConstructor
+@Tag(name = "app端轨迹接口", description = "app端轨迹接口")
 public class AppTraceController {
 
     private final kwfTruckTraceService kwfTruckTraceService;
@@ -26,6 +29,7 @@ public class AppTraceController {
      * @return  统计响应结果
      */
     @PostMapping(name = "车辆轨迹上报", path = "/vehicles/trajectory")
+    @Operation(summary = "车辆轨迹上报", description = "车辆轨迹上报")
     public BaseResult<Void> vehiclesTrajectory(@Valid  @RequestBody VehiclesTrajectoryReq req) {
         log.info("企业app车辆轨迹上报 请求参数 :{}", JSONObject.toJSONString(req));
         return BaseResult.success(kwfTruckTraceService.vehiclesTrajectory(req));

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/TaskStatisticsVo.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -17,17 +18,21 @@ public class TaskStatisticsVo implements Serializable {
     /**
      * 任务总数
      */
+    @Schema(description = "任务总数")
     private String taskTotal;
     /**
      * 处理中的任务数
      */
+    @Schema(description = "处理中的任务数")
     private String taskRunning;
     /**
      * 已完成的任务数
      */
+    @Schema(description = "已完成的任务数")
     private String taskCompleted;
     /**
      * 占全部运力百分比
      */
+    @Schema(description = "占全部运力百分比")
     private String taskPercent;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/CurrentTaskTraceReq.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.param;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -14,9 +15,11 @@ public class CurrentTaskTraceReq implements Serializable {
     /**
      * 车牌号
      */
+    @Schema(description = "车牌号")
     private String truckNo;
     /**
      * 运单号
      */
+    @Schema(description = "运单号")
     private String wOrderNo;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/KwfTruckTraceReplayReq.java

@@ -1,6 +1,7 @@
 package com.sckw.transport.model.param;
 
 import com.sckw.core.web.request.PageReq;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -19,9 +20,11 @@ public class KwfTruckTraceReplayReq extends PageReq implements Serializable {
     /**
      * 任务创建时间下限
      */
+    @Schema(description = "任务创建时间下限")
     private String startTime;
     /**
      * 任务开始时间上限
      */
+    @Schema(description = "任务创建时间上限")
     private String endTime;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/TruckInfoReq.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.param;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -14,15 +15,18 @@ public class TruckInfoReq implements Serializable {
     @Serial
     private static final long serialVersionUID = -1005206382530999253L;
     /**
-     * 车队id
+     * 企业id
      */
+    @Schema(description = "企业id")
     private String entId;
     /**
      * 车牌号
      */
+    @Schema(description = "车牌号")
     private String truckNo;
     /**
      * 运单号
      */
+    @Schema(description = "运单号")
     private String wOrderNo;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/VehiclesTrajectoryReq.java

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.param;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -13,85 +14,101 @@ public class VehiclesTrajectoryReq {
     /**
      * 手机号
      */
+    @Schema(description = "手机号")
     private String mobile;
 
     /**
      * 车牌号
      */
+    @Schema(description = "车牌号")
     private String truckNo;
 
     /**
      * 经度
      */
     @NotBlank(message = "经度longitude不能为空")
+    @Schema(description = "经度")
     private String longitude;
 
     /**
      * 纬度
      */
     @NotBlank(message = "纬度latitude不能为空")
+    @Schema(description = "纬度")
     private String latitude;
 
     /**
      * 车速(km/h)
      */
     @NotNull(message = "车速speed不能为空")
+    @Schema(description = "车速(km/h)")
     private Float speed;
 
     /**
      * GPS状态
      */
+    @Schema(description = "GPS状态")
     private String gpsStatus;
     /**
      * 行驶方向(角度)
      */
+    @Schema(description = "行驶方向(角度)")
     private Integer direction;
 
     /**
      * 燃油液位(%)
      */
+    @Schema(description = "燃油液位(%)")
     private Float fuelLevel;
 
     /**
      * 里程数(km)
      */
+    @Schema(description = "里程数(km)")
     private Double mileage;
 
     /**
      * 发动机温度(℃)
      */
+    @Schema(description = "发动机温度(℃)")
     private Float engineTemp;
 
     /**
      * 电池电压(V)
      */
+    @Schema(description = "电池电压(V)")
     private Float batteryVoltage;
 
     /**
      * 车辆状态
      */
     @NotBlank(message = "车辆状态status不能为空")
+    @Schema(description = "车辆状态")
     private String status;
 
     /**
      * 运单号
      */
     @NotBlank(message = "运单号wOrderNo不能为空")
+    @Schema(description = "运单号")
     private String wOrderNo;
     /**
      * 运单状态
      */
+    @Schema(description = "运单状态")
     @NotBlank(message = "关联订单号lOrderNo不能为空")
     private String lOrderNo;
 
     /**
      * 报警代码
      */
+    @Schema(description = "报警代码")
     private Integer alarmCode;
 
     /**
      * 车辆信息
      */
+    @Schema(description = "车辆信息")
     private VehicleDataVO vehicleDataVO;
 
     @Data
@@ -102,62 +119,75 @@ public class VehiclesTrajectoryReq {
          * 车牌
          */
         @NotBlank(message = "车牌carNo不能为空")
+        @Schema(description = "车牌号")
         private String carNo;
 
         /**
          * 车队id
          */
+        @Schema(description = "车队id")
         @NotBlank(message = "车队fleetId不能为空")
         private String fleetId;
 
         /**
          * 车队名称
          */
+        @Schema(description = "车队名称")
         private String fleetName;
 
         /**
          * 设备唯一id
          */
+        @Schema(description = "设备唯一id")
         private String deviceId;
 
+
         /**
          * 设备名称
          */
+        @Schema(description = "设备名称")
         private String deviceName;
 
         /**
          * 区域ID
          */
+        @Schema(description = "区域ID")
         private String groupId;
 
         /**
          * 区域名称
          */
+        @Schema(description = "区域名称")
         private String groupName;
 
         /**
          * 业务ID
          */
+        @Schema(description = "业务ID")
         private String bizId;
 
         /**
          * 业务名称
          */
+        @Schema(description = "业务名称")
         private String bizName;
 
         /**
          * 项目ID
          */
+        @Schema(description = "项目ID")
         private String projectId;
 
         /**
          * 项目名称
          */
+        @Schema(description = "项目名称")
         private String projectName;
 
         /**
          * 租户id
          */
+        @Schema(description = "租户id")
         private String tenantId;
     }
 }

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

@@ -1,5 +1,6 @@
 package com.sckw.transport.model.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -17,6 +18,7 @@ public class CurrentTaskTraceReqVo implements Serializable {
     /**
      * 运单号
      */
+    @Schema(description = "运单号")
     private String wOrderNo;
     List<CurrentTaskTrace> currentTaskTraceList;
 
@@ -25,14 +27,17 @@ public class CurrentTaskTraceReqVo implements Serializable {
         /**
          * 经度
          */
+        @Schema(description = "经度")
         private String longitude;
         /**
          * 纬度
          */
+        @Schema(description = "纬度")
         private String latitude;
         /**
          * 定位时间
          */
+        @Schema(description = "定位时间")
         private String locationTime;
     }
 }

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

@@ -1,6 +1,7 @@
 package com.sckw.transport.model.vo;
 
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -17,55 +18,68 @@ public class KwfTruckTraceReplayVo implements Serializable {
     /**
      * 运单id
      */
+    @Schema(description = "运单id")
     private Long wOrderId;
     /**
      * 运单编号
      */
+    @Schema(description = "运单编号")
     private String wOrderNo;
     /**
      * 司机姓名
      */
+    @Schema(description = "司机姓名")
     private String driverName;
     /**
      * 驾驶员手机号
      */
+    @Schema(description = "司机手机号")
     private String phone;
     /**
      * 承运单位
      */
+    @Schema(description = "承运单位")
     private String carrier;
     /**
      * 状态
      */
+    @Schema(description = "状态")
     private String status;
 
     /**
      * 状态描述
      */
+    @Schema(description = "状态描述")
     private String statusDesc;
     /**
      * 起始地点
      */
+    @Schema(description = "装货地点")
     private String startAddress;
     /**
      * 结束地点
      */
+    @Schema(description = "卸货地点")
     private String endAddress;
     /**
      * 关联任务单号
      */
+    @Schema(description = "关联任务单号")
     private String relationTaskNo;
     /**
      * 任务开始时间
      */
+    @Schema(description = "任务开始时间")
     private String taskStartTime;
 
     /**
      * 任务开始时间
      */
+    @Schema(description = "任务结束时间")
     private String taskEndTime;
     /**
      * 告警记录数
      */
+    @Schema(description = "告警记录数")
     private String warningCount;
 }

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

@@ -1,6 +1,7 @@
 package com.sckw.transport.model.vo;
 
 import com.sckw.transport.model.dto.TruckDto;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serial;
@@ -17,35 +18,44 @@ public class TruckInfoVo implements Serializable {
     /**
      * 运单号
      */
+    @Schema(description = "运单号")
     private String wOrderNo;
     /**
      * 车牌号
      */
+    @Schema(description = "车牌号")
     private String truckNo;
     /**
      * GPS状态
      */
+    @Schema(description = "GPS状态(车速)")
     private String gpsStatus;
     /**
-     * 精度
+     * 经度
      */
+    @Schema(description = "经度")
     private String longitude;
     /**
      * 纬度
      */
+    @Schema(description = "纬度")
     private String latitude;
 
+
     /**
      * 定位时间
      */
+    @Schema(description = "定位时间")
     private String locationTime;
     /**
      * 关联任务号
      */
+    @Schema(description = "关联任务号")
     private String lOrderNo;
     /**
      * 任务地点
      */
+    @Schema(description = "任务地点")
     private String taskAddress;
 
     public static TruckInfoVo getInstance() {

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.constant.UrlConstants;
+import com.sckw.core.model.enums.AddressTypeEnum;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.page.PageResult;
 
@@ -149,10 +150,10 @@ public class kwfTruckTraceService {
         kwfTruckTraceReplay.setCarrier(orDefault.getFirmName());
         List<KwtWaybillOrderAddress> addressList = wOrderIdAndAddressMap.get(waybillOrder.getId());
         addressList.forEach(e -> {
-            if (Objects.equals(e.getAddressType(),1)){
+            if (Objects.equals(e.getAddressType(), AddressTypeEnum.SHIPMENT.getCode())){
                 kwfTruckTraceReplay.setStartAddress(e.getDetailAddress());
             }
-            if (Objects.equals(e.getAddressType(),2)){
+            if (Objects.equals(e.getAddressType(),AddressTypeEnum.TAKE.getCode())){
                 kwfTruckTraceReplay.setEndAddress(e.getDetailAddress());
             }
         });
@@ -251,6 +252,7 @@ public class kwfTruckTraceService {
         //组织返回数据
         List<CurrentTaskTraceReqVo.CurrentTaskTrace> currentTaskTraceList = vehicleReturnDataList.stream()
                 .map(kwfTruckTraceService::getCurrentTaskTrace)
+                .sorted(Comparator.comparing(CurrentTaskTraceReqVo.CurrentTaskTrace::getLocationTime))
                 .collect(Collectors.toList());
         CurrentTaskTraceReqVo currentTaskTraceReqVo = new CurrentTaskTraceReqVo();
         currentTaskTraceReqVo.setWOrderNo(vehicleReturnDataList.get(0).getWOrderNo());