车辆预警

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

@@ -29,15 +29,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 
 @Slf4j
 @Service
 public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerService {
-    private static final Integer SEC_FER_MIN = 60;
 
     @Autowired
     private OrderChildDao orderChildDao;
@@ -172,29 +172,6 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
 
     }
 
-    /**
-     * 获取需要时间（min）
-     */
-    private int getNeedTime(String truckNo, Long userNo,
-                            BigDecimal destinationLongitude, BigDecimal destinationLatitude){
-        int needTime = 0;
-        BigDecimal[] lastPosition = truckTraceService.getLastPosition(truckNo, userNo);
-        if (lastPosition != null) {
-            try {
-                List<GdRouteDTO> gdRouteDTOS = gdService.getRoute(lastPosition[0], lastPosition[1], destinationLongitude, destinationLatitude);
-
-                if (!gdRouteDTOS.isEmpty()){
-                    needTime = gdRouteDTOS.get(0).getDuration() /SEC_FER_MIN;
-                }
-
-            } catch (ServiceSystemException e) {
-                log.info("获取高德线路失败, truckNo:{}, userNo:{}, msg:{}", truckNo, userNo, e.getMessage());
-            }
-        }
-
-        return needTime;
-    }
-
     /**
      * 发送预警短信
      */

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

@@ -297,7 +297,7 @@ public class VehicleWarnReceiveAddressWarnServiceImpl implements VehicleWarnRece
     private int getNeedTime(String truckNo, Long userNo,
                                  BigDecimal destinationLongitude, BigDecimal destinationLatitude){
         int needTime = 0;
-        BigDecimal[] lastPosition = truckTraceService.getLastPosition(truckNo, userNo);
+        BigDecimal[] lastPosition = truckTraceService.getCurrentPosition(truckNo, userNo);
         if (lastPosition != null) {
             try {
                 List<GdRouteDTO> gdRouteDTOS = gdService.getRoute(lastPosition[0], lastPosition[1], destinationLongitude, destinationLatitude);
@@ -320,7 +320,7 @@ public class VehicleWarnReceiveAddressWarnServiceImpl implements VehicleWarnRece
     private int getNeedDistance(String truckNo, Long userNo,
                                  BigDecimal destinationLongitude, BigDecimal destinationLatitude){
         int needDistance = 0;
-        BigDecimal[] lastPosition = truckTraceService.getLastPosition(truckNo, userNo);
+        BigDecimal[] lastPosition = truckTraceService.getCurrentPosition(truckNo, userNo);
         if (lastPosition != null) {
             try {
                 List<GdRouteDTO> gdRouteDTOS = gdService.getRoute(lastPosition[0], lastPosition[1], destinationLongitude, destinationLatitude);