缓存增加车辆经纬度

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

@@ -6,12 +6,12 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 @Getter
 @Setter
 @ToString
 @NoArgsConstructor
+//此类中不能放对象类型
 public class OrderChildExpectDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -21,8 +21,8 @@ public class OrderChildExpectDTO implements Serializable {
     private Integer expectArriveTimeSecond;//预计到达货源地时间
     private String expectReceiveTime;//预计到达目的地时间
     private Integer expectReceiveTimeSecond;//预计到达目的地时间
-    private BigDecimal truckLongitudeX; //车辆位置精度
-    private BigDecimal truckLatitudeY; //车辆位置维度
+    private String truckLongitudeX; //车辆位置精度
+    private String truckLatitudeY; //车辆位置维度
     private Integer expectTransportTimeSecond;//预计运输时间
     private String expectTransportTime;//预计运输时间(转化秒 为几小时几分钟)
 

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

@@ -1547,11 +1547,11 @@ 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.getTruckLongitudeX().compareTo(twoExpect.getTruckLongitudeX()) == 0  && oneExpect.getTruckLatitudeY().compareTo(twoExpect.getTruckLatitudeY()) == 0){
+                        if(new BigDecimal(oneExpect.getTruckLongitudeX()).compareTo(new BigDecimal(twoExpect.getTruckLongitudeX())) == 0
+                                && new BigDecimal(oneExpect.getTruckLatitudeY()).compareTo(new BigDecimal(twoExpect.getTruckLatitudeY())) == 0){
                             monitorOrderChild.setArriveTrend(1);
                         }else{
                             if(oneExpect.getExpectArriveTimeSecond() < twoExpect.getExpectArriveTimeSecond()){
@@ -1564,7 +1564,8 @@ public class OrderChildServiceImpl implements OrderChildService {
                     if(Objects.nonNull(oneExpect.getExpectReceiveTimeSecond()) && Objects.nonNull(twoExpect.getExpectReceiveTimeSecond())){
 
                         //如果车辆坐标没发生变化，则进行预警
-                        if(oneExpect.getTruckLongitudeX().compareTo(twoExpect.getTruckLongitudeX()) == 0  && oneExpect.getTruckLatitudeY().compareTo(twoExpect.getTruckLatitudeY()) == 0){
+                        if(new BigDecimal(oneExpect.getTruckLongitudeX()).compareTo(new BigDecimal(twoExpect.getTruckLongitudeX())) == 0
+                                && new BigDecimal(oneExpect.getTruckLatitudeY()).compareTo(new BigDecimal(twoExpect.getTruckLatitudeY())) == 0){
                             monitorOrderChild.setArriveTrend(1);
                         }else{
                             if(oneExpect.getExpectReceiveTimeSecond() < twoExpect.getExpectReceiveTimeSecond()){
@@ -1676,8 +1677,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);
+                expect.setTruckLongitudeX(truckLongitudeX.toString());
+                expect.setTruckLatitudeY(truckLatitudeY.toString());
                 List<GdRouteDTO> gdRouteDTOS = getRoute(truckNo, truckLongitudeX, truckLatitudeY, siteLongitudeX,
                         siteLatitudeY);
                 Integer plusTime = 0;