运单预警

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

@@ -18,6 +18,8 @@ public class DriverTraceVO {
     private BigDecimal latitude;
     @ApiModelProperty(value = "GPS 时间")
     private String gpsTime;
+    @ApiModelProperty(value = "速度")
+    private BigDecimal speed;
     @ApiModelProperty(value = "停留时长（min）", example = "12.3")
     private BigDecimal stayTime=BigDecimal.ZERO;
     @ApiModelProperty(value = "车辆状态：1空车 2重车", example = "1")

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

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -47,11 +48,22 @@ public class TruckTraceServiceImpl implements TruckTraceService {
                 .orderByAsc("gpsTime")
         );
 
-        List<DriverTruckTraceVO> truckTraceList = truckTraceStruct.convert(list);
+        List<DriverTruckTraceVO> traceList = truckTraceStruct.convert(list);
 
         // 停留时长计算
+        Integer parkIdx = null;
+        for (int i=0; i<traceList.size(); i++){
+            if (traceList.get(i).getSpeed().compareTo(new BigDecimal(PARK_SPEED)) < 0){
+                parkIdx = i;
+            }
+            else {
+                if (parkIdx == null) {continue;}
+                long stayTime = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(i).getGpsTime())).getSeconds();
+                traceList.get(parkIdx).setStayTime(new BigDecimal(stayTime).divide(new BigDecimal(60), 1, RoundingMode.HALF_UP));
+            }
+        }
 
-        return truckTraceList;
+        return traceList;
     }
 
     @Override
@@ -63,10 +75,22 @@ public class TruckTraceServiceImpl implements TruckTraceService {
                 .orderByAsc("positionTime")
         );
 
-        List<DriverTraceVO> truckTraceList = driverTraceStruct.convert(list);
+        List<DriverTraceVO> traceList = driverTraceStruct.convert(list);
+
         // 停留时长计算
+        Integer parkIdx = null;
+        for (int i=0; i<traceList.size(); i++){
+            if (traceList.get(i).getSpeed().compareTo(new BigDecimal(PARK_SPEED)) < 0){
+                parkIdx = i;
+            }
+            else {
+                if (parkIdx == null) {continue;}
+                long stayTime = Duration.between(LocalDateTimeUtils.parseTime(traceList.get(parkIdx).getGpsTime()), LocalDateTimeUtils.parseTime(traceList.get(i).getGpsTime())).getSeconds();
+                traceList.get(parkIdx).setStayTime(new BigDecimal(stayTime).divide(new BigDecimal(60), 1, RoundingMode.HALF_UP));
+            }
+        }
 
-        return truckTraceList;
+        return traceList;
     }
 
 
@@ -179,7 +203,7 @@ public class TruckTraceServiceImpl implements TruckTraceService {
                     .le(DriverTraceESPlus::getPositionTime, endTime)
                     .orderByDesc("positionTime")
             );
-            return (int)Duration.between(LocalDateTimeUtils.parseTime(list.get(0).getGpsTime()), LocalDateTimeUtils.parseTime(list.get(list.size() - 1).getGpsTime())).toMinutes();
+            return (int)Duration.between(LocalDateTimeUtils.parseTime(list1.get(0).getPositionTime()), LocalDateTimeUtils.parseTime(list1.get(list1.size() - 1).getPositionTime())).toMinutes();
         }
 
         return 0;

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

@@ -110,6 +110,17 @@ public class VehicleWarnInfoServiceImpl implements VehicleWarnInfoService {
         List<DriverTruckTraceVO> truckTraceList = truckTraceService.listTruckTraceByTime(vehicleWarnInfo.getTruckNo(), LocalDateTimeUtils.formatTime(beginTime), LocalDateTimeUtils.formatTime(endTime));
         List<DriverTraceVO> driverTraceList = truckTraceService.listDriverTraceByTime(vehicleWarnInfo.getDriverUserNo(), LocalDateTimeUtils.formatTime(beginTime), LocalDateTimeUtils.formatTime(endTime));
 
+        // 接单重车、卸车空车
+        for (DriverTruckTraceVO item : truckTraceList) {
+            item.setTruckStatus(1);
+            if (orderChild.getCancelTime() != null){
+                if (LocalDateTimeUtils.parseTime(item.getGpsTime()).isAfter(orderChild.getCancelTime())){item.setTruckStatus(0);}
+            }
+            if (orderChild.getUnloadTime() != null){
+                if (LocalDateTimeUtils.parseTime(item.getGpsTime()).isAfter(orderChild.getUnloadTime())){item.setTruckStatus(0);}
+            }
+        }
+
         VehicleTraceVO result = new VehicleTraceVO();
         result.setDriverTraceList(driverTraceList);
         result.setTruckTraceList(truckTraceList);