From e67c67d99119e35c9fd476ea674f42f84b7153f4 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 04 八月 2026 20:40:54 +0800
Subject: [PATCH] fix: 加盟商看板慢查询优化（SQL聚合下推/分块反查/物理索引）
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 289 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 179 insertions(+), 110 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 7c84c41..3bd56f5 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -58,6 +58,7 @@
import com.ruoyi.order.dto.MyChargingOrderList;
import com.ruoyi.order.dto.OrderEvaluateVo;
import com.ruoyi.order.dto.*;
+import com.ruoyi.order.mapper.TChargingOrderMapper;
import com.ruoyi.order.export.PayOrderExport;
import com.ruoyi.order.export.EnterpriseChargingDetailExport;
import com.ruoyi.order.service.*;
@@ -195,32 +196,39 @@
@Resource
private SysUserRoleClient sysUserRoleClient;
+ @Resource
+ private TChargingOrderMapper chargingOrderMapper;
+
+ /** 尖峰平谷反查时分块 IN 的上限，避免超大 IN 触发 MyCat 读超时。 */
+ private static final int PHASE_ID_BATCH_SIZE = 5000;
+
@GetMapping("/reservationRecommendation")
@ApiOperation(value = "获取站点预约充电推荐时段", tags = {"管理后台-充电桩信息"})
public R<ReservationRecommendationVO> getReservationRecommendation(@RequestParam Integer siteId) {
return R.ok(chargingOrderService.getReservationRecommendation(siteId));
}
- /** 小程序加盟商看板：站点范围始终从登录账号绑定关系解析。 */
+ /** 小程序加盟商看板：站点范围始终从登录账号绑定关系解析。聚合查询下推到分片，避免全量拉订单。 */
@PostMapping("/app/franchisee/charge-data")
public R<Map<String, Object>> franchiseeChargeData(@RequestBody(required = false) Map<String, Object> params) {
- List<TChargingOrder> orders = franchiseeOrders(params);
+ List<Integer> siteIds = franchiseeSiteIds(params);
LocalDateTime[] range = franchiseeRange(params);
+ List<FranchiseeDayStat> dayStats = franchiseeDayStats(siteIds, range);
Map<String, Object> summary = new LinkedHashMap<>();
- summary.put("orderAmountWan", sum(orders, TChargingOrder::getOrderAmount).divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP));
- summary.put("serviceFeeWan", sum(orders, TChargingOrder::getServiceCharge).divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP));
- summary.put("chargingPowerWan", sum(orders, TChargingOrder::getChargingCapacity).divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP));
- summary.put("chargingAmount", sum(orders, TChargingOrder::getPaymentAmount));
- summary.put("chargingOrderCount", orders.size());
- summary.put("powerUtilizationRate", observedPowerUtilization(orders));
- summary.put("demandPowerSatisfactionRate", demandPowerSatisfaction(orders));
+ summary.put("orderAmountWan", sum(dayStats, FranchiseeDayStat::getOrderAmount).divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP));
+ summary.put("serviceFeeWan", sum(dayStats, FranchiseeDayStat::getServiceFee).divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP));
+ summary.put("chargingPowerWan", sum(dayStats, FranchiseeDayStat::getCapacity).divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP));
+ summary.put("chargingAmount", sum(dayStats, FranchiseeDayStat::getPaymentAmount));
+ summary.put("chargingOrderCount", dayStats.stream().mapToLong(stat -> numberValue(stat.getOrderCount())).sum());
+ summary.put("powerUtilizationRate", observedPowerUtilization(dayStats));
+ summary.put("demandPowerSatisfactionRate", demandPowerSatisfaction(dayStats));
Map<String, Object> result = new LinkedHashMap<>();
result.put("summary", summary);
- result.put("keyDataLine", franchiseeDailyTrend(orders, range, "订单金额", order -> firstNonNull(order.getOrderAmount(), order.getPaymentAmount())));
- result.put("keyDataRing", franchiseePhaseRing(orders));
- result.put("orderStats", franchiseeOrderTrend(orders, range));
- result.put("efficiency", franchiseeEfficiencyTrend(orders, range));
- result.put("powerDistribution", franchiseePowerDistribution(orders));
+ result.put("keyDataLine", franchiseeDailyTrend(dayStats, range, "订单金额", FranchiseeDayStat::getOrderAmountEffective));
+ result.put("keyDataRing", franchiseePhaseRing(siteIds, range));
+ result.put("orderStats", franchiseeOrderTrend(dayStats, range));
+ result.put("efficiency", franchiseeEfficiencyTrend(dayStats, range));
+ result.put("powerDistribution", franchiseePowerDistribution(siteIds, range));
return R.ok(result);
}
@@ -229,20 +237,21 @@
List<Integer> siteIds = franchiseeSiteIds(params);
LocalDate firstMonth = YearMonth.now().minusMonths(5).atDay(1);
LocalDate nextMonth = YearMonth.now().plusMonths(1).atDay(1);
- List<TChargingOrder> orders = franchiseeOrders(siteIds, firstMonth.atStartOfDay(), nextMonth.atStartOfDay());
+ List<FranchiseeDayStat> dayStats = franchiseeDayStats(siteIds,
+ new LocalDateTime[]{firstMonth.atStartOfDay(), nextMonth.atStartOfDay()});
Map<String, Object> result = new LinkedHashMap<>();
- result.put("totalIncome", sum(orders, TChargingOrder::getPaymentAmount));
- result.put("electricityFee", sum(orders, TChargingOrder::getElectrovalence));
- result.put("serviceFee", sum(orders, TChargingOrder::getServiceCharge));
- result.put("incomeColumn", franchiseeIncomeTrend(orders, firstMonth, 6));
+ result.put("totalIncome", sum(dayStats, FranchiseeDayStat::getPaymentAmount));
+ result.put("electricityFee", sum(dayStats, FranchiseeDayStat::getElectrovalence));
+ result.put("serviceFee", sum(dayStats, FranchiseeDayStat::getServiceFee));
+ result.put("incomeColumn", franchiseeIncomeTrend(dayStats, firstMonth, 6));
List<Map<String, Object>> incomePie = new ArrayList<>();
Map<String, Object> electricityItem = new LinkedHashMap<>();
electricityItem.put("name", "充电费");
- electricityItem.put("value", sum(orders, TChargingOrder::getElectrovalence));
+ electricityItem.put("value", sum(dayStats, FranchiseeDayStat::getElectrovalence));
incomePie.add(electricityItem);
Map<String, Object> serviceItem = new LinkedHashMap<>();
serviceItem.put("name", "服务费");
- serviceItem.put("value", sum(orders, TChargingOrder::getServiceCharge));
+ serviceItem.put("value", sum(dayStats, FranchiseeDayStat::getServiceFee));
incomePie.add(serviceItem);
result.put("incomePie", incomePie);
return R.ok(result);
@@ -253,10 +262,14 @@
Partner partner = franchiseePartner();
List<Integer> siteIds = partner == null ? Collections.emptyList() : franchiseeSiteIds(params, partner.getId());
LocalDateTime[] range = franchiseeRange(params);
- List<TChargingOrder> orders = franchiseeOrders(siteIds, range[0], range[1]).stream()
- .filter(order -> Objects.equals(order.getStatus(), 5))
- .collect(Collectors.toList());
- Set<Long> users = orders.stream().map(TChargingOrder::getAppUserId).filter(Objects::nonNull).collect(Collectors.toSet());
+ List<FranchiseeUserAgg> aggs = franchiseeUserAggs(siteIds, range);
+ Map<LocalDate, Set<Long>> chargingUsersByDay = new LinkedHashMap<>();
+ for (FranchiseeUserAgg agg : aggs) {
+ if (agg == null || agg.getAppUserId() == null || agg.getStatDay() == null) {
+ continue;
+ }
+ chargingUsersByDay.computeIfAbsent(agg.getStatDay(), key -> new HashSet<>()).add(agg.getAppUserId());
+ }
List<TPartnerAppUser> relations = Collections.emptyList();
if (partner != null && partner.getId() != null) {
R<List<TPartnerAppUser>> relationResult = partnerClient.getBoundAppUserRelations(partner.getId());
@@ -264,9 +277,10 @@
relations = relationResult.getData();
}
}
- FranchiseeUserStatistics.Result userStatistics = FranchiseeUserStatistics.calculate(
- orders, relations, range[0], range[1]);
+ FranchiseeUserStatistics.Result userStatistics = FranchiseeUserStatistics.calculateByUserDays(
+ chargingUsersByDay, relations, range[0], range[1]);
+ Set<Long> users = aggs.stream().map(FranchiseeUserAgg::getAppUserId).filter(Objects::nonNull).collect(Collectors.toSet());
List<TAppUser> appUsers = Collections.emptyList();
if (!users.isEmpty()) {
R<List<TAppUser>> userResult = appUserClient.getUserByIds(new ArrayList<>(users));
@@ -275,7 +289,7 @@
Map<Long, TAppUser> userMap = appUsers.stream().filter(user -> user.getId() != null)
.collect(Collectors.toMap(TAppUser::getId, user -> user, (left, right) -> left));
- List<Long> carIds = orders.stream().map(TChargingOrder::getAppUserCarId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ List<Long> carIds = aggs.stream().map(FranchiseeUserAgg::getAppUserCarId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
List<TAppUserCar> cars = Collections.emptyList();
if (!carIds.isEmpty()) {
R<List<TAppUserCar>> carResult = appUserCarClient.getCarByIds(carIds);
@@ -286,18 +300,18 @@
Map<String, Object> result = new LinkedHashMap<>();
result.put("summary", userStatistics.getSummary());
result.put("userStats", userStatistics.getTrend());
- result.put("userTags", franchiseeUserTags(orders));
+ result.put("userTags", franchiseeUserTags(aggs));
Map<Integer, String> vipNames = new HashMap<>();
R<List<TVip>> vipResult = vipClient.getAllVip();
if (vipResult != null && vipResult.getData() != null) vipResult.getData().forEach(vip -> vipNames.put(vip.getId(), vip.getName()));
result.put("memberType", franchiseeMemberTypes(appUsers, vipNames));
- result.put("corpRank", franchiseeCompanyRank(orders, userMap));
+ result.put("corpRank", franchiseeCompanyRank(aggs, userMap));
result.put("evaluation", evaluation.get("summary"));
result.put("goodTags", evaluation.get("goodTags"));
result.put("badTags", evaluation.get("badTags"));
- result.put("traffic", franchiseeTraffic(orders));
- result.put("vehicleClass", franchiseeOrderCarGroup(orders, cars, TAppUserCar::getVehicleUse, "未知用途", 5));
- result.put("vehicleBrand", franchiseeOrderCarGroup(orders, cars, TAppUserCar::getVehicleBrand, "其他", 5));
+ result.put("traffic", franchiseeTraffic(siteIds, range));
+ result.put("vehicleClass", franchiseeOrderCarGroup(aggs, cars, TAppUserCar::getVehicleUse, "未知用途", 5));
+ result.put("vehicleBrand", franchiseeOrderCarGroup(aggs, cars, TAppUserCar::getVehicleBrand, "其他", 5));
return R.ok(result);
}
@@ -317,26 +331,34 @@
BigDecimal total = BigDecimal.valueOf(guns.size());
BigDecimal available = BigDecimal.valueOf(guns.stream().filter(this::isAvailableGun).count());
BigDecimal fault = countGuns(guns, 7), offline = countGuns(guns, 1);
- List<TChargingOrder> operationOrders = franchiseeOrders(params);
- BigDecimal powerSatisfaction = demandPowerSatisfaction(operationOrders);
+ LocalDateTime[] range = franchiseeRange(params);
+ List<FranchiseeDayStat> operationStats = franchiseeDayStats(siteIds, range);
+ BigDecimal powerSatisfaction = demandPowerSatisfaction(operationStats);
+ Map<Integer, FranchiseeGunSat> gunSatMap = Collections.emptyMap();
+ if (!siteIds.isEmpty() && range[0] != null && range[1] != null) {
+ gunSatMap = chargingOrderMapper.franchiseeGunSatisfaction(siteIds, range[0], range[1]).stream()
+ .filter(sat -> sat != null && sat.getChargingGunId() != null)
+ .collect(Collectors.toMap(FranchiseeGunSat::getChargingGunId, sat -> sat, (left, right) -> left));
+ }
Map<String, Object> summary = new LinkedHashMap<>(); summary.put("availableRate", rate(available, total)); summary.put("faultRate", rate(fault, total)); summary.put("offlineRate", rate(offline, total)); summary.put("powerSatisfactionRate", powerSatisfaction);
- result.put("summary", summary); result.put("dcCharts", operationCharts(guns, operationOrders, true)); result.put("acCharts", operationCharts(guns, operationOrders, false));
+ result.put("summary", summary); result.put("dcCharts", operationCharts(guns, gunSatMap, true)); result.put("acCharts", operationCharts(guns, gunSatMap, false));
return R.ok(result);
}
- private List<TChargingOrder> franchiseeOrders(Map<String, Object> params) {
- List<Integer> siteIds = franchiseeSiteIds(params);
- if (siteIds.isEmpty()) return Collections.emptyList();
- LocalDateTime[] range = franchiseeRange(params);
- return franchiseeOrders(siteIds, range[0], range[1]);
+ /** 加盟商看板按日聚合（siteIds 为空直接返回空，避免空 IN）。 */
+ private List<FranchiseeDayStat> franchiseeDayStats(List<Integer> siteIds, LocalDateTime[] range) {
+ if (siteIds == null || siteIds.isEmpty() || range == null || range[0] == null || range[1] == null) {
+ return Collections.emptyList();
+ }
+ return chargingOrderMapper.franchiseeDayStats(siteIds, range[0], range[1]);
}
- private List<TChargingOrder> franchiseeOrders(List<Integer> siteIds, LocalDateTime start, LocalDateTime end) {
- if (siteIds == null || siteIds.isEmpty()) return Collections.emptyList();
- LambdaQueryWrapper<TChargingOrder> query = Wrappers.lambdaQuery(TChargingOrder.class).in(TChargingOrder::getSiteId, siteIds).eq(TChargingOrder::getDelFlag, 0).eq(TChargingOrder::getRechargePaymentStatus, 2);
- if (start != null) query.ge(TChargingOrder::getEndTime, start);
- if (end != null) query.lt(TChargingOrder::getEndTime, end);
- return chargingOrderService.list(query);
+ /** 加盟商看板用户维度聚合（仅已结束订单；siteIds 为空直接返回空）。 */
+ private List<FranchiseeUserAgg> franchiseeUserAggs(List<Integer> siteIds, LocalDateTime[] range) {
+ if (siteIds == null || siteIds.isEmpty() || range == null || range[0] == null || range[1] == null) {
+ return Collections.emptyList();
+ }
+ return chargingOrderMapper.franchiseeUserAggs(siteIds, range[0], range[1]);
}
private List<Integer> franchiseeSiteIds(Map<String, Object> params) {
@@ -363,9 +385,9 @@
return siteIds;
}
- private List<Map<String, Object>> franchiseeUserTags(List<TChargingOrder> orders) {
- Set<Long> userIds = orders.stream()
- .map(TChargingOrder::getAppUserId)
+ private List<Map<String, Object>> franchiseeUserTags(List<FranchiseeUserAgg> aggs) {
+ Set<Long> userIds = aggs.stream()
+ .map(FranchiseeUserAgg::getAppUserId)
.filter(Objects::nonNull)
.collect(Collectors.toSet());
if (userIds.isEmpty()) {
@@ -408,12 +430,12 @@
return result;
}
- private Map<String, Object> franchiseeCompanyRank(List<TChargingOrder> orders, Map<Long, TAppUser> userMap) {
+ private Map<String, Object> franchiseeCompanyRank(List<FranchiseeUserAgg> aggs, Map<Long, TAppUser> userMap) {
Map<Integer, BigDecimal> totals = new HashMap<>();
- orders.forEach(order -> {
- TAppUser user = userMap.get(order.getAppUserId());
+ aggs.forEach(agg -> {
+ TAppUser user = userMap.get(agg.getAppUserId());
if (user != null && user.getCompanyId() != null) {
- totals.merge(user.getCompanyId(), value(order.getChargingCapacity()), BigDecimal::add);
+ totals.merge(user.getCompanyId(), value(agg.getCapacity()), BigDecimal::add);
}
});
List<Map.Entry<Integer, BigDecimal>> sorted = totals.entrySet().stream()
@@ -451,22 +473,22 @@
result.put("goodTags", safeList(orderEvaluateService.goodTop(siteIds))); result.put("badTags", safeList(orderEvaluateService.badTop(siteIds))); return result;
}
- private List<Map<String, Object>> franchiseeTraffic(List<TChargingOrder> orders) {
- Map<String, Long> counts = orders.stream().collect(Collectors.groupingBy(order -> {
- String source = order.getTripartitePlatformName(); return source == null || source.isEmpty() ? "明星充电" : source;
- }, Collectors.counting()));
- return counts.entrySet().stream().map(entry -> namedCount(entry.getKey(), entry.getValue())).collect(Collectors.toList());
+ private List<Map<String, Object>> franchiseeTraffic(List<Integer> siteIds, LocalDateTime[] range) {
+ if (siteIds == null || siteIds.isEmpty() || range == null || range[0] == null || range[1] == null) {
+ return Collections.emptyList();
+ }
+ List<Map<String, Object>> result = new ArrayList<>();
+ chargingOrderMapper.franchiseeTrafficStats(siteIds, range[0], range[1]).forEach(stat -> {
+ if (stat == null || stat.getOrderCount() == null || stat.getOrderCount() == 0) {
+ return;
+ }
+ String source = stat.getSource() == null || stat.getSource().isEmpty() ? "明星充电" : stat.getSource();
+ result.add(namedCount(source, stat.getOrderCount()));
+ });
+ return result;
}
- private List<Map<String, Object>> franchiseeCarGroup(List<TAppUserCar> cars, java.util.function.Function<TAppUserCar, String> getter, String emptyName, int limit) {
- Map<String, Long> counts = cars.stream().collect(Collectors.groupingBy(car -> {
- String value = getter.apply(car); return value == null || value.trim().isEmpty() ? emptyName : value;
- }, Collectors.counting()));
- return counts.entrySet().stream().sorted(Map.Entry.<String, Long>comparingByValue().reversed()).limit(limit)
- .map(entry -> namedCount(entry.getKey(), entry.getValue())).collect(Collectors.toList());
- }
-
- private List<Map<String, Object>> franchiseeOrderCarGroup(List<TChargingOrder> orders,
+ private List<Map<String, Object>> franchiseeOrderCarGroup(List<FranchiseeUserAgg> aggs,
List<TAppUserCar> cars,
java.util.function.Function<TAppUserCar, String> getter,
String emptyName,
@@ -474,11 +496,15 @@
Map<Long, TAppUserCar> carsById = cars.stream()
.filter(car -> car.getId() != null)
.collect(Collectors.toMap(TAppUserCar::getId, car -> car, (left, right) -> left));
- Map<String, Long> counts = orders.stream().collect(Collectors.groupingBy(order -> {
- TAppUserCar car = carsById.get(order.getAppUserCarId());
+ Map<String, Long> counts = new HashMap<>();
+ aggs.forEach(agg -> {
+ if (agg == null || agg.getOrderCount() == null) {
+ return;
+ }
+ TAppUserCar car = agg.getAppUserCarId() == null ? null : carsById.get(agg.getAppUserCarId());
String value = car == null ? null : getter.apply(car);
- return value == null || value.trim().isEmpty() ? emptyName : value;
- }, Collectors.counting()));
+ counts.merge(value == null || value.trim().isEmpty() ? emptyName : value, agg.getOrderCount(), Long::sum);
+ });
return counts.entrySet().stream().sorted(Map.Entry.<String, Long>comparingByValue().reversed()).limit(limit)
.map(entry -> namedCount(entry.getKey(), entry.getValue())).collect(Collectors.toList());
}
@@ -497,7 +523,7 @@
private BigDecimal countGuns(List<TChargingGun> guns, int status) { return BigDecimal.valueOf(guns.stream().filter(gun -> Objects.equals(gun.getStatus(), status)).count()); }
private boolean isAvailableGun(TChargingGun gun) { return gun.getStatus() != null && gun.getStatus() >= 2 && gun.getStatus() <= 6; }
private BigDecimal rate(BigDecimal numerator, BigDecimal denominator) { return denominator.signum() == 0 ? BigDecimal.ZERO : numerator.multiply(BigDecimal.valueOf(100)).divide(denominator, 2, RoundingMode.HALF_UP); }
- private List<Map<String, Object>> operationCharts(List<TChargingGun> guns, List<TChargingOrder> orders, boolean dc) {
+ private List<Map<String, Object>> operationCharts(List<TChargingGun> guns, Map<Integer, FranchiseeGunSat> gunSatMap, boolean dc) {
List<TChargingGun> selected = guns.stream().filter(gun -> dc ? Objects.equals(gun.getType(), 4) : gun.getType() != null && gun.getType() >= 1 && gun.getType() <= 3).collect(Collectors.toList());
List<Map<String, Object>> charts = new ArrayList<>();
String[] keys = {"availableRate", "faultRate", "offlineRate", "powerSatisfactionRate"}; int[] statuses = {0, 7, 1, 0};
@@ -507,12 +533,20 @@
List<String> categories = selected.stream().map(TChargingGun::getName).map(name -> name == null ? "未命名充电枪" : name).collect(Collectors.toList());
final int metricIndex = i;
List<BigDecimal> values = selected.stream().map(gun -> metricIndex == 3
- ? demandPowerSatisfaction(orders.stream().filter(order -> Objects.equals(order.getChargingGunId(), gun.getId())).collect(Collectors.toList()))
+ ? gunSatisfaction(gunSatMap, gun.getId())
: BigDecimal.valueOf(metricIndex == 0 ? (isAvailableGun(gun) ? 100 : 0) : (Objects.equals(gun.getStatus(), status) ? 100 : 0))).collect(Collectors.toList());
chart.put("categories", categories);
Map<String, Object> series = new LinkedHashMap<>(); series.put("name", names[i]); series.put("data", values); chart.put("series", Collections.singletonList(series)); charts.add(chart);
}
return charts;
+ }
+
+ private BigDecimal gunSatisfaction(Map<Integer, FranchiseeGunSat> gunSatMap, Integer gunId) {
+ FranchiseeGunSat sat = gunId == null ? null : gunSatMap.get(gunId);
+ if (sat == null || sat.getSatCount() == null || sat.getSatCount() == 0) {
+ return BigDecimal.ZERO;
+ }
+ return value(sat.getSatSum()).divide(BigDecimal.valueOf(sat.getSatCount()), 2, RoundingMode.HALF_UP);
}
private LocalDateTime[] franchiseeRange(Map<String, Object> params) {
@@ -535,76 +569,111 @@
return new LocalDateTime[]{today.atStartOfDay(), today.plusDays(1).atStartOfDay()};
}
- private BigDecimal sum(List<TChargingOrder> orders, java.util.function.Function<TChargingOrder, BigDecimal> getter) { return orders.stream().map(getter).map(this::value).reduce(BigDecimal.ZERO, BigDecimal::add); }
- private BigDecimal firstNonNull(BigDecimal first, BigDecimal second) { return first != null ? first : value(second); }
+ private <T> BigDecimal sum(List<T> items, java.util.function.Function<T, BigDecimal> getter) { return items.stream().map(getter).map(this::value).reduce(BigDecimal.ZERO, BigDecimal::add); }
private BigDecimal value(BigDecimal value) { return value == null ? BigDecimal.ZERO : value; }
- private Map<String, Object> franchiseeTrend(List<TChargingOrder> orders, String name, java.util.function.Function<TChargingOrder, BigDecimal> getter) { Map<String, Object> chart = new LinkedHashMap<>(); chart.put("categories", Collections.singletonList(LocalDate.now().toString())); Map<String, Object> series = new LinkedHashMap<>(); series.put("name", name); series.put("data", Collections.singletonList(sum(orders, getter))); chart.put("series", new ArrayList<>(Collections.singletonList(series))); return chart; }
- private Map<String, Object> franchiseeDailyTrend(List<TChargingOrder> orders, LocalDateTime[] range, String name, java.util.function.Function<TChargingOrder, BigDecimal> getter) {
+ private Map<LocalDate, FranchiseeDayStat> dayStatByDay(List<FranchiseeDayStat> stats) {
+ return stats.stream().filter(stat -> stat != null && stat.getStatDay() != null)
+ .collect(Collectors.toMap(FranchiseeDayStat::getStatDay, stat -> stat, (left, right) -> left));
+ }
+ private Map<String, Object> franchiseeDailyTrend(List<FranchiseeDayStat> stats, LocalDateTime[] range, String name, java.util.function.Function<FranchiseeDayStat, BigDecimal> getter) {
+ Map<LocalDate, FranchiseeDayStat> byDay = dayStatByDay(stats);
List<String> categories = new ArrayList<>(); List<BigDecimal> data = new ArrayList<>();
LocalDate start = range[0] == null ? LocalDate.now() : range[0].toLocalDate();
LocalDate end = range[1] == null ? start.plusDays(1) : range[1].toLocalDate();
for (LocalDate day = start; day.isBefore(end); day = day.plusDays(1)) {
categories.add(day.toString().substring(5));
- LocalDateTime dayStart = day.atStartOfDay(), dayEnd = day.plusDays(1).atStartOfDay();
- data.add(sum(orders.stream().filter(order -> order.getEndTime() != null && !order.getEndTime().isBefore(dayStart) && order.getEndTime().isBefore(dayEnd)).collect(Collectors.toList()), getter));
+ FranchiseeDayStat stat = byDay.get(day);
+ data.add(stat == null ? BigDecimal.ZERO : value(getter.apply(stat)));
}
Map<String, Object> chart = new LinkedHashMap<>(); chart.put("categories", categories);
Map<String, Object> series = new LinkedHashMap<>(); series.put("name", name); series.put("data", data); chart.put("series", new ArrayList<>(Collections.singletonList(series))); return chart;
}
- private Map<String, Object> franchiseeOrderTrend(List<TChargingOrder> orders, LocalDateTime[] range) {
- Map<String, Object> chart = franchiseeDailyTrend(orders, range, "充电金额", order -> firstNonNull(order.getPaymentAmount(), order.getOrderAmount()));
+ private Map<String, Object> franchiseeOrderTrend(List<FranchiseeDayStat> stats, LocalDateTime[] range) {
+ Map<String, Object> chart = franchiseeDailyTrend(stats, range, "充电金额", FranchiseeDayStat::getOrderAmountEffective);
((List<Map<String, Object>>) chart.get("series")).get(0).put("type", "column");
+ Map<LocalDate, FranchiseeDayStat> byDay = dayStatByDay(stats);
List<BigDecimal> countData = new ArrayList<>(); List<String> categories = (List<String>) chart.get("categories");
LocalDate start = range[0] == null ? LocalDate.now() : range[0].toLocalDate();
- for (int i = 0; i < categories.size(); i++) { LocalDate day = start.plusDays(i); LocalDateTime dayStart = day.atStartOfDay(), dayEnd = day.plusDays(1).atStartOfDay(); countData.add(BigDecimal.valueOf(orders.stream().filter(order -> order.getEndTime() != null && !order.getEndTime().isBefore(dayStart) && order.getEndTime().isBefore(dayEnd)).count())); }
+ for (int i = 0; i < categories.size(); i++) { LocalDate day = start.plusDays(i); FranchiseeDayStat stat = byDay.get(day); countData.add(BigDecimal.valueOf(stat == null ? 0L : numberValue(stat.getOrderCount()))); }
Map<String, Object> countSeries = new LinkedHashMap<>(); countSeries.put("name", "充电订单"); countSeries.put("data", countData); countSeries.put("type", "line"); countSeries.put("style", "curve"); countSeries.put("index", 1); ((List<Map<String, Object>>) chart.get("series")).add(countSeries); return chart;
}
- private Map<String, Object> franchiseePhaseRing(List<TChargingOrder> orders) {
+ private Map<String, Object> franchiseePhaseRing(List<Integer> siteIds, LocalDateTime[] range) {
Map<Integer, BigDecimal> phase = new LinkedHashMap<>(); phase.put(1, BigDecimal.ZERO); phase.put(2, BigDecimal.ZERO); phase.put(3, BigDecimal.ZERO); phase.put(4, BigDecimal.ZERO);
- List<Long> ids = orders.stream().map(TChargingOrder::getId).filter(Objects::nonNull).collect(Collectors.toList());
- if (!ids.isEmpty()) { chargingOrderAccountingStrategyService.lambdaQuery().in(TChargingOrderAccountingStrategy::getChargingOrderId, ids).list().forEach(item -> phase.computeIfPresent(item.getType(), (key, total) -> total.add(value(item.getChargingCapacity())))); }
+ if (siteIds != null && !siteIds.isEmpty() && range != null && range[0] != null && range[1] != null) {
+ List<Long> ids = chargingOrderMapper.franchiseeOrderIds(siteIds, range[0], range[1]);
+ for (int from = 0; from < ids.size(); from += PHASE_ID_BATCH_SIZE) {
+ List<Long> chunk = ids.subList(from, Math.min(from + PHASE_ID_BATCH_SIZE, ids.size()));
+ chargingOrderMapper.franchiseePhaseStatsByOrderIds(chunk).forEach(item -> {
+ if (item != null && item.getType() != null) {
+ phase.computeIfPresent(item.getType(), (key, total) -> total.add(value(item.getCapacity())));
+ }
+ });
+ }
+ }
String[] names = {"尖", "峰", "平", "谷"}; List<Map<String, Object>> data = new ArrayList<>();
for (int i = 1; i <= 4; i++) { Map<String, Object> item = new LinkedHashMap<>(); item.put("name", names[i - 1]); item.put("value", phase.get(i)); data.add(item); }
Map<String, Object> chart = new LinkedHashMap<>(); chart.put("series", Collections.singletonList(Collections.singletonMap("data", data))); return chart;
}
- private Map<String, Object> franchiseeEfficiencyTrend(List<TChargingOrder> orders, LocalDateTime[] range) {
- Map<String, Object> chart = franchiseeDailyTrend(orders, range, "功率", order -> value(order.getChargingPower() == null ? order.getPower() : order.getChargingPower()));
- List<BigDecimal> powerData = new ArrayList<>(), utilization = new ArrayList<>(); List<String> categories = (List<String>) chart.get("categories");
+ private Map<String, Object> franchiseeEfficiencyTrend(List<FranchiseeDayStat> stats, LocalDateTime[] range) {
+ Map<LocalDate, FranchiseeDayStat> byDay = dayStatByDay(stats);
+ List<String> categories = new ArrayList<>();
+ List<BigDecimal> powerData = new ArrayList<>(), utilization = new ArrayList<>();
LocalDate start = range[0] == null ? LocalDate.now() : range[0].toLocalDate();
- for (int i = 0; i < categories.size(); i++) { LocalDate day = start.plusDays(i); LocalDateTime dayStart = day.atStartOfDay(), dayEnd = day.plusDays(1).atStartOfDay(); List<TChargingOrder> dayOrders = orders.stream().filter(order -> order.getEndTime() != null && !order.getEndTime().isBefore(dayStart) && order.getEndTime().isBefore(dayEnd)).collect(Collectors.toList()); powerData.add(averagePower(dayOrders)); utilization.add(observedPowerUtilization(dayOrders)); }
- ((List<Map<String, Object>>) chart.get("series")).get(0).put("data", powerData);
- Map<String, Object> utilizationSeries = new LinkedHashMap<>(); utilizationSeries.put("name", "功率利用率"); utilizationSeries.put("data", utilization); ((List<Map<String, Object>>) chart.get("series")).add(utilizationSeries); return chart;
+ LocalDate end = range[1] == null ? start.plusDays(1) : range[1].toLocalDate();
+ for (LocalDate day = start; day.isBefore(end); day = day.plusDays(1)) {
+ categories.add(day.toString().substring(5));
+ FranchiseeDayStat stat = byDay.get(day);
+ powerData.add(stat == null ? BigDecimal.ZERO : averagePower(stat));
+ utilization.add(observedPowerUtilization(stat == null ? Collections.emptyList() : Collections.singletonList(stat)));
+ }
+ Map<String, Object> chart = new LinkedHashMap<>(); chart.put("categories", categories);
+ Map<String, Object> powerSeries = new LinkedHashMap<>(); powerSeries.put("name", "功率"); powerSeries.put("data", powerData);
+ Map<String, Object> utilizationSeries = new LinkedHashMap<>(); utilizationSeries.put("name", "功率利用率"); utilizationSeries.put("data", utilization);
+ chart.put("series", new ArrayList<>(Arrays.asList(powerSeries, utilizationSeries))); return chart;
}
- private BigDecimal averagePower(List<TChargingOrder> orders) {
- List<BigDecimal> powers = orders.stream().map(order -> order.getChargingPower() == null ? order.getPower() : order.getChargingPower()).filter(Objects::nonNull).collect(Collectors.toList());
- return powers.isEmpty() ? BigDecimal.ZERO : powers.stream().reduce(BigDecimal.ZERO, BigDecimal::add).divide(BigDecimal.valueOf(powers.size()), 2, RoundingMode.HALF_UP);
+ private BigDecimal averagePower(FranchiseeDayStat stat) {
+ if (stat == null || stat.getPowerCount() == null || stat.getPowerCount() == 0 || stat.getTotalPower() == null) {
+ return BigDecimal.ZERO;
+ }
+ return stat.getTotalPower().divide(BigDecimal.valueOf(stat.getPowerCount()), 2, RoundingMode.HALF_UP);
}
- private BigDecimal observedPowerUtilization(List<TChargingOrder> orders) {
- List<BigDecimal> powers = orders.stream().map(order -> order.getChargingPower() == null ? order.getPower() : order.getChargingPower()).filter(Objects::nonNull).filter(power -> power.signum() > 0).collect(Collectors.toList());
- if (powers.isEmpty()) return BigDecimal.ZERO; BigDecimal maximum = powers.stream().max(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
- return maximum.signum() == 0 ? BigDecimal.ZERO : powers.stream().reduce(BigDecimal.ZERO, BigDecimal::add).divide(BigDecimal.valueOf(powers.size()), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).divide(maximum, 2, RoundingMode.HALF_UP);
+ private BigDecimal observedPowerUtilization(List<FranchiseeDayStat> stats) {
+ BigDecimal sum = stats.stream().map(FranchiseeDayStat::getUtilPowerSum).map(this::value).reduce(BigDecimal.ZERO, BigDecimal::add);
+ long count = stats.stream().mapToLong(stat -> numberValue(stat.getUtilPowerCount())).sum();
+ if (count == 0) return BigDecimal.ZERO;
+ BigDecimal maximum = stats.stream().map(FranchiseeDayStat::getMaxPower).filter(Objects::nonNull).max(BigDecimal::compareTo).orElse(BigDecimal.ZERO);
+ if (maximum.signum() == 0) return BigDecimal.ZERO;
+ return sum.divide(BigDecimal.valueOf(count), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)).divide(maximum, 2, RoundingMode.HALF_UP);
}
- private BigDecimal demandPowerSatisfaction(List<TChargingOrder> orders) {
- List<TChargingOrder> valid = orders.stream().filter(order -> order.getCurrent() != null && order.getNeedElec() != null && order.getNeedElec().signum() > 0).collect(Collectors.toList());
- if (valid.isEmpty()) return BigDecimal.ZERO;
- BigDecimal total = valid.stream().map(order -> order.getCurrent().multiply(BigDecimal.valueOf(100)).divide(order.getNeedElec(), 4, RoundingMode.HALF_UP).min(BigDecimal.valueOf(100))).reduce(BigDecimal.ZERO, BigDecimal::add);
- return total.divide(BigDecimal.valueOf(valid.size()), 2, RoundingMode.HALF_UP);
+ private BigDecimal demandPowerSatisfaction(List<FranchiseeDayStat> stats) {
+ BigDecimal total = stats.stream().map(FranchiseeDayStat::getElecSatSum).map(this::value).reduce(BigDecimal.ZERO, BigDecimal::add);
+ long count = stats.stream().mapToLong(stat -> numberValue(stat.getElecSatCount())).sum();
+ if (count == 0) return BigDecimal.ZERO;
+ return total.divide(BigDecimal.valueOf(count), 2, RoundingMode.HALF_UP);
}
- private Map<String, Object> franchiseePowerDistribution(List<TChargingOrder> orders) {
+ private Map<String, Object> franchiseePowerDistribution(List<Integer> siteIds, LocalDateTime[] range) {
String[] names = {"0-30kW", "30-60kW", "60-120kW", "120-300kW", "300kW以上"}; long[] counts = new long[5];
- orders.forEach(order -> { BigDecimal power = order.getChargingPower() == null ? order.getPower() : order.getChargingPower(); if (power == null) return; double value = power.doubleValue(); int index = value < 30 ? 0 : value < 60 ? 1 : value < 120 ? 2 : value < 300 ? 3 : 4; counts[index]++; });
+ if (siteIds != null && !siteIds.isEmpty() && range != null && range[0] != null && range[1] != null) {
+ chargingOrderMapper.franchiseePowerBuckets(siteIds, range[0], range[1]).forEach(bucket -> {
+ if (bucket != null && bucket.getBucket() != null && bucket.getBucket() >= 0 && bucket.getBucket() < 5) {
+ counts[bucket.getBucket()] += numberValue(bucket.getOrderCount());
+ }
+ });
+ }
List<Map<String, Object>> data = new ArrayList<>(); for (int i = 0; i < names.length; i++) { Map<String, Object> item = new LinkedHashMap<>(); item.put("name", names[i]); item.put("value", counts[i]); data.add(item); }
return Collections.singletonMap("series", Collections.singletonList(Collections.singletonMap("data", data)));
}
- private Map<String, Object> franchiseeIncomeTrend(List<TChargingOrder> orders, LocalDate firstMonth, int monthCount) {
+ private Map<String, Object> franchiseeIncomeTrend(List<FranchiseeDayStat> stats, LocalDate firstMonth, int monthCount) {
List<String> categories = new ArrayList<>();
List<BigDecimal> electricity = new ArrayList<>(), service = new ArrayList<>();
+ Map<YearMonth, List<FranchiseeDayStat>> byMonth = stats.stream().filter(stat -> stat != null && stat.getStatDay() != null)
+ .collect(Collectors.groupingBy(stat -> YearMonth.from(stat.getStatDay())));
for (int i = 0; i < monthCount; i++) {
YearMonth month = YearMonth.from(firstMonth).plusMonths(i);
categories.add(String.format("%02d月", month.getMonthValue()));
- LocalDateTime start = month.atDay(1).atStartOfDay(), end = month.plusMonths(1).atDay(1).atStartOfDay();
- electricity.add(sum(orders.stream().filter(o -> o.getEndTime() != null && !o.getEndTime().isBefore(start) && o.getEndTime().isBefore(end)).collect(Collectors.toList()), TChargingOrder::getElectrovalence));
- service.add(sum(orders.stream().filter(o -> o.getEndTime() != null && !o.getEndTime().isBefore(start) && o.getEndTime().isBefore(end)).collect(Collectors.toList()), TChargingOrder::getServiceCharge));
+ List<FranchiseeDayStat> monthStats = byMonth.getOrDefault(month, Collections.emptyList());
+ electricity.add(sum(monthStats, FranchiseeDayStat::getElectrovalence));
+ service.add(sum(monthStats, FranchiseeDayStat::getServiceFee));
}
Map<String, Object> chart = new LinkedHashMap<>(); chart.put("categories", categories);
Map<String, Object> electricitySeries = new LinkedHashMap<>(); electricitySeries.put("name", "充电费"); electricitySeries.put("data", electricity);
--
Gitblit v1.7.1