|
@@ -490,6 +490,7 @@ public class GatekeeperOrderService {
|
|
|
return resp;
|
|
return resp;
|
|
|
}
|
|
}
|
|
|
List<GatekeeperOrderResp> gatekeeperOrderPageResult = getGatekeeperOrderPageResult(orderList);
|
|
List<GatekeeperOrderResp> gatekeeperOrderPageResult = getGatekeeperOrderPageResult(orderList);
|
|
|
|
|
+ log.info("统计查询门卫订单数据:{}, size:{}", JSON.toJSONString(gatekeeperOrderPageResult), gatekeeperOrderPageResult.size());
|
|
|
resp.setOrderStatusStatistics(calculateStatusStatistics(gatekeeperOrderPageResult));
|
|
resp.setOrderStatusStatistics(calculateStatusStatistics(gatekeeperOrderPageResult));
|
|
|
return resp;
|
|
return resp;
|
|
|
|
|
|
|
@@ -535,6 +536,7 @@ public class GatekeeperOrderService {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
private static List<StatisticsWaybillResp.OrderBillStatusStatistics> calculateStatusStatistics(List<GatekeeperOrderResp> gatekeeperOrderList) {
|
|
private static List<StatisticsWaybillResp.OrderBillStatusStatistics> calculateStatusStatistics(List<GatekeeperOrderResp> gatekeeperOrderList) {
|
|
|
|
|
+ log.info("开始统计计算,param:{}", JSON.toJSONString(gatekeeperOrderList));
|
|
|
//车辆停留超时配置
|
|
//车辆停留超时配置
|
|
|
double configHours = 2000;
|
|
double configHours = 2000;
|
|
|
|
|
|
|
@@ -553,7 +555,7 @@ public class GatekeeperOrderService {
|
|
|
// 进行状态聚合
|
|
// 进行状态聚合
|
|
|
List<StatisticsWaybillResp.OrderBillStatusStatistics> aggregatedList = aggregateRules.entrySet().stream()
|
|
List<StatisticsWaybillResp.OrderBillStatusStatistics> aggregatedList = aggregateRules.entrySet().stream()
|
|
|
.map(rule -> {
|
|
.map(rule -> {
|
|
|
- String[] aggregateInfo = rule.getKey();
|
|
|
|
|
|
|
+ String[] aggregateInfo = rule. getKey();
|
|
|
List<String> originalStatuses = rule.getValue();
|
|
List<String> originalStatuses = rule.getValue();
|
|
|
long totalNum = 0;
|
|
long totalNum = 0;
|
|
|
|
|
|
|
@@ -577,6 +579,7 @@ public class GatekeeperOrderService {
|
|
|
totalNum = originalStatuses.stream()
|
|
totalNum = originalStatuses.stream()
|
|
|
.mapToLong(status -> statusCountMap.getOrDefault(status, 0L))
|
|
.mapToLong(status -> statusCountMap.getOrDefault(status, 0L))
|
|
|
.sum();
|
|
.sum();
|
|
|
|
|
+ log.info("{}状态统计,num:{}", JSON.toJSONString(aggregateInfo[1]), totalNum);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 构建聚合结果对象
|
|
// 构建聚合结果对象
|
|
@@ -588,6 +591,7 @@ public class GatekeeperOrderService {
|
|
|
})
|
|
})
|
|
|
.sorted(Comparator.comparing(StatisticsWaybillResp.OrderBillStatusStatistics::getOrderStatus))
|
|
.sorted(Comparator.comparing(StatisticsWaybillResp.OrderBillStatusStatistics::getOrderStatus))
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
|
|
+ log.info("统计计算完成,result:{}", JSON.toJSONString(aggregatedList));
|
|
|
return aggregatedList;
|
|
return aggregatedList;
|
|
|
}
|
|
}
|
|
|
|
|
|