github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 11:19:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 优化会话列表

Browse Source
This commit is contained in:
kuaifan 2023-12-25 14:15:45 +08:00
parent fd6312408b
commit 5546dbaa0e
6 changed files with 151 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
app/Http/Controllers/Api/DialogController.php
View File

@ -52,13 +52,41 @@ class DialogController extends AbstractController
//
$timerange = TimeRange::parse(Request::input());
//
$data = (new WebSocketDialog)->getDialogList($user->userid, $timerange->updated, $timerange->deleted);
$data = WebSocketDialog::getDialogList($user->userid, $timerange->updated, $timerange->deleted);
//
return Base::retSuccess('success', $data);
}
/**
* @api {get} api/dialog/search 02. 搜索会话
* @api {get} api/dialog/unread 02. 未读对话列表
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
* @apiGroup dialog
* @apiName lists
*
* @apiParam {String} before_at 在这个时间之前未读的数据
*
* @apiSuccess {Number} ret 返回状态码（1正确、0错误）
* @apiSuccess {String} msg 返回信息（错误描述）
* @apiSuccess {Object} data 返回数据
*/
public function unread()
{
$user = User::auth();
//
$beforeAt = Request::input('before_at');
if (empty($beforeAt)) {
return Base::retError('参数错误');
}
//
$data = WebSocketDialog::getDialogUnread($user->userid, Carbon::parse($beforeAt));
//
return Base::retSuccess('success', $data);
}
/**
* @api {get} api/dialog/search 03. 搜索会话
*
* @apiDescription 根据消息关键词搜索相关会话，需要token身份
* @apiVersion 1.0.0
@ -135,7 +163,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/search/tag 03. 搜索标注会话
* @api {get} api/dialog/search/tag 04. 搜索标注会话
*
* @apiDescription 根据消息关键词搜索相关会话，需要token身份
* @apiVersion 1.0.0
@ -166,7 +194,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/one 04. 获取单个会话信息
* @api {get} api/dialog/one 05. 获取单个会话信息
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -197,7 +225,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/user 05. 获取会话成员
* @api {get} api/dialog/user 06. 获取会话成员
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -242,7 +270,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/todo 06. 获取会话待办
* @api {get} api/dialog/todo 07. 获取会话待办
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -272,7 +300,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/top 07. 会话置顶
* @api {get} api/dialog/top 08. 会话置顶
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -302,7 +330,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/tel 08. 获取对方联系电话
* @api {get} api/dialog/tel 09. 获取对方联系电话
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -352,7 +380,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/open/user 09. 打开会话
* @api {get} api/dialog/open/user 10. 打开会话
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -383,7 +411,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/list 10. 获取消息列表
* @api {get} api/dialog/msg/list 11. 获取消息列表
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -516,7 +544,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/search 11. 搜索消息位置
* @api {get} api/dialog/msg/search 12. 搜索消息位置
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -553,7 +581,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/one 12. 获取单条消息
* @api {get} api/dialog/msg/one 13. 获取单条消息
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -582,7 +610,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/read 13. 已读聊天消息
* @api {get} api/dialog/msg/read 14. 已读聊天消息
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -633,7 +661,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/unread 14. 获取未读消息数据
* @api {get} api/dialog/msg/unread 15. 获取未读消息数据
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -674,7 +702,7 @@ class DialogController extends AbstractController
}
/**
* @api {post} api/dialog/msg/stream 15. 通知成员监听消息
* @api {post} api/dialog/msg/stream 16. 通知成员监听消息
*
* @apiDescription 通知指定会员EventSource监听流动消息
* @apiVersion 1.0.0
@ -713,7 +741,7 @@ class DialogController extends AbstractController
}
/**
* @api {post} api/dialog/msg/sendtext 16. 发送消息
* @api {post} api/dialog/msg/sendtext 17. 发送消息
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -825,7 +853,7 @@ class DialogController extends AbstractController
}
/**
* @api {post} api/dialog/msg/sendrecord 17. 发送语音
* @api {post} api/dialog/msg/sendrecord 18. 发送语音
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -872,7 +900,7 @@ class DialogController extends AbstractController
}
/**
* @api {post} api/dialog/msg/sendfile 18. 文件上传
* @api {post} api/dialog/msg/sendfile 19. 文件上传
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -903,7 +931,7 @@ class DialogController extends AbstractController
}
/**
* @api {post} api/dialog/msg/sendfiles 19. 群发文件上传
* @api {post} api/dialog/msg/sendfiles 20. 群发文件上传
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -958,7 +986,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/sendfileid 20. 通过文件ID发送文件
* @api {get} api/dialog/msg/sendfileid 21. 通过文件ID发送文件
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1028,7 +1056,7 @@ class DialogController extends AbstractController
}
/**
* @api {post} api/dialog/msg/sendanon 21. 发送匿名消息
* @api {post} api/dialog/msg/sendanon 22. 发送匿名消息
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1081,7 +1109,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/readlist 22. 获取消息阅读情况
* @api {get} api/dialog/msg/readlist 23. 获取消息阅读情况
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1110,7 +1138,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/detail 23. 消息详情
* @api {get} api/dialog/msg/detail 24. 消息详情
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1158,7 +1186,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/download 24. 文件下载
* @api {get} api/dialog/msg/download 25. 文件下载
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1199,7 +1227,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/withdraw 25. 聊天消息撤回
* @api {get} api/dialog/msg/withdraw 26. 聊天消息撤回
*
* @apiDescription 消息撤回限制24小时内，需要token身份
* @apiVersion 1.0.0
@ -1225,7 +1253,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/mark 26. 消息标记操作
* @api {get} api/dialog/msg/mark 27. 消息标记操作
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1292,7 +1320,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/silence 27. 消息免打扰
* @api {get} api/dialog/msg/silence 28. 消息免打扰
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1355,7 +1383,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/forward 28. 转发消息给
* @api {get} api/dialog/msg/forward 29. 转发消息给
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1396,7 +1424,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/emoji 29. emoji回复
* @api {get} api/dialog/msg/emoji 30. emoji回复
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1431,7 +1459,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/tag 30. 标注/取消标注
* @api {get} api/dialog/msg/tag 31. 标注/取消标注
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1460,7 +1488,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/todo 31. 设待办/取消待办
* @api {get} api/dialog/msg/todo 32. 设待办/取消待办
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1503,7 +1531,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/todolist 32. 获取消息待办情况
* @api {get} api/dialog/msg/todolist 33. 获取消息待办情况
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1533,7 +1561,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/done 33. 完成待办
* @api {get} api/dialog/msg/done 34. 完成待办
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1580,7 +1608,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/msg/color 34. 设置颜色
* @api {get} api/dialog/msg/color 35. 设置颜色
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1621,7 +1649,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/group/add 35. 新增群组
* @api {get} api/dialog/group/add 36. 新增群组
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1683,7 +1711,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/group/edit 36. 修改群组
* @api {get} api/dialog/group/edit 37. 修改群组
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1744,7 +1772,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/group/adduser 37. 添加群成员
* @api {get} api/dialog/group/adduser 38. 添加群成员
*
* @apiDescription 需要token身份
* - 有群主时：只有群主可以邀请
@ -1780,7 +1808,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/group/deluser 38. 移出（退出）群成员
* @api {get} api/dialog/group/deluser 39. 移出（退出）群成员
*
* @apiDescription 需要token身份
* - 只有群主、邀请人可以踢人
@ -1824,7 +1852,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/group/transfer 39. 转让群组
* @api {get} api/dialog/group/transfer 40. 转让群组
*
* @apiDescription 需要token身份
* - 只有群主且是个人类型群可以解散
@ -1873,7 +1901,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/group/disband 40. 解散群组
* @api {get} api/dialog/group/disband 41. 解散群组
*
* @apiDescription 需要token身份
* - 只有群主且是个人类型群可以解散
@ -1901,7 +1929,7 @@ class DialogController extends AbstractController
}
/**
* @api {get} api/dialog/group/searchuser 41. 搜索个人群（仅限管理员）
* @api {get} api/dialog/group/searchuser 42. 搜索个人群（仅限管理员）
*
* @apiDescription 需要token身份，用于创建部门搜索个人群组
* @apiVersion 1.0.0
@ -1930,7 +1958,7 @@ class DialogController extends AbstractController
}
/**
* @api {post} api/dialog/okr/add 42. 创建OKR评论会话
* @api {post} api/dialog/okr/add 43. 创建OKR评论会话
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -1969,7 +1997,7 @@ class DialogController extends AbstractController
}
/**
* @api {post} api/dialog/okr/push 43. 推送OKR相关信息
* @api {post} api/dialog/okr/push 44. 推送OKR相关信息
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -2005,7 +2033,7 @@ class DialogController extends AbstractController
}
/**
* @api {post} api/dialog/msg/wordchain 44. 发送接龙消息
* @api {post} api/dialog/msg/wordchain 45. 发送接龙消息
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
@ -2068,7 +2096,7 @@ class DialogController extends AbstractController
}
/**
* @api {post} api/dialog/msg/vote 45. 发起投票
* @api {post} api/dialog/msg/vote 46. 发起投票
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0

2
app/Http/Controllers/Api/UsersController.php
View File

@ -1971,7 +1971,7 @@ class UsersController extends AbstractController
'name' => Doo::translate('文件'),
];
}
$dialogList = (new WebSocketDialog)->getDialogList($user->userid);
$dialogList = WebSocketDialog::getDialogList($user->userid);
foreach ($dialogList['data'] as $dialog) {
if ($dialog['avatar']) {
$avatar = url($dialog['avatar']);

31
app/Models/WebSocketDialog.php
View File

@ -10,6 +10,7 @@ use Cache;
use Carbon\Carbon;
use Hhxsv5\LaravelS\Swoole\Task\Task;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Facades\DB;
/**
* App\Models\WebSocketDialog
@ -76,7 +77,7 @@ class WebSocketDialog extends AbstractModel
* @param $deleted
* @return array
*/
public function getDialogList($userid, $updated = "", $deleted = "")
public static function getDialogList($userid, $updated = "", $deleted = "")
{
$builder = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread', 'u.silence', 'u.color', 'u.updated_at as user_at'])
->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
@ -99,6 +100,34 @@ class WebSocketDialog extends AbstractModel
return $data;
}
/**
* 获取未读对话列表
* @param $userid
* @param $beforeAt
* @param $take
* @return WebSocketDialog[]
*/
public static function getDialogUnread($userid, $beforeAt, $take = 20)
{
DB::statement("SET SQL_MODE=''");
$list = WebSocketDialog::select(['web_socket_dialogs.*', 'u.top_at', 'u.mark_unread', 'u.silence', 'u.color', 'u.updated_at as user_at'])
->join('web_socket_dialog_users as u', 'web_socket_dialogs.id', '=', 'u.dialog_id')
->join('web_socket_dialog_msg_reads as r', 'web_socket_dialogs.id', '=', 'r.dialog_id')
->where('r.userid', $userid)
->where('r.silence', 0)
->where('r.read_at')
->where('web_socket_dialogs.last_at', '>', $beforeAt)
->groupBy('web_socket_dialogs.id')
->take(min(100, $take))
->get();
$list->transform(function (WebSocketDialog $item) use ($userid) {
return $item->formatData($userid);
});
//
return $list;
}
/**
* 格式化对话
* @param int $userid 会员ID

10
resources/assets/js/pages/manage/components/DialogWrapper.vue
View File

@ -137,7 +137,7 @@
</div>
<!--跳转提示-->
<div v-if="listPreparedStatus && positionMsg" class="dialog-position" :class="{'down': tagShow}">
<div v-if="positionStatus && positionMsg" class="dialog-position" :class="{'down': tagShow}">
<div class="position-label" @click="onPositionMark">
<Icon v-if="positionLoad > 0" type="ios-loading" class="icon-loading"></Icon>
<i v-else class="taskfont">&#xe624;</i>
@ -733,6 +733,7 @@ export default {
positionLoad: 0, // 定位跳转加载中
firstMsgLength: 0, // 首次加载消息数量
isFirstShowTag: false, // 是否首次显示标签
positionStatus: false, // 定位跳转状态
msgPreparedStatus: false, // 消息准备完成
listPreparedStatus: false, // 消息准备完成
selectedTextStatus: false, // 是否选择文本
@ -1090,6 +1091,7 @@ export default {
this.searchShow = false
this.unreadMsgId = 0
this.firstMsgLength = this.allMsgList.length || 1
this.positionStatus = false
this.listPreparedStatus = false
this.scrollToBottomAndRefresh = false
//
@ -1339,6 +1341,12 @@ export default {
}
}
},
readEnabled(val) {
if (!this.positionStatus && val) {
this.positionStatus = true
}
},
},
methods: {

32
resources/assets/js/store/actions.js vendored
View File

@ -2421,6 +2421,7 @@ export default {
dispatch("getDialogs", requestData).then(resolve).catch(reject)
} else {
resolve()
dispatch("getDialogUnreads").catch(() => {})
}
}).catch(e => {
console.warn(e);
@ -2431,6 +2432,37 @@ export default {
});
},
/**
* 获取超期未读会话
* @param state
* @param dispatch
* @returns {Promise<unknown>}
*/
getDialogUnreads({state, dispatch}) {
return new Promise(async resolve => {
const key = await $A.IDBString("dialogUnread")
if (key == $A.formatDate("Y-m-d")) {
return // 一天取一次
}
await $A.IDBSet("dialogUnread", $A.formatDate("Y-m-d"))
//
const dialog = $A.cloneJSON(state.cacheDialogs).sort((a, b) => {
return $A.Date(a.last_at) - $A.Date(b.last_at);
}).find(({id}) => id > 0);
if (dialog) {
dispatch("call", {
url: 'dialog/unread',
data: {
before_at: dialog.last_at,
}
}).then(({data}) => {
dispatch("saveDialog", data);
});
}
resolve()
})
},
/**
* 获取单个会话信息
* @param state

6
resources/assets/sass/pages/components/chat-input.scss vendored
View File

@ -199,7 +199,13 @@
}
.mention {
color: #0bc037;
background-color: transparent;
margin-right: 0;
-webkit-user-select: auto;
> span {
margin: 0 2px;
}
}
}
}