feat(im): 增加好友申请的管理界面

src/api/im/manager/friend/index.ts

@@ -7,7 +7,10 @@ export interface ImManagerFriendVO {
   friendUserId: number
   friendNickname?: string
   displayName?: string
+  addSource?: number
   silent: boolean
+  pinned: boolean
+  blocked: boolean
   status: number
   addTime?: Date
   deleteTime?: Date

src/api/im/manager/friend/request/index.ts

@@ -0,0 +1,21 @@
+import request from '@/config/axios'
+
+export interface ImManagerFriendRequestVO {
+  id: number
+  fromUserId: number
+  fromNickname?: string
+  toUserId: number
+  toNickname?: string
+  applyContent?: string
+  displayName?: string
+  addSource?: number
+  handleResult: number
+  handleContent?: string
+  handleTime?: Date
+  createTime: Date
+}
+
+// 获得好友申请分页
+export const getManagerFriendRequestPage = (params: PageParam) => {
+  return request.get({ url: '/im/manager/friend-request/page', params })
+}

src/views/im/manager/friend/index.vue

@@ -9,17 +9,17 @@
       label-width="80px"
     >
       <el-form-item label="用户" prop="userId">
-        <UserSelectV2 v-model="queryParams.userId" class="!w-200px" />
+        <UserSelectV2 v-model="queryParams.userId" class="!w-240px" />
       </el-form-item>
       <el-form-item label="好友" prop="friendUserId">
-        <UserSelectV2 v-model="queryParams.friendUserId" placeholder="请选择好友" class="!w-200px" />
+        <UserSelectV2 v-model="queryParams.friendUserId" placeholder="请选择好友" class="!w-240px" />
       </el-form-item>
       <el-form-item label="好友状态" prop="status">
         <el-select
           v-model="queryParams.status"
           placeholder="请选择好友状态"
           clearable
-          class="!w-160px"
+          class="!w-240px"
         >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.IM_FRIEND_STATUS)"
@@ -34,7 +34,7 @@
           v-model="queryParams.silent"
           placeholder="请选择免打扰状态"
           clearable
-          class="!w-160px"
+          class="!w-240px"
         >
           <el-option
             v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
@@ -79,11 +79,26 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="displayName" width="120" />
+      <el-table-column label="添加来源" align="center" prop="addSource" width="120">
+        <template #default="{ row }">
+          <dict-tag :type="DICT_TYPE.IM_FRIEND_ADD_SOURCE" :value="row.addSource" />
+        </template>
+      </el-table-column>
       <el-table-column label="免打扰" align="center" prop="silent" width="80">
         <template #default="{ row }">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="row.silent" />
         </template>
       </el-table-column>
+      <el-table-column label="置顶" align="center" prop="pinned" width="80">
+        <template #default="{ row }">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="row.pinned" />
+        </template>
+      </el-table-column>
+      <el-table-column label="拉黑" align="center" prop="blocked" width="80">
+        <template #default="{ row }">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="row.blocked" />
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="status" width="100">
         <template #default="{ row }">
           <dict-tag :type="DICT_TYPE.IM_FRIEND_STATUS" :value="row.status" />
@@ -103,6 +118,17 @@
         width="180"
         :formatter="dateFormatter"
       />
+      <el-table-column label="操作" align="center" width="100" fixed="right">
+        <template #default="{ row }">
+          <el-button
+            link
+            type="primary"
+            @click="goConversation(row)"
+          >
+            查看对话
+          </el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <!-- 分页 -->
     <Pagination
@@ -122,6 +148,8 @@ import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
 
 defineOptions({ name: 'ImFriend' })
 
+const { push } = useRouter()
+
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref<ManagerFriendApi.ImManagerFriendVO[]>([]) // 列表的数据
@@ -160,6 +188,14 @@ const resetQuery = () => {
   handleQuery()
 }
 
