线路预警

performance-api/src/main/java/com/clx/performance/vo/pc/linewarn/LineWarnTraceVO.java

@@ -42,7 +42,7 @@ public class LineWarnTraceVO {
     public String getOrderGoodsStatusMsg() {
         return OrderGoodsStatusEnum.Status.getMsgByCode(orderGoodsStatus);
     }
-    @ApiModelProperty("提取吨数")
+    @ApiModelProperty("货单吨数")
     private BigDecimal extractWeight;
     @ApiModelProperty("装车吨数")
     private BigDecimal loadWeight;

performance-api/src/main/java/com/clx/performance/vo/pc/linewarn/LineWarnTruckTraceInfoVO.java

 package com.clx.performance.vo.pc.linewarn;
 
+import com.clx.performance.enums.OrderChildEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -28,15 +29,14 @@ public class LineWarnTruckTraceInfoVO {
         private Integer truckStatus;
         @ApiModelProperty(value = "运单状态", example = "1")
         private Integer status;
+        @ApiModelProperty(value = "运单状态", example = "1")
+        private String statusMsg;
+        public String getStatusMsg() {
+                return OrderChildEnum.Status.getMsgByCode(status);
+        }
         @ApiModelProperty("经度")
         private BigDecimal longitude;
         @ApiModelProperty("纬度")
         private BigDecimal latitude;
 
-        @ApiModelProperty(value = "装车时间", example = "")
-        private LocalDateTime loadTime;
-        @ApiModelProperty(value = "卸车时间", example = "")
-        private LocalDateTime unloadTime;
-        @ApiModelProperty(value = "完成时间", example = "")
-        private LocalDateTime finishTime;
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/service/impl/linewarn/LineWarnTraceServiceImpl.java

@@ -27,13 +27,14 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 
 @Slf4j
 @Service
 public class LineWarnTraceServiceImpl implements LineWarnTraceService {
     // 最近位置时间
-    private static final Integer LAST_POSITION_TIME = 60;
+    private static final Integer LAST_POSITION_TIME = 5;
 
     @Autowired
     private OrderGoodsDao orderGoodsDao;
@@ -87,14 +88,15 @@ public class LineWarnTraceServiceImpl implements LineWarnTraceService {
                 item.setLatitude(currentPosition[1]);
             }
 
-            item.setTruckStatus(DriverTruckEnum.TraceTruckStatus.HEAVY.getCode());
-            if (item.getFinishTime() != null){
-                if (item.getFinishTime().isBefore(now)){
-                    item.setTruckStatus(DriverTruckEnum.TraceTruckStatus.EMPTY.getCode());}
+            if (Objects.equals(item.getStatus(), OrderChildEnum.Status.CREATED.getCode())
+                || Objects.equals(item.getStatus(), OrderChildEnum.Status.PAY.getCode())
+                || Objects.equals(item.getStatus(), OrderChildEnum.Status.GO_TO_SEND.getCode())
+                || Objects.equals(item.getStatus(), OrderChildEnum.Status.ARRIVE_SEND.getCode())
+            ){
+                item.setTruckStatus(DriverTruckEnum.TraceTruckStatus.EMPTY.getCode());
             }
-            else if (item.getUnloadTime() != null){
-                if (item.getUnloadTime().isBefore(now)){
-                    item.setTruckStatus(DriverTruckEnum.TraceTruckStatus.EMPTY.getCode());}
+            else{
+                item.setTruckStatus(DriverTruckEnum.TraceTruckStatus.HEAVY.getCode());
             }
         }