Merge branch 'refs/heads/v14.4_vehicle_warn_20240425' into test

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

@@ -22,6 +22,8 @@ public class DriverTraceVO {
     private BigDecimal speed;
     @ApiModelProperty(value = "停留时长（min）", example = "12.3")
     private BigDecimal stayTime=BigDecimal.ZERO;
+    @ApiModelProperty(value = "停留开始时间")
+    private String stayBeginTime;
     @ApiModelProperty(value = "停留结束时间")
     private String stayEndTime;
     @ApiModelProperty(value = "车辆状态：1空车 2重车", example = "1")

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

@@ -26,6 +26,8 @@ public class DriverTruckTraceVO {
     private BigDecimal latitude;
     @ApiModelProperty(value = "GPS 时间")
     private String gpsTime;
+    @ApiModelProperty(value = "停留开始时间")
+    private String stayBeginTime;
     @ApiModelProperty(value = "停留结束时间")
     private String stayEndTime;
     @ApiModelProperty(value = "停留时长（min）", example = "12.3")

performance-web/src/main/java/com/clx/performance/dao/impl/vehiclewarn/VehicleWarnLogDaoImpl.java

@@ -4,15 +4,11 @@ package com.clx.performance.dao.impl.vehiclewarn;
 import com.clx.performance.dao.vehiclewarn.VehicleWarnLogDao;
 import com.clx.performance.mapper.vehiclewarn.VehicleWarnLogMapper;
 import com.clx.performance.model.vehiclewarn.VehicleWarnLog;
-import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class VehicleWarnLogDaoImpl extends BaseDaoImpl<VehicleWarnLogMapper, VehicleWarnLog, Integer> implements VehicleWarnLogDao {
 
-    @Override
-    public Optional<VehicleWarnLog> findById(Integer id) {
-        return null;
-    }
+
 }

performance-web/src/main/java/com/clx/performance/dao/vehiclewarn/VehicleWarnLogDao.java

@@ -2,11 +2,9 @@ package com.clx.performance.dao.vehiclewarn;
 
 import com.clx.performance.mapper.vehiclewarn.VehicleWarnLogMapper;
 import com.clx.performance.model.vehiclewarn.VehicleWarnLog;
-import com.msl.common.base.Optional;
 import com.msl.common.dao.BaseDao;
 
 public interface VehicleWarnLogDao extends BaseDao<VehicleWarnLogMapper, VehicleWarnLog, Integer> {
 
-    Optional<VehicleWarnLog> findById(Integer id);
 
 }

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

@@ -75,7 +75,8 @@ public class TruckTraceServiceImpl implements TruckTraceService {
                         .divide(new BigDecimal(60), 1, RoundingMode.HALF_UP);
                 for (int j= parkIdx; j<=i; j++){
                     traceList.get(j).setStayTime(stayTime);
-                    traceList.get(j).setStayEndTime(traceList.get(traceList.size()-1).getGpsTime());
+                    traceList.get(j).setStayBeginTime(traceList.get(parkIdx).getGpsTime());
+                    traceList.get(j).setStayEndTime(traceList.get(i).getGpsTime());
                 }
                 parkIdx = null;
             }
@@ -88,6 +89,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
                     .divide(new BigDecimal(60), 1, RoundingMode.HALF_UP);
             for (int j= parkIdx; j<=traceList.size()-1; j++){
                 traceList.get(j).setStayTime(stayTime);
+                traceList.get(j).setStayBeginTime(traceList.get(parkIdx).getGpsTime());
                 traceList.get(j).setStayEndTime(traceList.get(traceList.size()-1).getGpsTime());
             }
         }
@@ -113,6 +115,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
                         .divide(new BigDecimal(60), 1, RoundingMode.HALF_UP);
                 for (int j= parkIdx; j<=i; j++) {
                     traceList.get(j).setStayTime(stayTime);
+                    traceList.get(j).setStayBeginTime(traceList.get(parkIdx).getGpsTime());
                     traceList.get(j).setStayEndTime(traceList.get(i).getGpsTime());
                 }
                 parkIdx = null;
@@ -125,6 +128,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
                     .divide(new BigDecimal(60), 1, RoundingMode.HALF_UP);
             for (int j= parkIdx; j<=traceList.size()-1; j++) {
                 traceList.get(j).setStayTime(stayTime);
+                traceList.get(j).setStayBeginTime(traceList.get(parkIdx).getGpsTime());
                 traceList.get(j).setStayEndTime(traceList.get(traceList.size() - 1).getGpsTime());
             }
         }