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/dto/FranchiseeGunSat.java | 21 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/support/FranchiseeUserStatistics.java | 25 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseePowerBucket.java | 16 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java | 51 ++++
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 156 +++++++++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 289 ++++++++++++++---------
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseePhaseStat.java | 18 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeUserAgg.java | 32 ++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeDayStat.java | 59 ++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeSourceStat.java | 16 +
10 files changed, 568 insertions(+), 115 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);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeDayStat.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeDayStat.java
new file mode 100644
index 0000000..9381ee0
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeDayStat.java
@@ -0,0 +1,59 @@
+package com.ruoyi.order.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 加盟商看板按日聚合行（t_charging_order 按 end_time 分组下推，MyCat 代理合并）。
+ * 口径与 TChargingOrderController franchisee* 原 Java 求和逻辑一致。
+ */
+@Data
+public class FranchiseeDayStat {
+
+ /** 结束时间所在日 */
+ private LocalDate statDay;
+
+ /** 订单数（del_flag=0 且 recharge_payment_status=2） */
+ private Long orderCount;
+
+ /** 订单金额合计（SUM(order_amount)，null 按 0） */
+ private BigDecimal orderAmount;
+
+ /** 订单金额合计（SUM(COALESCE(order_amount, payment_amount))，折线图口径） */
+ private BigDecimal orderAmountEffective;
+
+ /** 支付金额合计 */
+ private BigDecimal paymentAmount;
+
+ /** 累计服务费合计 */
+ private BigDecimal serviceFee;
+
+ /** 累计电费合计 */
+ private BigDecimal electrovalence;
+
+ /** 充电总度数合计 */
+ private BigDecimal capacity;
+
+ /** 功率合计（SUM(IFNULL(charging_power, power))，null 不参与平均） */
+ private BigDecimal totalPower;
+
+ /** 参与功率合计的行数（用于计算平均功率） */
+ private Long powerCount;
+
+ /** 当日功率最大值（>0 口径，用于利用率分母） */
+ private BigDecimal maxPower;
+
+ /** 需求满足率分子合计（SUM(min(current*100/need_elec,100))，有效行） */
+ private BigDecimal elecSatSum;
+
+ /** 需求满足率有效行数（current/need_elec 均非空且 need_elec>0） */
+ private Long elecSatCount;
+
+ /** 功率利用率分子合计（仅 power>0 行求和） */
+ private BigDecimal utilPowerSum;
+
+ /** 功率利用率有效行数（power>0） */
+ private Long utilPowerCount;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeGunSat.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeGunSat.java
new file mode 100644
index 0000000..210a1f2
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeGunSat.java
@@ -0,0 +1,21 @@
+package com.ruoyi.order.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 加盟商看板按枪的需求满足率聚合（当前电流/需求电流，min(ratio,100) 后求平均）。
+ */
+@Data
+public class FranchiseeGunSat {
+
+ /** 充电枪id */
+ private Integer chargingGunId;
+
+ /** 满足率分子合计 */
+ private BigDecimal satSum;
+
+ /** 有效行数 */
+ private Long satCount;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseePhaseStat.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseePhaseStat.java
new file mode 100644
index 0000000..195ba97
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseePhaseStat.java
@@ -0,0 +1,18 @@
+package com.ruoyi.order.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 加盟商看板尖峰平谷阶段电量（t_charging_order_accounting_strategy 按 type 聚合）。
+ */
+@Data
+public class FranchiseePhaseStat {
+
+ /** 阶段（1=尖，2=峰，3=平，4=谷） */
+ private Integer type;
+
+ /** 该阶段充电度数合计 */
+ private BigDecimal capacity;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseePowerBucket.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseePowerBucket.java
new file mode 100644
index 0000000..38210d8
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseePowerBucket.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.dto;
+
+import lombok.Data;
+
+/**
+ * 加盟商看板功率分布桶（0-30/30-60/60-120/120-300/300kW以上）。
+ */
+@Data
+public class FranchiseePowerBucket {
+
+ /** 桶下标：0=0-30kW 1=30-60kW 2=60-120kW 3=120-300kW 4=300kW以上 */
+ private Integer bucket;
+
+ /** 该桶订单数 */
+ private Long orderCount;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeSourceStat.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeSourceStat.java
new file mode 100644
index 0000000..3f2fa43
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeSourceStat.java
@@ -0,0 +1,16 @@
+package com.ruoyi.order.dto;
+
+import lombok.Data;
+
+/**
+ * 加盟商看板流量来源统计（按 tripartite_platform_name 分组，空值归入"明星充电"）。
+ */
+@Data
+public class FranchiseeSourceStat {
+
+ /** 来源名称（空串=平台自身） */
+ private String source;
+
+ /** 订单数 */
+ private Long orderCount;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeUserAgg.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeUserAgg.java
new file mode 100644
index 0000000..8e1ba78
--- /dev/null
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/FranchiseeUserAgg.java
@@ -0,0 +1,32 @@
+package com.ruoyi.order.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * 加盟商看板用户维度聚合行（t_charging_order 按 app_user_id/app_user_car_id/结束日 分组，
+ * 仅 status=5 已结束订单）。同一查询同时支撑按用户、按车辆、按日去重用户三路统计。
+ */
+@Data
+public class FranchiseeUserAgg {
+
+ /** 用户id */
+ private Long appUserId;
+
+ /** 充电车辆id（可为 null） */
+ private Long appUserCarId;
+
+ /** 结束时间所在日 */
+ private LocalDate statDay;
+
+ /** 该组合下订单数 */
+ private Long orderCount;
+
+ /** 充电总度数合计 */
+ private BigDecimal capacity;
+
+ /** 支付金额合计 */
+ private BigDecimal paymentAmount;
+}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
index 4902b17..7365d12 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/TChargingOrderMapper.java
@@ -412,4 +412,55 @@
*/
List<Map<String, Object>> getAccountSettlementStatement(@Param("startTime") String startTime,
@Param("endTime") String endTime);
+
+ // ==================== 加盟商看板聚合查询（SQL 聚合下推，替代全量拉订单到 JVM） ====================
+ // 均为单表 GROUP BY，MyCat 可把聚合下推到各分片表后由代理合并少量行；不带 IPage 参数。
+ // 口径与 TChargingOrderController franchisee* 原 Java 求和逻辑一致。
+
+ /**
+ * 按 end_time 日聚合：订单数/金额/服务费/电费/电量/功率/需求满足率/利用率。
+ */
+ List<FranchiseeDayStat> franchiseeDayStats(@Param("siteIds") List<Integer> siteIds,
+ @Param("start") LocalDateTime start,
+ @Param("end") LocalDateTime end);
+
+ /**
+ * 功率分布直方图（0-30/30-60/60-120/120-300/300kW以上，按 IFNULL(charging_power, power) 分桶）。
+ */
+ List<FranchiseePowerBucket> franchiseePowerBuckets(@Param("siteIds") List<Integer> siteIds,
+ @Param("start") LocalDateTime start,
+ @Param("end") LocalDateTime end);
+
+ /**
+ * 尖峰平谷阶段电量（按 charging_order_id IN 路由到对应分片，分组返回 type/电量）。
+ */
+ List<FranchiseePhaseStat> franchiseePhaseStatsByOrderIds(@Param("orderIds") List<Long> orderIds);
+
+ /**
+ * 站点+时间范围内订单 id 列表（仅 id 投影，供尖峰平谷分块反查使用）。
+ */
+ List<Long> franchiseeOrderIds(@Param("siteIds") List<Integer> siteIds,
+ @Param("start") LocalDateTime start,
+ @Param("end") LocalDateTime end);
+
+ /**
+ * 用户维度聚合（仅 status=5 已结束订单，按 app_user_id/app_user_car_id/结束日 分组）。
+ */
+ List<FranchiseeUserAgg> franchiseeUserAggs(@Param("siteIds") List<Integer> siteIds,
+ @Param("start") LocalDateTime start,
+ @Param("end") LocalDateTime end);
+
+ /**
+ * 流量来源统计（按 tripartite_platform_name 分组，仅 status=5 已结束订单）。
+ */
+ List<FranchiseeSourceStat> franchiseeTrafficStats(@Param("siteIds") List<Integer> siteIds,
+ @Param("start") LocalDateTime start,
+ @Param("end") LocalDateTime end);
+
+ /**
+ * 按充电枪的需求满足率聚合（含空枪 id 行，服务端过滤）。
+ */
+ List<FranchiseeGunSat> franchiseeGunSatisfaction(@Param("siteIds") List<Integer> siteIds,
+ @Param("start") LocalDateTime start,
+ @Param("end") LocalDateTime end);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/support/FranchiseeUserStatistics.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/support/FranchiseeUserStatistics.java
index 77d8bcb..9e8d59e 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/support/FranchiseeUserStatistics.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/support/FranchiseeUserStatistics.java
@@ -22,23 +22,38 @@
private FranchiseeUserStatistics() {
}
+ /**
+ * 旧入口：由订单列表推导"每日充电用户集合"后计算。
+ */
public static Result calculate(List<TChargingOrder> orders,
List<TPartnerAppUser> relations,
LocalDateTime start,
LocalDateTime end) {
List<TChargingOrder> safeOrders = orders == null ? Collections.emptyList() : orders;
- List<TPartnerAppUser> safeRelations = relations == null ? Collections.emptyList() : relations;
-
Map<LocalDate, Set<Long>> chargingUsersByDay = new HashMap<>();
- Set<Long> chargingUsers = new HashSet<>();
for (TChargingOrder order : safeOrders) {
if (order == null || order.getAppUserId() == null || !inRange(order.getEndTime(), start, end)) {
continue;
}
- chargingUsers.add(order.getAppUserId());
chargingUsersByDay.computeIfAbsent(order.getEndTime().toLocalDate(), key -> new HashSet<>())
.add(order.getAppUserId());
}
+ return calculateByUserDays(chargingUsersByDay, relations, start, end);
+ }
+
+ /**
+ * 加盟商看板入口：每日去重充电用户集合已由 SQL 聚合得到
+ * （t_charging_order GROUP BY app_user_id, DATE(end_time)，避免全量订单拉回 JVM）。
+ */
+ public static Result calculateByUserDays(Map<LocalDate, Set<Long>> chargingUsersByDay,
+ List<TPartnerAppUser> relations,
+ LocalDateTime start,
+ LocalDateTime end) {
+ Map<LocalDate, Set<Long>> safeByDay = chargingUsersByDay == null ? Collections.emptyMap() : chargingUsersByDay;
+ List<TPartnerAppUser> safeRelations = relations == null ? Collections.emptyList() : relations;
+
+ Set<Long> chargingUsers = new HashSet<>();
+ safeByDay.values().forEach(chargingUsers::addAll);
Map<Long, LocalDateTime> firstBindingByUser = new HashMap<>();
for (TPartnerAppUser relation : safeRelations) {
@@ -68,7 +83,7 @@
List<Long> newSeries = new ArrayList<>();
for (LocalDate day = firstDay; day.isBefore(exclusiveEndDay); day = day.plusDays(1)) {
categories.add(String.format("%02d-%02d", day.getMonthValue(), day.getDayOfMonth()));
- chargingSeries.add((long) chargingUsersByDay.getOrDefault(day, Collections.emptySet()).size());
+ chargingSeries.add((long) safeByDay.getOrDefault(day, Collections.emptySet()).size());
newSeries.add((long) newUsersByDay.getOrDefault(day, Collections.emptySet()).size());
}
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index 409deea..3223e43 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -3581,4 +3581,160 @@
</foreach>
</if>
</select>
+
+ <!-- ==================== 加盟商看板聚合查询（SQL 聚合下推，替代全量拉订单到 JVM） ==================== -->
+ <!-- 均为单表 GROUP BY，MyCat 下推到各分片表后代理合并少量行；过滤条件内联，不带 IPage 参数。 -->
+ <!-- 注意: 本模块 mapUnderscoreToCamelCase=false，列别名显式使用驼峰。 -->
+
+ <!-- 按 end_time 日聚合: 订单数/金额/服务费/电费/电量/功率/需求满足率/利用率 -->
+ <select id="franchiseeDayStats" resultType="com.ruoyi.order.dto.FranchiseeDayStat">
+ SELECT DATE(end_time) AS statDay,
+ COUNT(*) AS orderCount,
+ SUM(IFNULL(order_amount, 0)) AS orderAmount,
+ SUM(COALESCE(order_amount, payment_amount)) AS orderAmountEffective,
+ SUM(IFNULL(payment_amount, 0)) AS paymentAmount,
+ SUM(IFNULL(service_charge, 0)) AS serviceFee,
+ SUM(IFNULL(electrovalence, 0)) AS electrovalence,
+ SUM(IFNULL(charging_capacity, 0)) AS capacity,
+ SUM(IFNULL(charging_power, power)) AS totalPower,
+ COUNT(IFNULL(charging_power, power)) AS powerCount,
+ MAX(IFNULL(IFNULL(charging_power, power), 0)) AS maxPower,
+ SUM(CASE WHEN `current` IS NOT NULL AND need_elec IS NOT NULL AND need_elec > 0
+ THEN LEAST(ROUND(`current` * 100 / need_elec, 4), 100) ELSE 0 END) AS elecSatSum,
+ SUM(CASE WHEN `current` IS NOT NULL AND need_elec IS NOT NULL AND need_elec > 0
+ THEN 1 ELSE 0 END) AS elecSatCount,
+ SUM(CASE WHEN IFNULL(IFNULL(charging_power, power), 0) > 0
+ THEN IFNULL(IFNULL(charging_power, power), 0) ELSE 0 END) AS utilPowerSum,
+ SUM(CASE WHEN IFNULL(IFNULL(charging_power, power), 0) > 0
+ THEN 1 ELSE 0 END) AS utilPowerCount
+ FROM t_charging_order
+ WHERE del_flag = 0
+ AND recharge_payment_status = 2
+ <if test="siteIds != null and siteIds.size() > 0">
+ AND site_id IN
+ <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
+ #{siteId}
+ </foreach>
+ </if>
+ AND end_time >= #{start}
+ AND end_time < #{end}
+ GROUP BY DATE(end_time)
+ </select>
+
+ <!-- 功率分布直方图（0-30/30-60/60-120/120-300/300kW以上） -->
+ <select id="franchiseePowerBuckets" resultType="com.ruoyi.order.dto.FranchiseePowerBucket">
+ SELECT CASE WHEN IFNULL(IFNULL(charging_power, power), 0) < 30 THEN 0
+ WHEN IFNULL(IFNULL(charging_power, power), 0) < 60 THEN 1
+ WHEN IFNULL(IFNULL(charging_power, power), 0) < 120 THEN 2
+ WHEN IFNULL(IFNULL(charging_power, power), 0) < 300 THEN 3
+ ELSE 4 END AS bucket,
+ COUNT(*) AS orderCount
+ FROM t_charging_order
+ WHERE del_flag = 0
+ AND recharge_payment_status = 2
+ <if test="siteIds != null and siteIds.size() > 0">
+ AND site_id IN
+ <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
+ #{siteId}
+ </foreach>
+ </if>
+ AND end_time >= #{start}
+ AND end_time < #{end}
+ GROUP BY CASE WHEN IFNULL(IFNULL(charging_power, power), 0) < 30 THEN 0
+ WHEN IFNULL(IFNULL(charging_power, power), 0) < 60 THEN 1
+ WHEN IFNULL(IFNULL(charging_power, power), 0) < 120 THEN 2
+ WHEN IFNULL(IFNULL(charging_power, power), 0) < 300 THEN 3
+ ELSE 4 END
+ </select>
+
+ <!-- 尖峰平谷阶段电量: 按 charging_order_id 分片键路由，分块传入避免超大 IN -->
+ <select id="franchiseePhaseStatsByOrderIds" resultType="com.ruoyi.order.dto.FranchiseePhaseStat">
+ SELECT `type` AS type,
+ SUM(IFNULL(charging_capacity, 0)) AS capacity
+ FROM t_charging_order_accounting_strategy
+ WHERE charging_order_id IN
+ <foreach collection="orderIds" item="orderId" open="(" separator="," close=")">
+ #{orderId}
+ </foreach>
+ GROUP BY `type`
+ </select>
+
+ <!-- 站点+时间范围内订单 id 列表（仅 id 投影） -->
+ <select id="franchiseeOrderIds" resultType="java.lang.Long">
+ SELECT id
+ FROM t_charging_order
+ WHERE del_flag = 0
+ AND recharge_payment_status = 2
+ <if test="siteIds != null and siteIds.size() > 0">
+ AND site_id IN
+ <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
+ #{siteId}
+ </foreach>
+ </if>
+ AND end_time >= #{start}
+ AND end_time < #{end}
+ </select>
+
+ <!-- 用户维度聚合（仅 status=5 已结束订单） -->
+ <select id="franchiseeUserAggs" resultType="com.ruoyi.order.dto.FranchiseeUserAgg">
+ SELECT app_user_id AS appUserId,
+ app_user_car_id AS appUserCarId,
+ DATE(end_time) AS statDay,
+ COUNT(*) AS orderCount,
+ SUM(IFNULL(charging_capacity, 0)) AS capacity,
+ SUM(IFNULL(payment_amount, 0)) AS paymentAmount
+ FROM t_charging_order
+ WHERE del_flag = 0
+ AND recharge_payment_status = 2
+ AND status = 5
+ <if test="siteIds != null and siteIds.size() > 0">
+ AND site_id IN
+ <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
+ #{siteId}
+ </foreach>
+ </if>
+ AND end_time >= #{start}
+ AND end_time < #{end}
+ GROUP BY app_user_id, app_user_car_id, DATE(end_time)
+ </select>
+
+ <!-- 流量来源统计（仅 status=5 已结束订单，空值归"明星充电"由服务端处理） -->
+ <select id="franchiseeTrafficStats" resultType="com.ruoyi.order.dto.FranchiseeSourceStat">
+ SELECT IFNULL(tripartite_platform_name, '') AS source,
+ COUNT(*) AS orderCount
+ FROM t_charging_order
+ WHERE del_flag = 0
+ AND recharge_payment_status = 2
+ AND status = 5
+ <if test="siteIds != null and siteIds.size() > 0">
+ AND site_id IN
+ <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
+ #{siteId}
+ </foreach>
+ </if>
+ AND end_time >= #{start}
+ AND end_time < #{end}
+ GROUP BY tripartite_platform_name
+ </select>
+
+ <!-- 按充电枪的需求满足率聚合（与 franchiseeDayStats 相同基础过滤，不含 status 过滤） -->
+ <select id="franchiseeGunSatisfaction" resultType="com.ruoyi.order.dto.FranchiseeGunSat">
+ SELECT charging_gun_id AS chargingGunId,
+ SUM(CASE WHEN `current` IS NOT NULL AND need_elec IS NOT NULL AND need_elec > 0
+ THEN LEAST(ROUND(`current` * 100 / need_elec, 4), 100) ELSE 0 END) AS satSum,
+ SUM(CASE WHEN `current` IS NOT NULL AND need_elec IS NOT NULL AND need_elec > 0
+ THEN 1 ELSE 0 END) AS satCount
+ FROM t_charging_order
+ WHERE del_flag = 0
+ AND recharge_payment_status = 2
+ <if test="siteIds != null and siteIds.size() > 0">
+ AND site_id IN
+ <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
+ #{siteId}
+ </foreach>
+ </if>
+ AND end_time >= #{start}
+ AND end_time < #{end}
+ GROUP BY charging_gun_id
+ </select>
</mapper>
--
Gitblit v1.7.1