From 0787209b4793eefb5480b18936fcb2c91c780db9 Mon Sep 17 00:00:00 2001
From: La123123 <617330105@qq.com>
Date: Mon, 11 May 2026 14:51:22 +0800
Subject: [PATCH] =?UTF-8?q?IP=E6=98=BE=E7=A4=BA=E3=80=81=E5=8F=AF=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=B9=B3=E5=8F=B0=E7=AE=A1=E7=90=86=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E3=80=81=E6=9C=80=E5=90=8E=E7=99=BB=E5=BD=95=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-admin-ui/src/views/im/customer/index.vue   |  4 +--
 im-admin-ui/src/views/im/user/index.vue       | 25 +++++++++++++------
 .../ImPlatformConfigurationController.java    | 22 ++++++++++++++++
 .../org/dromara/im/domain/bo/ImUserBo.java    |  5 ++++
 .../org/dromara/im/domain/vo/ImUserVo.java    |  5 ++++
 .../IImPlatformConfigurationService.java      |  7 ++++++
 .../ImPlatformConfigurationServiceImpl.java   | 11 ++++++++
 .../im/service/impl/ImUserServiceImpl.java    | 18 +++++++++++++
 8 files changed, 87 insertions(+), 10 deletions(-)

diff --git a/im-admin-ui/src/views/im/customer/index.vue b/im-admin-ui/src/views/im/customer/index.vue
index e5f60bf..161f529 100644
--- a/im-admin-ui/src/views/im/customer/index.vue
+++ b/im-admin-ui/src/views/im/customer/index.vue
@@ -63,11 +63,11 @@
             <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="最后登录时间" align="center" prop="lastLoginTime" width="160">