+/** 跳转到私聊消息页面，查看该好友关系的对话 */
+const goConversation = (row: ManagerFriendApi.ImManagerFriendVO) => {
+  push({
+    name: 'ImPrivateMessage',
+    query: { senderId: row.userId, receiverId: row.friendUserId }
+  })
+}
+
 /** 初始化 */
 onMounted(() => {
   getList()

src/views/im/manager/friend/request/index.vue

@@ -0,0 +1,169 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="80px"
+    >
+      <el-form-item label="发起方" prop="fromUserId">
+        <UserSelectV2 v-model="queryParams.fromUserId" placeholder="请选择发起方" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="接收方" prop="toUserId">
+        <UserSelectV2 v-model="queryParams.toUserId" placeholder="请选择接收方" class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="处理结果" prop="handleResult">
+        <el-select
+          v-model="queryParams.handleResult"
+          placeholder="请选择处理结果"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.IM_FRIEND_REQUEST_HANDLE_RESULT)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="添加来源" prop="addSource">
+        <el-select
+          v-model="queryParams.addSource"
+          placeholder="请选择添加来源"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.IM_FRIEND_ADD_SOURCE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" />搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" />重置</el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id" width="100" />
+      <el-table-column label="发起方" align="center" min-width="200" show-overflow-tooltip>
+        <template #default="{ row }">
+          <span>{{ row.fromNickname || '-' }}</span>
+          <span class="text-gray-400 ml-5px">({{ row.fromUserId }})</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="接收方" align="center" min-width="200" show-overflow-tooltip>
+        <template #default="{ row }">
+          <span>{{ row.toNickname || '-' }}</span>
+          <span class="text-gray-400 ml-5px">({{ row.toUserId }})</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请理由" align="center" prop="applyContent" min-width="160" show-overflow-tooltip />
+      <el-table-column label="备注" align="center" prop="displayName" width="120" />
+      <el-table-column label="添加来源" align="center" prop="addSource" width="120">
+        <template #default="{ row }">
+          <dict-tag :type="DICT_TYPE.IM_FRIEND_ADD_SOURCE" :value="row.addSource" />
+        </template>
+      </el-table-column>
+      <el-table-column label="处理结果" align="center" prop="handleResult" width="100">
+        <template #default="{ row }">
+          <dict-tag :type="DICT_TYPE.IM_FRIEND_REQUEST_HANDLE_RESULT" :value="row.handleResult" />
+        </template>
+      </el-table-column>
+      <el-table-column label="处理理由" align="center" prop="handleContent" min-width="140" show-overflow-tooltip />
+      <el-table-column
+        label="处理时间"
+        align="center"
+        prop="handleTime"
+        width="180"
+        :formatter="dateFormatter"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+        :formatter="dateFormatter"
+      />
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script lang="ts" setup>
+import { dateFormatter } from '@/utils/formatTime'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as ManagerFriendRequestApi from '@/api/im/manager/friend/request'
+import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
+
+defineOptions({ name: 'ImFriendRequest' })
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref<ManagerFriendRequestApi.ImManagerFriendRequestVO[]>([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  fromUserId: undefined as number | undefined,
+  toUserId: undefined as number | undefined,
+  handleResult: undefined as number | undefined,
+  addSource: undefined as number | undefined,
+  createTime: [] as string[]
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询好友申请分页 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ManagerFriendRequestApi.getManagerFriendRequestPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 初始化 */
+onMounted(() => {
+  getList()
+})
+</script>

src/views/im/manager/group/index.vue

@@ -124,7 +124,7 @@
         width="180"
         :formatter="dateFormatter"
       />
-      <el-table-column label="操作" align="center" width="220" fixed="right">
+      <el-table-column label="操作" align="center" width="280" fixed="right">
         <template #default="{ row }">
           <el-button
             link
@@ -134,6 +134,13 @@
           >
             详情
           </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="goConversation(row)"
+          >
+            查看对话
+          </el-button>
           <el-button
             v-if="!row.banned"
             link
@@ -179,6 +186,7 @@ import GroupBanForm from './GroupBanForm.vue'
 
 defineOptions({ name: 'ImGroup' })
 
+const { push } = useRouter()
 const message = useMessage() // 消息弹窗
 
 const loading = ref(true) // 列表的加载中
@@ -244,6 +252,14 @@ const handleUnban = async (row: ManagerGroupApi.ImManagerGroupVO) => {
   } catch {}
 }
 
+/** 跳转到群聊消息页面，查看该群的对话 */
+const goConversation = (row: ManagerGroupApi.ImManagerGroupVO) => {
+  push({
+    name: 'ImGroupMessage',
+    query: { groupId: row.id }
+  })
+}
+
 /** 初始化 */
 onMounted(() => {
   getList()

src/views/im/manager/message/group/index.vue

@@ -160,6 +160,8 @@ import GroupMessageDetail from './GroupMessageDetail.vue'
 
 defineOptions({ name: 'ImGroupMessage' })
 
+const { currentRoute } = useRouter()
+
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref<ManagerGroupMessageApi.ImManagerGroupMessageVO[]>([]) // 列表的数据
@@ -204,8 +206,12 @@ const openDetail = (row: ManagerGroupMessageApi.ImManagerGroupMessageVO) => {
   detailRef.value?.open(row)
 }
 
-/** 初始化 */
+/** 初始化：从路由 query 读取搜索参数 */
 onMounted(() => {
+  const query = currentRoute.value.query
+  if (query.groupId) {
+    queryParams.groupId = Number(query.groupId)
+  }
   getList()
 })
 </script>

src/views/im/manager/message/private/index.vue

@@ -141,6 +141,8 @@ import PrivateMessageDetail from './PrivateMessageDetail.vue'
 
 defineOptions({ name: 'ImPrivateMessage' })
 
+const { currentRoute } = useRouter()
+
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref<ManagerPrivateMessageApi.ImManagerPrivateMessageVO[]>([]) // 列表的数据
@@ -185,8 +187,15 @@ const openDetail = (row: ManagerPrivateMessageApi.ImManagerPrivateMessageVO) =>
   detailRef.value?.open(row)
 }
 
-/** 初始化 */
+/** 初始化：从路由 query 读取搜索参数 */
 onMounted(() => {
+  const query = currentRoute.value.query
+  if (query.senderId) {
+    queryParams.senderId = Number(query.senderId)
+  }
+  if (query.receiverId) {
+    queryParams.receiverId = Number(query.receiverId)
+  }
   getList()
 })
 </script>