Merge remote-tracking branch 'origin/orderChildDetail_add_unloadTime_20240611' into release

performance-api/src/main/java/com/clx/performance/vo/pc/CarrierOrderChildDetailVO.java

@@ -121,6 +121,9 @@ public class CarrierOrderChildDetailVO {
     @ApiModelProperty(value = "取消时间", example = "2020-01-01 10:10:10")
     private String cancelTime;
 
+    @ApiModelProperty(value = "收货待确认时间", example = "2020-01-01 10:10:10")
+    private String unloadTime;
+
 
 
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java

 package com.clx.performance.controller.temp;
 
+import com.clx.open.sdk.callback.message.OrderChildSyncMessage;
 import com.clx.performance.extranal.transport.TransportService;
 import com.clx.performance.feign.TransportFeignService;
 import com.clx.performance.service.TempService;
 import com.clx.performance.service.child.FeignOrderChildService;
+import com.clx.performance.listener.OrderChildDtsListener;
+import com.clx.performance.service.TempService;
+import com.clx.performance.service.child.FeignOrderChildService;
+import com.clx.performance.service.trace.TruckTraceMqHandlerService;
 import com.msl.common.result.Result;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -37,6 +42,10 @@ public class TempController {
     @RequestMapping(value = "/test", method = RequestMethod.GET)
     public Result test() {
 
+        OrderChildSyncMessage message = new OrderChildSyncMessage();
+        message.setId(1);
+        orderChildDtsListener.thirdpartySync(message);
+
         return Result.ok();
     }
 

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

 package com.clx.performance.service.impl.trace;
 
+import com.clx.performance.dto.zjxl.TruckTraceDTO;
+import com.clx.performance.esplus.mapper.TruckTraceESPlusMapper;
+import com.clx.performance.esplus.model.TruckTraceESPlus;
+import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.vehiclewarn.VehicleWarnChildDao;
 import com.clx.performance.dto.zjxl.TruckTraceDTO;
 import com.clx.performance.esplus.mapper.TruckTraceESPlusMapper;
 import com.clx.performance.esplus.model.TruckTraceESPlus;
@@ -22,6 +27,11 @@ public class TruckTraceMqHandlerServiceImpl implements TruckTraceMqHandlerServic
     @Autowired
     private ZjxlGpsService zjxlGpsService;
 
+    @Autowired
+    private VehicleWarnChildDao vehicleWarnChildDao;
+    @Autowired
+    private OrderChildDao orderChildDao;
+
     @Autowired
     private TruckTraceESPlusMapper truckTraceESPlusMapper;
 

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

@@ -15,6 +15,7 @@ import com.clx.performance.vo.pc.trace.DriverTruckTraceVO;
 import com.msl.common.utils.DateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+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;
@@ -378,5 +379,34 @@ public class TruckTraceServiceImpl implements TruckTraceService {
     }
 
 
+    /**
+     * 生成指定大小的车辆轨迹数据插入到es中
+     **/
+    @Override
+    public void saveTruckTrace(String truckNo,Integer size,String gpsTime){
+        if(size > 20000){
+            size = 20000;
+        }
+        List<TruckTraceESPlus> esList = new ArrayList<>();
+        for (int i = 0 ;i < size ; i ++ ) {
+            TruckTraceESPlus es = new TruckTraceESPlus();
+            es.setTruckNo(truckNo);
+            es.setAngle(new BigDecimal("1"));
+            es.setHeight(null);
+            es.setLocation(new BigDecimal[]{new BigDecimal("116.473705"), new BigDecimal("40.004198")});
+            if(StringUtils.isNotBlank(gpsTime)){
+                es.setGpsTime(gpsTime);
+            }else{
+                es.setGpsTime(DateUtils.formatDateTime(LocalDateTime.now()).get());
+            }
+            es.setMileage(null);
+            es.setSpeed(new BigDecimal("3"));
+            esList.add(es);
+        }
+        // 保存
+        truckTraceESPlusMapper.insertBatch(esList);
+    }
+
+
 
 }

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

@@ -30,9 +30,13 @@ public interface TruckTraceService {
     List<List<DriverTraceVO>> splitDriverTrace(List<DriverTraceVO> driverTraceList);
 
 
+    //计算车辆的停留结束时间
     List<DriverTruckTraceVO> calcTruckStayTime(List<DriverTruckTraceVO> traceList);
 
     List<DriverTraceVO> calcDriverStayTime(List<DriverTraceVO> traceList);
 
     List<List<DriverTruckTraceVO>> splitTruckTrace(List<DriverTruckTraceVO> traceList);
+
+
+    void saveTruckTrace(String truckNo,Integer size,String gpsTime);
 }