首页统计数据错误修复

im-admin-ui/src/views/index.vue

@@ -70,7 +70,7 @@
         <el-col :span="24">
           <el-card>
             <template #header>
-              <span>用户注册</span>
+              <span>用户新增</span>
               <el-select v-model="registrationSelectedDays" style="width: 100px; float: right" size="small" @change="loadRegistrationChartData">
                 <el-option label="7天" :value="7"></el-option>
                 <el-option label="15天" :value="15"></el-option>
@@ -225,7 +225,7 @@ const processChartData = (privateData: any[], groupData: any[]) => {
   return { dates, privateCounts, groupCounts };
 };
 
-// 加载用户注册统计图表数据
+// 加载用户新增统计图表数据
 const loadRegistrationChartData = async () => {
   try {
     const response = await getDailyRegistrationCount(registrationSelectedDays.value);
@@ -248,11 +248,11 @@ const loadRegistrationChartData = async () => {
       });
     }
   } catch (error) {
-    console.error('加载用户注册统计图表数据失败:', error);
+    console.error('加载用户新增统计图表数据失败:', error);
   }
 };
 
-// 处理用户注册统计图表数据，填充缺失的日期
+// 处理用户新增统计图表数据，填充缺失的日期
 const processRegistrationChartData = (data: any[]) => {
   const dates: string[] = [];
   const counts: number[] = [];
@@ -393,7 +393,7 @@ onMounted(() => {
   initRegistrationChart();
 });
 
-// 初始化用户注册统计图表
+// 初始化用户新增统计图表
 const initRegistrationChart = async () => {
   await nextTick();
   if (registrationChartContainer.value) {
@@ -401,14 +401,14 @@ const initRegistrationChart = async () => {
 
     const option = {
       title: {
-        text: '每日用户注册趋势',
+        text: '每日用户新增趋势',
         left: 'center'
       },
       tooltip: {
         trigger: 'axis',
         formatter: (params: any) => {
           const data = params[0];
-          return `${data.name}<br/>注册用户: ${data.value}`;
+          return `${data.name}<br/>新增用户: ${data.value}`;
         }
       },
       xAxis: {
@@ -422,11 +422,11 @@ const initRegistrationChart = async () => {
       },
       yAxis: {
         type: 'value',
-        name: '注册用户数'
+        name: '新增用户数'
       },
       series: [
         {
-          name: '注册用户',
+          name: '新增用户',
           type: 'line',
           data: [],
           smooth: true,

im-admin/ruoyi-admin/src/main/resources/application.yml

@@ -132,6 +132,9 @@ mybatis-plus:
       # 主键类型
       # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
       idType: AUTO
+#  configuration:
+#    # 这个配置是 MyBatis 原生的配置项，用于开启标准日志工厂
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 # 数据加密
 mybatis-encryptor:

im-admin/ruoyi-im/src/main/java/org/dromara/im/mapper/ImUserMapper.java

@@ -25,6 +25,7 @@ public interface ImUserMapper extends BaseMapperPlus<ImUser, ImUserVo> {
     @Select("SELECT DATE(created_time) as date, COUNT(*) as count " +
         "FROM im_user " +
         "WHERE created_time >= DATE_SUB(CURDATE(), INTERVAL #{days} DAY) " +
+        "AND is_customer = 1 " +
         "GROUP BY DATE(created_time) " +
         "ORDER BY date ASC")
     List<Map<String, Object>> getDailyRegistrationCount(@Param("days") Integer days);
@@ -32,15 +33,15 @@ public interface ImUserMapper extends BaseMapperPlus<ImUser, ImUserVo> {
     /**
      * 按天统计用户注册数量（带uniqueToken条件）
      * @param days 统计天数
-     * @param uniqueToken 唯一标识
+     * @param unique_token 唯一标识
      * @return 统计结果
      */
     @Select("SELECT DATE(created_time) as date, COUNT(*) as count " +
         "FROM im_user " +
-        "WHERE created_time >= DATE_SUB(CURDATE(), INTERVAL #{days} DAY) " +
+        "WHERE is_customer = 1 AND unique_token = #{unique_token}" +
-        "AND unique_token = #{uniqueToken} " +
+        "AND created_time >= DATE_SUB(CURDATE(), INTERVAL #{days} DAY)" +
         "GROUP BY DATE(created_time) " +
         "ORDER BY date ASC")
-    List<Map<String, Object>> getDailyRegistrationCount(@Param("days") Integer days, @Param("uniqueToken") String uniqueToken);
+    List<Map<String, Object>> getDailyRegistrationCountByToken(@Param("days") Integer days, @Param("unique_token") String unique_token);
 
 }

im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImAgentServiceImpl.java

@@ -144,10 +144,11 @@ public class ImAgentServiceImpl implements IImAgentService {
         Long userId = LoginHelper.getUserId();
 
         if(userId == null){
+            System.out.println("userId is null");
             return "error";
         }
 
-        if(userId == 1){
+        if(LoginHelper.isSuperAdmin()){
             return null;
         }
 
@@ -165,6 +166,7 @@ public class ImAgentServiceImpl implements IImAgentService {
         ImAgent agent = baseMapper.selectOne(new LambdaQueryWrapper<ImAgent>().eq(ImAgent::getSysId, userId));
 
         String token = "error";
+        System.out.println("走到error");
         if(ObjectUtil.isNotNull(agent)){
             String uniqueToken = agent.getUniqueToken();
             if(ObjectUtil.isNotEmpty(uniqueToken)){
@@ -173,7 +175,8 @@ public class ImAgentServiceImpl implements IImAgentService {
                 RedisUtils.setCacheObject(cacheKey, token, Duration.ofHours(1));
             }
         }
-
+        System.out.println("走到末尾");
+        System.out.println(token);
         return token;
     }
 

im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java

@@ -202,10 +202,13 @@ public class ImUserServiceImpl implements IImUserService {
 
         // 如果不是超级管理员，则使用带uniqueToken的方法
         if(!LoginHelper.isSuperAdmin()) {
+            System.out.println("1111111111");
             String uniqueToken = imAgentService.getTokenByUserId();
-            return baseMapper.getDailyRegistrationCount(days, uniqueToken);
+            System.out.println(uniqueToken);
+            return baseMapper.getDailyRegistrationCountByToken(days, uniqueToken);
         }
 
+        System.out.println("222222222222");
         return baseMapper.getDailyRegistrationCount(days);
     }