车辆位置增加返回字段

performance-api/src/main/java/com/clx/performance/enums/collect/CollectTruckLocationEnum.java

+package com.clx.performance.enums.collect;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+public enum CollectTruckLocationEnum {
+    ;
+    private Integer truckOrderStatus;               //车辆出车状态 1:空车 2:重车
+    @Getter
+    @AllArgsConstructor
+    public enum TruckOrderStatus {
+        EMPTY(1, "空车"),
+        HEAVY(2, "重车"),
+
+        ;
+
+        private final int code;
+        private final String msg;
+
+        public static Optional<TruckOrderStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+}

performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectTruckLocationVO.java

 package com.clx.performance.vo.app.collect;
 
+import com.clx.performance.enums.collect.CollectTruckLocationEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -8,7 +9,6 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
 * @Author: aiqinguo
@@ -53,8 +53,14 @@ public class CollectTruckLocationVO {
     private BigDecimal longitude;
     @ApiModelProperty(value = "纬度", example = "")
     private BigDecimal latitude;
-    @ApiModelProperty(value = "车辆出车状态 1:空车 2重车", example = "")
+    @ApiModelProperty(value = "车辆出车状态 1:空车 2重车", example = "", hidden = true)
     private Integer truckOrderStatus;
+    @ApiModelProperty(value = "车辆出车状态 1:空车 2重车", example = "")
+    private String truckOrderStatusMsg;
+    public String getTruckOrderStatusMsg() {
+        return CollectTruckLocationEnum.TruckOrderStatus.getByCode(truckOrderStatus).get().getMsg();
+    }
+
     @ApiModelProperty(value = "上报时间", example = "")
     private String reportTime;
     @ApiModelProperty(value = "创建时间", example = "")

performance-web/src/main/java/com/clx/performance/model/collect/CollectTruckLocation.java

@@ -41,7 +41,7 @@ public class CollectTruckLocation implements HasKey<Integer> {
     private String fullAddress;                     //全地址
     private BigDecimal longitude;                   //经度
     private BigDecimal latitude;                    //纬度
-    private Integer truckOrderStatus;               //车辆出车状态 1:空车 2:运单-空车 3:运单-重车
+    private Integer truckOrderStatus;               //车辆出车状态 1:空车 2:重车
     private LocalDateTime reportTime;               //上报时间
     private LocalDateTime createTime;               //创建时间
     private LocalDateTime modifiedTime;             //修改时间