+        <!-- <el-table-column label="最后登录时间" align="center" prop="lastLoginTime" width="160">
           <template #default="scope">
             <span>{{ parseTime(scope.row.lastLoginTime, '{y}-{m}-{d}') }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
diff --git a/im-admin-ui/src/views/im/user/index.vue b/im-admin-ui/src/views/im/user/index.vue
index 0a8905d..fc2a4d4 100644
--- a/im-admin-ui/src/views/im/user/index.vue
+++ b/im-admin-ui/src/views/im/user/index.vue
@@ -5,18 +5,23 @@
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="用户名" prop="userName">
-              <el-input v-model="queryParams.userName" placeholder="请输入用户名" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.userName" placeholder="请输入用户名" clearable style="width: 180px" @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="queryParams.nickName" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.nickName" placeholder="请输入用户昵称" clearable style="width: 180px" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="平台来源" prop="platformId">
+              <el-select v-model="queryParams.platformId" placeholder="请选择平台来源" clearable style="width: 180px">
+                <el-option v-for="item in platformOptions" :key="item.id" :label="item.platformName" :value="item.id" />
+              </el-select>
             </el-form-item>
             <el-form-item label="标签" prop="labelIds">
-              <el-select v-model="queryParams.labelIds" multiple collapse-tags collapse-tags-tooltip placeholder="请选择标签" style="width: 200px">
+              <el-select v-model="queryParams.labelIds" multiple collapse-tags collapse-tags-tooltip placeholder="请选择标签" style="width: 180px">
                 <el-option v-for="item in labelOptions" :key="item.id" :label="item.labelName" :value="item.id" />
               </el-select>
             </el-form-item>
             <el-form-item label="群组" prop="groupIds">
-              <el-select v-model="queryParams.groupIds" multiple collapse-tags collapse-tags-tooltip placeholder="请选择群组" style="width: 200px">
+              <el-select v-model="queryParams.groupIds" multiple collapse-tags collapse-tags-tooltip placeholder="请选择群组" style="width: 180px">
                 <el-option v-for="item in groupOptions" :key="item.id" :label="item.groupName" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -208,6 +213,7 @@
 
 <script setup name="User" lang="ts">
 import { listUser, getUser, ban, unban, getLabelList, getGroupList, updateBatchUser } from '@/api/im/user';
+import { allListPlatformConfiguration } from '@/api/im/platformConfiguration';
 import { UserVO, UserQuery, UserForm } from '@/api/im/user/types';
 import { ElMessageBox, ElFormInstance, ComponentInternalInstance } from 'element-plus';
 
@@ -224,6 +230,7 @@ const total = ref(0);
 // 存储标签和群组选项
 const labelOptions = ref<any[]>([]);
 const groupOptions = ref<any[]>([]);
+const platformOptions = ref<any[]>([]); // 新增：存储平台选项
 
 const queryFormRef = ref<ElFormInstance>();
 const userFormRef = ref<ElFormInstance>();
@@ -258,6 +265,7 @@ const data = reactive<PageData<UserForm, UserQuery>>({
     nickName: undefined,
     labelIds: [] as any,
     groupIds: [] as any,
+    platformId: undefined, // 新增：平台来源查询参数
     params: {}
   },
   rules: {}
@@ -591,15 +599,16 @@ const getGroupNameById = (id: string | number) => {
   return group ? group.groupName : '';
 };
 
-// 获取标签和群组列表
+// 获取标签、群组和平台列表
 const getLabelAndGroupList = async () => {
   try {
-    const [labelsRes, groupsRes] = await Promise.all([getLabelList(), getGroupList()]);
+    const [labelsRes, groupsRes, platformRes] = await Promise.all([getLabelList(), getGroupList(), allListPlatformConfiguration()]);
     labelOptions.value = labelsRes.data || [];
     groupOptions.value = groupsRes.data || [];
+    platformOptions.value = platformRes.data || []; // 新增：设置平台选项
   } catch (error) {
-    console.error('获取标签和群组列表失败:', error);
-    proxy?.$modal?.msgError('获取标签和群组列表失败');
+    console.error('获取标签、群组和平台列表失败:', error);
+    proxy?.$modal?.msgError('获取标签、群组和平台列表失败');
   }
 };
 
diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImPlatformConfigurationController.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImPlatformConfigurationController.java
index 7692b3b..29702d2 100644
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImPlatformConfigurationController.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/controller/ImPlatformConfigurationController.java
@@ -1,11 +1,15 @@
 package org.dromara.im.controller;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.im.domain.ImPlatformConfiguration;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -45,6 +49,24 @@ public class ImPlatformConfigurationController extends BaseController {
         return imPlatformConfigurationService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 获取所有平台管理列表对象
+     */
+    @GetMapping("/allList")
+    public R<List<Map<String, Object>>> allList() {
+        //转为Map取id、platformName返回结果
+        List<ImPlatformConfiguration> list = imPlatformConfigurationService.queryAllList();
+        List<Map<String, Object>> result = list.stream()
+                .map(item -> {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("id", item.getId());
+                    map.put("platformName", item.getPlatformName());
+                    return map;
+                })
+                .collect(Collectors.toList());
+        return R.ok(result);
+    }
+
     /**
      * 导出平台管理配置列表
      */
diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserBo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserBo.java
index f0273c6..9c65f0e 100644
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserBo.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/bo/ImUserBo.java
@@ -101,4 +101,9 @@ public class ImUserBo {
      */
     private String welcomeMsg;
 
+    /**
+     * 来源平台 ID
+     */
+    private Long platformId;
+
 }
diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserVo.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserVo.java
index 3dd029e..cd37ed4 100644
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserVo.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/domain/vo/ImUserVo.java
@@ -118,6 +118,11 @@ public class ImUserVo {
      */
     private String welcomeMsg;
 
+    /**
+     * 用户ip地址
+     */
+    private String lastLoginIp;
+
 
 
 }
diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImPlatformConfigurationService.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImPlatformConfigurationService.java
index 759c745..eea2721 100644
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImPlatformConfigurationService.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/IImPlatformConfigurationService.java
@@ -1,5 +1,6 @@
 package org.dromara.im.service;
 
+import org.dromara.im.domain.ImPlatformConfiguration;
 import org.dromara.im.domain.vo.ImPlatformConfigurationVo;
 import org.dromara.im.domain.bo.ImPlatformConfigurationBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -33,6 +34,12 @@ public interface IImPlatformConfigurationService {
      */
     TableDataInfo<ImPlatformConfigurationVo> queryPageList(ImPlatformConfigurationBo bo, PageQuery pageQuery);
 
+    /**
+     *  查询平台管理配置所有列表
+     * @return 平台管理配置列表
+     */
+    List<ImPlatformConfiguration> queryAllList();
+
     /**
      * 查询符合条件的平台管理配置列表
      *
diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPlatformConfigurationServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPlatformConfigurationServiceImpl.java
index b853de3..0339b1b 100644
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPlatformConfigurationServiceImpl.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImPlatformConfigurationServiceImpl.java
@@ -76,6 +76,17 @@ public class ImPlatformConfigurationServiceImpl implements IImPlatformConfigurat
         return TableDataInfo.build(result);
     }
 
+    @Override
+    public List<ImPlatformConfiguration> queryAllList() {
+        LambdaQueryWrapper<ImPlatformConfiguration> lqw = Wrappers.lambdaQuery();
+
+        if(!LoginHelper.isSuperAdmin()) {
+            LambdaQueryWrapperHelper.appendToken(lqw, ImPlatformConfiguration::getUniqueToken);
+        }
+
+        return baseMapper.selectList(lqw);
+    }
+
     /**
      * 查询符合条件的平台管理配置列表
      *
diff --git a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java
index 4406f70..f6b2a07 100644
--- a/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java
+++ b/im-admin/ruoyi-im/src/main/java/org/dromara/im/service/impl/ImUserServiceImpl.java
@@ -17,15 +17,18 @@ import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.im.constant.ImConstant;
 import org.dromara.im.constant.ImRedisKey;
 import org.dromara.im.domain.ImAgent;
+import org.dromara.im.domain.ImPlatformConfiguration;
 import org.dromara.im.domain.ImUser;
 import org.dromara.im.domain.bo.ImUserBo;
 import org.dromara.im.domain.dto.BatchUpdateUserDto;
 import org.dromara.im.domain.dto.ImUserBanDto;
 import org.dromara.im.domain.dto.ImUserUnbanDto;
 import org.dromara.im.domain.vo.ImUserVo;
+import org.dromara.im.mapper.ImPlatformConfigurationMapper;
 import org.dromara.im.mapper.ImUserMapper;
 import org.dromara.im.mq.ImRedisMQTemplate;
 import org.dromara.im.service.IImAgentService;
+import org.dromara.im.service.IImPlatformConfigurationService;
 import org.dromara.im.service.IImUserService;
 import org.dromara.im.util.LambdaQueryWrapperHelper;
 import org.springframework.stereotype.Service;
@@ -47,6 +50,7 @@ public class ImUserServiceImpl implements IImUserService {
     private final ImRedisMQTemplate redisMQTemplate;
     private final ImUserMapper baseMapper;
     private final IImAgentService imAgentService;
+    private final ImPlatformConfigurationMapper platformConfigurationMapper;
 
     /**
      * 查询用户
@@ -130,6 +134,20 @@ public class ImUserServiceImpl implements IImUserService {
         wrapper.like(StringUtils.isNotBlank(bo.getUserName()), ImUser::getUserName, bo.getUserName());
         wrapper.like(StringUtils.isNotBlank(bo.getNickName()), ImUser::getNickName, bo.getNickName());
 
+        if(ObjectUtil.isNotEmpty(bo.getPlatformId())){
+            ImPlatformConfiguration data = platformConfigurationMapper.selectById(bo.getPlatformId());
+            String domainName = data.getDomainName();
+            if(ObjectUtil.isNotEmpty(domainName)){
+                //根据换行符将字符串分割为Set
+                //使用 \R 匹配所有的换行符（包括 \n, \r, \r\n 等），并去除首尾空格
+                System.out.println(domainName);
+                Set<String> domainNameSet = Arrays.stream(domainName.split("\\R"))
+                    .map(String::trim)
+                    .collect(Collectors.toSet());
+               wrapper.in(ImUser::getSourceUrl, domainNameSet);
+            }
+        }
+
         if(!LoginHelper.isSuperAdmin()) {
             LambdaQueryWrapperHelper.appendToken(wrapper, ImUser::getUniqueToken);
         }