提交从es 获取中交的位置信息接口

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

 package com.clx.performance.service.impl;
 
+import cn.hutool.core.util.ArrayUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.enums.OrderEnum;
@@ -33,9 +34,11 @@ import com.clx.performance.param.pc.PagePoundAuditParam;
 import com.clx.performance.service.*;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
 import com.clx.performance.service.child.OrderChildPostService;
+import com.clx.performance.service.impl.trace.TruckTraceServiceImpl;
 import com.clx.performance.service.settle.SettlementDriverDetailService;
 import com.clx.performance.service.settle.SettlementMqService;
 import com.clx.performance.service.settle.SettlementOwnerDetailService;
+import com.clx.performance.service.trace.TruckTraceService;
 import com.clx.performance.struct.*;
 import com.clx.performance.utils.gd.GdService;
 import com.clx.performance.utils.spring.ApplicationContextUtils;
@@ -58,6 +61,7 @@ import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -177,6 +181,9 @@ public class OrderChildServiceImpl implements OrderChildService {
     @Autowired
     private OrderChildLoanComponent orderChildLoanComponent;
 
+    @Autowired
+    private TruckTraceService truckTraceService;
+
 
     @Override
     public SaveOrderChildVO saveOrderChild(OrderChildSaveParam param) {
@@ -572,16 +579,19 @@ public class OrderChildServiceImpl implements OrderChildService {
                 PerformanceResultEnum.DATA_NOT_FIND);
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
                 PerformanceResultEnum.DATA_NOT_FIND);
-        BigDecimal longitude = null;
-        BigDecimal latitude = null;
-/*        if(){
-
+        double longitude;
+        double latitude;
+        //首先获取中交的车来那个经纬度信息，不存在则使用app传过来的经纬度
+        BigDecimal[] currentTruckPosition = truckTraceService.getCurrentTruckPosition(orderChild.getTruckNo());
+        if(ArrayUtils.isNotEmpty(currentTruckPosition)){
+            longitude = currentTruckPosition[0].doubleValue();
+            latitude = currentTruckPosition[1].doubleValue();
         }else{
-
-        }*/
+            longitude = param.getLongitude().doubleValue();
+            latitude = param.getLatitude().doubleValue();
+        }
         double distance = GpsUtil.distance(orderGoods.getSendLongitude().doubleValue(),
-                orderGoods.getSendLatitude().doubleValue(), param.getLongitude().doubleValue(),
-                param.getLatitude().doubleValue()) / 1000;
+                orderGoods.getSendLatitude().doubleValue(), longitude, latitude) / 1000;
         if (distance > orderInfo.getSendDriverArriveRange().doubleValue()) {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_ARRIVE_SEND_ADDRESS_DISTANCE_ERROR);
         }

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

@@ -13,6 +13,7 @@ import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.vo.pc.trace.DriverTraceVO;
 import com.clx.performance.vo.pc.trace.DriverTruckTraceVO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.dromara.easyes.core.conditions.select.LambdaEsQueryWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -214,4 +215,25 @@ public class TruckTraceServiceImpl implements TruckTraceService {
         return 0;
     }
 
+    @Override
+    public BigDecimal[] getCurrentTruckPosition(String truckNo) {
+        String beginTime = LocalDateTimeUtils.formatTime(LocalDateTime.now().minusMinutes(5));
+        String endTime = LocalDateTimeUtils.formatTime();
+
+        // 车辆
+        List<TruckTraceESPlus> list = truckTraceESPlusMapper.selectList(new LambdaEsQueryWrapper<TruckTraceESPlus>()
+                .eq(TruckTraceESPlus::getTruckNo, truckNo)
+                .ge(TruckTraceESPlus::getGpsTime, beginTime)
+                .le(TruckTraceESPlus::getGpsTime, endTime)
+                .orderByDesc("gpsTime")
+                .limit(1)
+        );
+        if (CollectionUtils.isNotEmpty(list)){
+            return list.get(0).getLocation();
+        }
+        return null;
+    }
+
+
+
 }

performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceService.java

@@ -20,4 +20,7 @@ public interface TruckTraceService {
     BigDecimal[] getCurrentPosition(String truckNo, Long userNo);
 
     int getParkTime(String truckNo, Long userNo);
+
+
+    BigDecimal[] getCurrentTruckPosition(String truckNo);
 }