新增车辆轨迹

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

 package com.clx.performance.service.impl.trace;
 
+import com.clx.order.enums.ResultEnum;
 import com.clx.performance.dao.OrderChildDao;
-import com.clx.performance.enums.ResultEnum;
-import com.clx.performance.esplus.mapper.DriverTraceESPlusMapper;
-import com.clx.performance.esplus.mapper.TruckTraceESPlusMapper;
-import com.clx.performance.esplus.model.DriverTraceESPlus;
-import com.clx.performance.esplus.model.TruckTraceESPlus;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.param.pc.trace.QueryTraceParam;
-import com.clx.performance.param.temp.DriverTraceAddParam;
-import com.clx.performance.param.temp.TruckTraceAddParam;
 import com.clx.performance.service.trace.TraceMonitorService;
 import com.clx.performance.service.trace.TruckTraceService;
-import com.clx.performance.struct.trace.DriverTraceStruct;
-import com.clx.performance.struct.trace.TruckTraceStruct;
-import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.vo.pc.trace.DriverTraceVO;
 import com.clx.performance.vo.pc.trace.DriverTruckTraceVO;
 import com.clx.performance.vo.pc.trace.OrderChildTraceVO;
+import com.clx.user.feign.UserClxFeign;
 import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.utils.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.dromara.easyes.core.conditions.select.LambdaEsQueryWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.Duration;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -41,6 +27,7 @@ public class TraceMonitorServiceImpl implements TraceMonitorService {
 
     private final TruckTraceService truckTraceService;
     private final OrderChildDao orderChildDao;
+    private final UserClxFeign userClxFeign;
 
     private final int TRACE_DAY_MAX = 7;
     @Override
@@ -63,10 +50,16 @@ public class TraceMonitorServiceImpl implements TraceMonitorService {
     @Override
     public OrderChildTraceVO getTruckTrace(QueryTraceParam param) {
         checkParam(param);
-        List<DriverTruckTraceVO> truckTrace = truckTraceService.listTruckTraceByTime(param.getTruckNo(),param.getBeginTime(),param.getEndTime());
         //查询车辆的车主信息
+        long userNo = 0;
+
+        return this.getTrace(userNo,param.getTruckNo(),param.getBeginTime(),param.getEndTime());
+    }
+
 
-        List<DriverTraceVO> driverTrace = truckTraceService.listDriverTraceByTime(,param.getBeginTime(),param.getEndTime());
+    private OrderChildTraceVO getTrace(long userNo,String truckNo,String beginTime,String endTime){
+        List<DriverTruckTraceVO> truckTrace = truckTraceService.listTruckTraceByTime(truckNo,beginTime,endTime);
+        List<DriverTraceVO> driverTrace = truckTraceService.listDriverTraceByTime(userNo,beginTime,endTime);
         OrderChildTraceVO result = new OrderChildTraceVO();
         result.setDriverTraceList(driverTrace);
         result.setTruckTraceList(truckTrace);