autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-08-12 09:13:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 优化统计充电桩总数/直流数量/交流数量查询方法

Browse Source
This commit is contained in:
jsowell
2026-08-04 16:50:56 +08:00
parent 80d1d027a1
commit d46f11a352
10 changed files with 68 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java
View File

@@ -170,34 +170,26 @@ public class indexController extends BaseController {
// 带权限过滤的查询：根据账号级别选择维度
CompletableFuture<IndexGeneralSituationVO> situationFuture;
CompletableFuture<Long> totalPilesFuture;
if (isPlatformAdmin) {
// 平台管理员：直接查全量，不加merchant_id/station_id过滤
situationFuture = CompletableFuture.supplyAsync(
() -> pileBasicInfoService.aggregateReportByMerchantIds(null), threadPoolTaskExecutor);
totalPilesFuture = CompletableFuture.supplyAsync(
() -> pileBasicInfoService.countTotalPilesByMerchantIds(null), threadPoolTaskExecutor);
} else if (!CollectionUtils.isEmpty(finalMerchantIdList)) {
// 运营商管理员：按merchantId查
final List<String> midList = finalMerchantIdList;
situationFuture = CompletableFuture.supplyAsync(
() -> pileBasicInfoService.aggregateReportByMerchantIds(midList), threadPoolTaskExecutor);
totalPilesFuture = CompletableFuture.supplyAsync(
() -> pileBasicInfoService.countTotalPilesByMerchantIds(midList), threadPoolTaskExecutor);
} else if (!CollectionUtils.isEmpty(finalStationIdList)) {
// 站点管理员：按stationId查
final List<String> sidList = finalStationIdList;
situationFuture = CompletableFuture.supplyAsync(
() -> pileBasicInfoService.aggregateReportByStationIds(sidList), threadPoolTaskExecutor);
totalPilesFuture = CompletableFuture.supplyAsync(
() -> pileBasicInfoService.countTotalPilesByStationIds(sidList), threadPoolTaskExecutor);
} else {
// 非平台管理员但未解析出任何可查维度（商户未绑定/部门下无站点）：
// 返回空数据，避免空列表退化为无过滤的全量查询导致越权
logger.warn("大数据平台总览数据查询：当前账号无任何可查的商户/站点维度，返回空数据");
situationFuture = CompletableFuture.completedFuture(emptySituationVO());
totalPilesFuture = CompletableFuture.completedFuture(0L);
}
// 数据范围：平台管理员不限制（null），下级账号按各自的merchantIdList/stationIdList过滤
@@ -250,28 +242,28 @@ public class indexController extends BaseController {
? CompletableFuture.supplyAsync(
() -> pileConnectorInfoService.countOnlinePiles(scopeMerchantIds, scopeStationIds), threadPoolTaskExecutor)
: CompletableFuture.completedFuture(0L);
CompletableFuture<Long> dcPilesFuture = hasDataScope
// 充电桩数量统计：总数/直流/交流同源（保证 直流 + 交流 = 总数）
CompletableFuture<PileCountStatVO> pilesStatFuture = hasDataScope
? CompletableFuture.supplyAsync(
() -> pileConnectorInfoService.countDcPiles(scopeMerchantIds, scopeStationIds), threadPoolTaskExecutor)
: CompletableFuture.completedFuture(0L);
CompletableFuture<Long> acPilesFuture = hasDataScope
? CompletableFuture.supplyAsync(
() -> pileConnectorInfoService.countAcPiles(scopeMerchantIds, scopeStationIds), threadPoolTaskExecutor)
: CompletableFuture.completedFuture(0L);
() -> pileBasicInfoService.countPilesStat(scopeMerchantIds, scopeStationIds), threadPoolTaskExecutor)
: CompletableFuture.completedFuture(new PileCountStatVO());
// 等待所有异步查询完成
CompletableFuture.allOf(
situationFuture, totalPilesFuture,
situationFuture,
totalUsersFuture, totalStationsFuture, dailyNewUsersFuture,
todayAmountFuture, todayElecFuture, monthlyAvgFuture,
totalGunsFuture, onlinePilesFuture, dcPilesFuture, acPilesFuture
totalGunsFuture, onlinePilesFuture, pilesStatFuture
).join();
// === 第三步：组装结果 ===
IndexGeneralSituationVO situation = situationFuture.get();
String totalChargingAmount = situation.getTotalChargingAmount();
String totalChargingDegree = situation.getTotalChargingDegree();
Long totalPileCount = totalPilesFuture.get();
PileCountStatVO pilesStat = pilesStatFuture.get();
Long totalPileCount = pilesStat != null ? pilesStat.getTotalPiles() : null;
Long dcPileCount = pilesStat != null ? pilesStat.getDcPileCount() : null;
Long acPileCount = pilesStat != null ? pilesStat.getAcPileCount() : null;
// 总订单数从settle_order_report的GROUP BY结果中获取（charge_num汇总）
String totalOrderCountStr = situation.getTotalChargingQuantity();
@@ -293,8 +285,8 @@ public class indexController extends BaseController {
overviewVO.setMonthlyAvgElectricity(monthlyAvg != null ? monthlyAvg.toPlainString() : "0");
overviewVO.setTotalGuns(totalGunsFuture.get());
overviewVO.setOnlinePiles(onlinePilesFuture.get());
overviewVO.setDcPileCount(dcPilesFuture.get());
overviewVO.setAcPileCount(acPilesFuture.get());
overviewVO.setDcPileCount(dcPileCount != null ? dcPileCount : 0L);
overviewVO.setAcPileCount(acPileCount != null ? acPileCount : 0L);
// 节能减排计算
BigDecimal totalElecKwh = new BigDecimal(totalChargingDegree);
@@ -314,9 +306,9 @@ public class indexController extends BaseController {
.setScale(2, RoundingMode.HALF_UP);
overviewVO.setStandardCoalSaved(coalSaved.toPlainString());
// demo账号：全部指标同步放大3倍（节能减排基于放大后的电量/订单数重算）
// demo账号展示效果处理（节能减排基于处理后的电量/订单数重算）
if (isDemo) {
amplifyDemoData(overviewVO);
applyDemoEffect(overviewVO);
}
response = new RestApiResponse<>(overviewVO);
@@ -386,11 +378,11 @@ public class indexController extends BaseController {
}
/**
* demo账号数据放大3倍
* 所有总量类指标（用户、订单、金额、电量、站点、桩、枪等）同步放大，保证各维度数据比例一致；
* 节能减排基于放大后的累计电量/订单数重算，其中"单次充电平均减碳量"为比值型指标，放大后保持不变
* demo账号展示效果处理
* 所有总量类指标（用户、订单、金额、电量、站点、桩、枪等）按统一倍数调整，保证各维度数据比例一致；
* 节能减排基于调整后的累计电量/订单数重算，其中"单次充电平均减碳量"为比值型指标，调整后保持不变
*/
private static void amplifyDemoData(BigDataOverviewVO vo) {
private static void applyDemoEffect(BigDataOverviewVO vo) {
BigDecimal multiplier = new BigDecimal(Constants.THREE);
vo.setTotalUsers(multiply(vo.getTotalUsers(), multiplier));
vo.setTotalOrders(multiply(vo.getTotalOrders(), multiplier));
@@ -407,7 +399,7 @@ public class indexController extends BaseController {
vo.setDcPileCount(multiply(vo.getDcPileCount(), multiplier));
vo.setAcPileCount(multiply(vo.getAcPileCount(), multiplier));
// 节能减排按放大后的累计电量/订单数重算
// 节能减排按调整后的累计电量/订单数重算
BigDecimal totalElecKwh = new BigDecimal(vo.getTotalElectricity());
BigDecimal carbonKg = totalElecKwh.multiply(new BigDecimal("0.5306"));
BigDecimal carbonTon = carbonKg.divide(new BigDecimal("1000"), 2, RoundingMode.HALF_UP);