缓存增加车辆经纬度

performance-web/src/main/java/com/clx/performance/dto/OrderChildExpectDTO.java

@@ -6,6 +6,7 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 @Getter
 @Setter
@@ -20,6 +21,8 @@ public class OrderChildExpectDTO implements Serializable {
     private Integer expectArriveTimeSecond;//预计到达货源地时间
     private String expectReceiveTime;//预计到达目的地时间
     private Integer expectReceiveTimeSecond;//预计到达目的地时间
+    private BigDecimal truckLongitudeX; //车辆位置精度
+    private BigDecimal truckLatitudeY; //车辆位置维度
     private Integer expectTransportTimeSecond;//预计运输时间
     private String expectTransportTime;//预计运输时间(转化秒 为几小时几分钟)
 

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

@@ -1546,18 +1546,32 @@ public class OrderChildServiceImpl implements OrderChildService {
                 //预计到货源地趋势
                 if(orderChildExpect.size() >= 2){
                     OrderChildExpectDTO twoExpect = orderChildExpect.get(1);
+
+
                     if(Objects.nonNull(oneExpect.getExpectArriveTimeSecond()) && Objects.nonNull(twoExpect.getExpectArriveTimeSecond())){
-                        if(oneExpect.getExpectArriveTimeSecond() < twoExpect.getExpectArriveTimeSecond()){
-                            monitorOrderChild.setArriveTrend(0);
-                        }else{
+
+                        //如果车辆坐标没发生变化，则进行预警
+                        if(oneExpect.getTruckLongitudeX().compareTo(twoExpect.getTruckLongitudeX()) == 0  && oneExpect.getTruckLatitudeY().compareTo(twoExpect.getTruckLatitudeY()) == 0){
                             monitorOrderChild.setArriveTrend(1);
+                        }else{
+                            if(oneExpect.getExpectArriveTimeSecond() < twoExpect.getExpectArriveTimeSecond()){
+                                monitorOrderChild.setArriveTrend(0);
+                            }else{
+                                monitorOrderChild.setArriveTrend(1);
+                            }
                         }
                     }
                     if(Objects.nonNull(oneExpect.getExpectReceiveTimeSecond()) && Objects.nonNull(twoExpect.getExpectReceiveTimeSecond())){
-                        if(oneExpect.getExpectReceiveTimeSecond() < twoExpect.getExpectReceiveTimeSecond()){
-                            monitorOrderChild.setReceiveTrend(0);
+
+                        //如果车辆坐标没发生变化，则进行预警
+                        if(oneExpect.getTruckLongitudeX().compareTo(twoExpect.getTruckLongitudeX()) == 0  && oneExpect.getTruckLatitudeY().compareTo(twoExpect.getTruckLatitudeY()) == 0){
+                            monitorOrderChild.setArriveTrend(1);
                         }else{
-                            monitorOrderChild.setReceiveTrend(1);
+                            if(oneExpect.getExpectReceiveTimeSecond() < twoExpect.getExpectReceiveTimeSecond()){
+                                monitorOrderChild.setReceiveTrend(0);
+                            }else{
+                                monitorOrderChild.setReceiveTrend(1);
+                            }
                         }
                     }
                 }
@@ -1662,6 +1676,8 @@ public class OrderChildServiceImpl implements OrderChildService {
             if (Objects.nonNull(truckLongitudeX) && Objects.nonNull(truckLatitudeY)) {
                 OrderChildExpectDTO expect = new OrderChildExpectDTO();
                 expect.setChildNo(childNo);
+                expect.setTruckLongitudeX(truckLongitudeX);
+                expect.setTruckLatitudeY(truckLatitudeY);
                 List<GdRouteDTO> gdRouteDTOS = getRoute(truckNo, truckLongitudeX, truckLatitudeY, siteLongitudeX,
                         siteLatitudeY);
                 Integer plusTime = 0;