Merge remote-tracking branch 'origin/v15.4_truck_fleet_20240513' into test

performance-web/src/main/java/com/clx/performance/job/trace/PlatTruckTraceJob.java

@@ -31,7 +31,7 @@ public class PlatTruckTraceJob {
         try {
             Result<List<String>> result = userClxFeign.getPlatformTruckList();
             if(result.succeed()){
-                log.info("平台车辆轨迹同步, size:{}", result.getData().size());
+                log.info("平台车辆轨迹开始同步, size:{}", result.getData().size());
 
                 for (String truckNo : result.getData()) {
                     LocalDateTime now = LocalDateTime.now();
@@ -39,6 +39,7 @@ public class PlatTruckTraceJob {
                     // 发送mq (同步车辆轨迹)
                     truckTraceMqService.truckTracSync( truckNo, LocalDateTimeUtils.formatTime(beginTime), LocalDateTimeUtils.formatTime(now));
                 }
+                log.info("平台车辆轨迹结束同步================");
             }
         } catch (Exception e) {
             log.warn("平台车辆轨迹同步失败，异常原因:{}", ExceptionUtils.getStackTrace(e));

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

@@ -3,15 +3,10 @@ package com.clx.performance.service.impl.trace;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnChildDao;
 import com.clx.performance.dto.zjxl.TruckTraceDTO;
-import com.clx.performance.enums.ResultEnum;
-import com.clx.performance.enums.vehiclewarn.VehicleWarnChildEnum;
 import com.clx.performance.esplus.mapper.TruckTraceESPlusMapper;
 import com.clx.performance.esplus.model.TruckTraceESPlus;
-import com.clx.performance.model.OrderChild;
-import com.clx.performance.model.vehiclewarn.VehicleWarnChild;
 import com.clx.performance.param.mq.trace.TruckTraceSyncMqParam;
 import com.clx.performance.service.trace.TruckTraceMqHandlerService;
-import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.utils.zjxl.ZjxlGpsService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -29,11 +24,6 @@ public class TruckTraceMqHandlerServiceImpl implements TruckTraceMqHandlerServic
     @Autowired
     private ZjxlGpsService zjxlGpsService;
 
-    @Autowired
-    private VehicleWarnChildDao vehicleWarnChildDao;
-    @Autowired
-    private OrderChildDao orderChildDao;
-
     @Autowired
     private TruckTraceESPlusMapper truckTraceESPlusMapper;
 
@@ -42,21 +32,6 @@ public class TruckTraceMqHandlerServiceImpl implements TruckTraceMqHandlerServic
     @Override
     public void truckTracSync(TruckTraceSyncMqParam mq) {
 
-        if (StringUtils.isNotBlank(mq.getChildNo())) {
-            VehicleWarnChild vehicleWarnChild = vehicleWarnChildDao.findByChildNo(mq.getChildNo()).orElseThrow(ResultEnum.DATA_NOT_FIND);
-
-            OrderChild orderChild = orderChildDao.getByChildNo(mq.getChildNo()).orElseThrow(ResultEnum.DATA_NOT_FIND);
-            if (orderChild.getFinishTime() != null) {
-                vehicleWarnChild.setTraceStatus(VehicleWarnChildEnum.TraceStatus.DISABLE.getCode());
-            }
-            vehicleWarnChild.setTraceTime(LocalDateTimeUtils.parseTime(mq.getEndTime()));
-
-            // 更新同步时间
-            if (StringUtils.isNotBlank(mq.getChildNo())) {
-                vehicleWarnChildDao.updateTraceTime(vehicleWarnChild);
-            }
-        }
-
         List<TruckTraceDTO> list = zjxlGpsService.getTruckTrace(mq.getTruckNo(), mq.getBeginTime(), mq.getEndTime());
         if (list.isEmpty()) {return;}
 

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

@@ -82,6 +82,8 @@ public class TruckTraceServiceImpl implements TruckTraceService {
         // 停留时长计算
         Integer parkIdx = null;
         for (int i=0; i<traceList.size(); i++){
+            if (traceList.get(i).getSpeed() == null){continue;}
+
             if (traceList.get(i).getSpeed().compareTo(new BigDecimal(PARK_SPEED)) < 0){
                 parkIdx = i;
             }