diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UAccountDashboardVo.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UAccountDashboardVo.java
new file mode 100644
index 0000000..95aad78
--- /dev/null
+++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/domain/vo/UAccountDashboardVo.java
@@ -0,0 +1,68 @@
+package org.wfc.user.domain.vo;
+
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @description: 账户仪表盘Vo
+ * @author: cyc
+ * @since: 2024-12-25
+ */
+@Data
+public class UAccountDashboardVo {
+
+ private Long id;
+
+ private BigDecimal balance;
+
+ private Long packageId;
+
+ private Date startTime;
+
+ private Date endTime;
+
+ private Long trafficUsed;
+
+ private Long durationUsed;
+
+ private Integer clientNumUsed;
+
+ private String packageName;
+
+ private Integer periodNum;
+
+ private Integer periodType;
+
+ private BigDecimal price;
+
+ private Long traffic;
+
+ private Long duration;
+
+ private Integer clientNum;
+
+ private String remark;
+
+ private Boolean rateLimitEnable;
+
+ private Boolean trafficEnable;
+
+ private Boolean durationEnable;
+
+ private Boolean clientNumEnable;
+
+ private String rateLimitName;
+
+ private Long downLimit;
+
+ private Boolean downLimitEnable;
+
+ private Long upLimit;
+
+ private Boolean upLimitEnable;
+
+ private Long activity;
+}
diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUAccountService.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUAccountService.java
index 09d4836..c9f55bf 100644
--- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUAccountService.java
+++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/IUAccountService.java
@@ -3,6 +3,7 @@ package org.wfc.user.service;
import org.wfc.user.api.domain.bo.UClientBo;
import org.wfc.user.domain.UAccount;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.wfc.user.domain.vo.UAccountDashboardVo;
/**
*
@@ -25,4 +26,10 @@ public interface IUAccountService extends IService {
*/
void authClientAndRateLimit(UClientBo client);
+ /**
+ * 首页仪表盘查询
+ * @return
+ */
+ UAccountDashboardVo getByUser();
+
}
diff --git a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
index a52afc1..7012d7a 100644
--- a/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
+++ b/wfc-modules/wfc-modules-user/src/main/java/org/wfc/user/service/impl/UAccountServiceImpl.java
@@ -6,9 +6,12 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.wfc.common.core.domain.LoginUser;
+import org.wfc.common.security.utils.SecurityUtils;
import org.wfc.omada.api.client.OmadaClientApi;
import org.wfc.omada.api.client.model.ClientRateLimitSetting;
import org.wfc.omada.api.client.model.CustomRateLimitEntity;
@@ -16,12 +19,14 @@ import org.wfc.omada.api.hotspot.OmadaAuthorizedClientApi;
import org.wfc.user.api.domain.bo.UClientBo;
import org.wfc.user.domain.UAccount;
import org.wfc.user.domain.UClient;
+import org.wfc.user.domain.vo.UAccountDashboardVo;
import org.wfc.user.domain.vo.UCdrUserVo;
import org.wfc.user.mapper.UAccountMapper;
import org.wfc.user.mapper.UCdrMapper;
import org.wfc.user.mapper.UClientMapper;
import org.wfc.user.service.IUAccountService;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -113,4 +118,27 @@ public class UAccountServiceImpl extends ServiceImpl i
}
+ @Override
+ public UAccountDashboardVo getByUser() {
+ LoginUser