运单预警

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/service/impl/trace/TruckTraceServiceImpl.java

@@ -74,7 +74,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;
             }
@@ -87,6 +88,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());
             }
         }
@@ -112,6 +114,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;
@@ -124,6 +127,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());
             }
         }