Merge branch 'refs/heads/v15.4_truck_fleet_20240513' into test

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

@@ -20,7 +20,6 @@ import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.vo.pc.IntegralTruckVO;
 import com.clx.user.vo.app.driver.truck.DriverTruckAppVo;
 import com.clx.user.vo.feign.DriverInfoFeignVo;
-import com.msl.common.utils.DateUtils;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -160,8 +159,7 @@ public class IntegralTruckServiceImpl implements IntegralTruckService {
 
     @Override
     public IPage<IntegralTruckVO> driverPageTruckRank(DriverPageIntegralTruckRankParam param) {
-        //String time = LocalDateTimeUtils.formatTime(LocalDateTimeUtils.getStartWeek().minusDays(7));
-        String time = LocalDateTimeUtils.formatTime(LocalDateTimeUtils.getStartWeek().minusDays(0));
+        String time = LocalDateTimeUtils.formatTime(LocalDateTimeUtils.getStartWeek().minusDays(7));
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         Long userNo = loginUserInfo.getUserNo();
 
@@ -171,8 +169,7 @@ public class IntegralTruckServiceImpl implements IntegralTruckService {
 
         List<String> truckNoList = driverTruckList.stream().map(item -> item.getTruckNo()).collect(Collectors.toList());
         param.setTruckNoList(truckNoList);
-        param.setTime(DateUtils.formatDateTime(LocalDateTime.now()).get());
-        /*        param.setTime(LocalDateTimeUtils.formatTime(LocalDateTimeUtils.getStartWeek()));*/
+        param.setTime(LocalDateTimeUtils.formatTime(LocalDateTimeUtils.getStartWeek()));
         param.setStatisticsDate(time);
 
         IPage<IntegralTruckVO> page = integralTruckDao.driverPageTruckRank(param);

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

@@ -5,6 +5,7 @@ import com.clx.performance.esplus.mapper.TruckTraceESPlusMapper;
 import com.clx.performance.esplus.model.TruckTraceESPlus;
 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.springframework.beans.factory.annotation.Autowired;

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

@@ -42,7 +42,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
     @Autowired
     private DriverTraceStruct driverTraceStruct;
 
-    private final static long stopMinutes = 35;
+    private final static long stopMinutes = 5;
 
     @Override
     public List<DriverTruckTraceVO> listTruckTraceByTime(String truckNo, String beginTime, String endTime) {