From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/UserService.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/UserService.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/UserService.java
index a4359f9..2d65105 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/UserService.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/service/UserService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.admin.entity.User;
import com.ruoyi.admin.request.UserDataCountRequest;
+import com.ruoyi.admin.vo.UserDataCountVO;
import com.ruoyi.admin.vo.UserTrendsVO;
import java.util.List;
@@ -20,10 +21,11 @@
/**
* 获取用户增量趋势
*
- * @param cityIds 城市id集合
+ * @param city 城市集合
* @return 折线图数据
*/
- List<UserTrendsVO> userTrends(List<String> cityIds);
+ List<UserTrendsVO> userTrends(List<String> city);
+ List<UserTrendsVO> userTrends1(List<String> city,List<Integer> userIds);
/**
* 用户数据统计
@@ -31,5 +33,6 @@
* @param userDataCountRequest 请求参数
* @return 统计数据信息
*/
- Object userDataCount(UserDataCountRequest userDataCountRequest);
+ UserDataCountVO userDataCount(UserDataCountRequest userDataCountRequest);
+ UserDataCountVO userDataCount1(UserDataCountRequest userDataCountRequest,List<Integer> userIds,List<String> siteIds);
}
--
Gitblit v1.7.1