统计接口计算优化

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/GatekeeperOrderService.java

@@ -490,9 +490,7 @@ public class GatekeeperOrderService {
             resp.setOrderStatusStatistics(buildDefaultStatusStatistics());
             return resp;
         }
-        List<GatekeeperOrderResp> gatekeeperOrderPageResult = getGatekeeperOrderPageResult(orderList);
-        log.info("统计查询门卫订单数据, size:{}",  gatekeeperOrderPageResult.size());
-        resp.setOrderStatusStatistics(calculateStatusStatistics(gatekeeperOrderPageResult));
+        resp.setOrderStatusStatistics(calculateStatusStatistics(orderList));
         return resp;
 
     }
@@ -533,11 +531,11 @@ public class GatekeeperOrderService {
 
     /**
      * 计算运单状态统计
-     * @param gatekeeperOrderList
+     * @param orderList
      * @return
      */
-    private static List<StatisticsWaybillResp.OrderBillStatusStatistics> calculateStatusStatistics(List<GatekeeperOrderResp> gatekeeperOrderList) {
-        log.info("开始统计计算,param：{}", JSON.toJSONString(gatekeeperOrderList));
+    private static List<StatisticsWaybillResp.OrderBillStatusStatistics> calculateStatusStatistics(List<KwtGatekeeperWaybillOrder> orderList) {
+        log.info("开始统计计算,param：{}", JSON.toJSONString(orderList));
         //车辆停留超时配置
         double configHours = 2000;
 
@@ -550,7 +548,7 @@ public class GatekeeperOrderService {
         );
 
         // 按原始状态统计数量
-        Map<String, Long> statusCountMap = gatekeeperOrderList.stream()
+        Map<String, Long> statusCountMap = orderList.stream()
                 .collect(Collectors.groupingBy(va ->String.valueOf(va.getStatus()), Collectors.counting()));
         log.info("按原始状态统计数量:{}", JSON.toJSONString(statusCountMap));
 
@@ -563,7 +561,7 @@ public class GatekeeperOrderService {
 
                     // 处理状态为4的异常车辆
                     if (Objects.equals(aggregateInfo[0],"4")) {
-                        totalNum = gatekeeperOrderList.stream().filter(order -> {
+                        totalNum = orderList.stream().filter(order -> {
                             // 1. 必须包含在定义的异常状态源中 (5,10,15)
                             if (!originalStatuses.contains(String.valueOf(order.getStatus()))) {
                                 return false;