diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java index 047eb0d9..dc5c4be3 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/XhpcHistoryOrderMapper.java @@ -33,6 +33,12 @@ public interface XhpcHistoryOrderMapper { @Param("userType") Integer userType, @Param("currentTime") String currentTime); + //社区用户统计 + Long xhpcCommunityPersonnelSum(); + + //B端用户统计 + Long xhpcCustomersPersonnelSum(); + /** * query total electric quantity by multiple tenant or multiple charging station * diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java index ae5de551..997fcf9a 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java @@ -123,8 +123,8 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService { Long appUserCount = xhpcAppUserMapper.selectTotalCountByTenantIdAndCurrentTime(tenantIdsStr, null); List chargingStationIdList = xhpcChargingStationMapper.selectChargingStationIds(tenantIdsStr); //(0 C端用户 1 流量方用户 2社区用户 3B端用户) - Long communityUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdsStr, chargingStationIdList, UserTypeUtil.COMMUNIT_TYPE, null); - Long customerUserCount = xhpcHistoryOrderMapper.selectUserTotalCountByTenantIdsAndChargingStationIdsAndUserTypeAndCurrentTime(tenantIdsStr, chargingStationIdList, UserTypeUtil.CUSTOMERS_TYPE, null); + Long communityUserCount = xhpcHistoryOrderMapper.xhpcCommunityPersonnelSum(); + Long customerUserCount = xhpcHistoryOrderMapper.xhpcCustomersPersonnelSum(); return R.ok(appUserCount + communityUserCount + customerUserCount); //judge care param function diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml index 0be3e566..cb38c119 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml @@ -163,6 +163,14 @@ + + + +