作业状态，车辆状态提交

src/main/java/com/aoyang/tms/common/WorkOrderEnum.java

@@ -34,8 +34,8 @@ public enum WorkOrderEnum {
     //已关闭
     CLOSED(50, "已关闭"),
 
-    //已取消
-    CONCELED(60, "已取消");
+    //已作废
+    CONCELED(60, "已作废");
 
 
     private Integer orderStatus;

src/main/java/com/aoyang/tms/controller/WorkerController.java

@@ -2,15 +2,12 @@ package com.aoyang.tms.controller;
 
 import com.aoyang.common.param.PageParam;
 import com.aoyang.common.result.Result;
-import com.aoyang.tms.controller.param.Truck;
-import com.aoyang.tms.controller.vo.TruckInfo;
 import com.aoyang.tms.controller.vo.WorkOrderVO;
 import com.aoyang.tms.controller.vo.WorkerInfo;
 import com.aoyang.tms.entity.WorkOrder;
+import com.aoyang.tms.service.CommonService;
 import com.aoyang.tms.service.WorkOrderService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -33,24 +30,27 @@ public class WorkerController {
     @Resource
     private WorkOrderService workOrderService;
 
+    @Resource
+    private CommonService commonService;
+
     @ApiOperation(value = "运力详情", notes = "包含司机1姓名、司机2姓名、押运员姓名、车辆状态、位置经纬度、位置时间等信息")
     @PostMapping("/find_truck_info")
-    public Result<WorkerInfo> find_truck_info(@RequestHeader(value = "orgId") Long orgId,
+    public Result<WorkerInfo> findTruckInfo(@RequestHeader(value = "orgId") Long orgId,
                                               @RequestHeader(value = "userId") Long userId, @RequestBody WorkerInfo workerInfo) {
         return new Result<>(new WorkerInfo());
     }
 
     @ApiOperation(value = "运单列表", notes = "获取司机或押运员的运单列表")
     @PostMapping("/find_work_order_page")
-    public Result<IPage<WorkOrderVO>> find_work_order_list(@RequestHeader(value = "orgId") Long orgId,
+    public Result<IPage<WorkOrderVO>> findWorkOrderList(@RequestHeader(value = "orgId") Long orgId,
                                                            @RequestHeader(value = "userId") Long userId, @RequestBody PageParam<WorkOrder> pageParam) {
         IPage<WorkOrderVO> records = null;
         return new Result<>(records);
     }
 
-    @ApiOperation(value = "运单详情", notes = "获取司机或押运员的运单列表")
+    @ApiOperation(value = "运单详情", notes = "获取司机或押运员的运单详情")
     @PostMapping("/find_work_order_info")
-    public Result<WorkOrderVO> find_work_order_info(@RequestHeader(value = "orgId") Long orgId,
+    public Result<WorkOrderVO> findWorkOrderInfo(@RequestHeader(value = "orgId") Long orgId,
                                                     @RequestHeader(value = "userId") Long userId, @RequestBody WorkOrder workOrder) {
         return new Result<>(new WorkOrderVO());
     }

src/main/java/com/aoyang/tms/controller/vo/WorkerInfo.java

@@ -1,6 +1,5 @@
 package com.aoyang.tms.controller.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -42,8 +41,8 @@ public class WorkerInfo {
     @ApiModelProperty(value = "车牌号")
     private String carNumber;
 
-    @ApiModelProperty(value = "挂车车牌号")
-    private String trailerCarNumber;
+    @ApiModelProperty(value = "挂车牌号")
+    private String trailerNumber;
 
     @ApiModelProperty(value = "位置经度")
     private String longitude;
@@ -54,8 +53,8 @@ public class WorkerInfo {
     @ApiModelProperty(value = "位置时间")
     private String localTime;
 
-    @ApiModelProperty(value = "订单状态,待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已取消60")
-    private int orderStatus;
+//    @ApiModelProperty(value = "订单状态,待执行0,前往装车点10,装车等待20,装车成果报备中30,前往卸车点10,卸车等待20,卸车成果报备30,已完成40,已关闭50,已作废60")
+//    private int orderStatus;
 
     @ApiModelProperty(value = "车辆状态,已收车0,出车前检查1,出车作业中2,收车中3,收车后检查4")
     private Integer truckStatus;

src/main/java/com/aoyang/tms/feign/result/Truck.java

@@ -19,7 +19,7 @@ public class Truck {
     @ApiModelProperty(value = "卡车id")
     private Long truckId;
 
-    @ApiModelProperty(value = "运力系统车辆状态，状态：1出车检查；2.作业中；3.收车中；4.收车后检查；5.已收车")
+    @ApiModelProperty(value = "运力系统车辆状态，已收车0,出车前检查1,出车作业中2,收车中3,收车后检查4")
     private Integer tmsStatus;
 
     @ApiModelProperty(value = "物流公司id")

src/main/java/com/aoyang/tms/service/CommonService.java

@@ -2,10 +2,10 @@ package com.aoyang.tms.service;
 
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.vo.LocationVO;
+import com.aoyang.tms.controller.vo.WorkerInfo;
 import com.aoyang.tms.feign.result.Truck;
 import com.aoyang.tms.feign.result.TruckDriver;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -17,6 +17,15 @@ import java.util.List;
 public interface CommonService {
 
     /**
+     * @Author guoyong
+     * @Description 获取运力详情
+     * @Date  2022/4/21
+     * @Param
+     * @return
+    **/
+    WorkerInfo findTruckInfo(Long truckId);
+
+    /**
      * 获取卡车司机列表
      *
      * @param truckId

src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -2,12 +2,15 @@ package com.aoyang.tms.service.impl;
 
 import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.vo.LocationVO;
+import com.aoyang.tms.controller.vo.WorkerInfo;
+import com.aoyang.tms.entity.TruckEscort;
 import com.aoyang.tms.entity.TruckSimCard;
 import com.aoyang.tms.feign.StrategyFeignClient;
 import com.aoyang.tms.feign.result.TmsMongoDoc;
 import com.aoyang.tms.feign.result.Truck;
 import com.aoyang.tms.feign.result.TruckDriver;
 import com.aoyang.tms.service.CommonService;
+import com.aoyang.tms.service.TruckEscortService;
 import com.aoyang.tms.service.TruckSimCardService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
@@ -39,6 +42,37 @@ public class CommonServiceImpl implements CommonService {
     @Resource
     private TruckSimCardService truckSimCardService;
 
+    @Resource
+    private TruckEscortService truckEscortService;
+
+    @Override
+    public WorkerInfo findTruckInfo(Long truckId) {
+        WorkerInfo workerInfo = new WorkerInfo();
+        workerInfo.setTruckId(truckId);
+        Truck truck = findTruck(truckId);
+        if (truck != null) {
+            workerInfo.setCarNumber(truck.getCarNumber());
+            workerInfo.setTrailerNumber(truck.getTrailerNumber());
+        }
+        List<TruckDriver> truckDrivers = findTruckDrivers(truckId);
+        if (truckDrivers != null && truckDrivers.size() > 0) {
+            workerInfo.setDriverIdOne(truckDrivers.get(0).getDriverId());
+            workerInfo.setDriverNameOne(truckDrivers.get(0).getDriverName());
+            if (truckDrivers.size() > 1) {
+                workerInfo.setDriverIdTwo(truckDrivers.get(1).getDriverId());
+                workerInfo.setDriverNameTwo(truckDrivers.get(1).getDriverName());
+            }
+        }
+
+        TruckEscort truckEscort = truckEscortService.getById(truckId);
+        if (truckEscort != null) {
+            workerInfo.setEscortId(truckEscort.getTruckId());
+            workerInfo.setEscortName(truckEscort.getEscortName());
+        }
+
+        return workerInfo;
+    }
+
     @Override
     public List<TruckDriver> findTruckDrivers(Long truckId) {
         TruckDriver truckDriver = new TruckDriver();