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

perf: 优化打包下载

Browse Source
This commit is contained in:
weifashi 2024-01-04 12:02:29 +08:00
parent e215cda700
commit fb8d759103
13 changed files with 64 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Api/FileController.php
View File

@ -1028,6 +1028,12 @@ class FileController extends AbstractController
return Base::retError('一次最多可以下载100个文件或文件夹');
}
$botUser = User::botGetOrCreate('system-msg');
if (empty($botUser)) {
return Base::retError('系统机器人不存在');
}
$dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid);
$files = [];
$totalSize = 0;
@ -1053,7 +1059,7 @@ class FileController extends AbstractController
return Base::retError('创建压缩文件失败');
}
go(function () use ($zipPath, $fileUrl, $user, $zip, $files, $fileName, $zipFile) {
go(function () use ($zipPath, $fileUrl, $zip, $files, $fileName, $botUser, $dialog) {
Coroutine::sleep(0.1);
// 压缩进度
$progress = 0;
@ -1079,11 +1085,6 @@ class FileController extends AbstractController
]);
}
//
$botUser = User::botGetOrCreate('system-msg');
if (empty($botUser)) {
return;
}
if ($dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid)) {
$text = "<b>文件下载打包已完成。</b>";
$text .= "\n\n";
$text .= "文件名：{$fileName}";
@ -1092,7 +1093,6 @@ class FileController extends AbstractController
$text .= "\n";
$text .= '<a href="' . $fileUrl . '" target="_blank"><button type="button" class="ivu-btn ivu-btn-warning" style="margin-top: 10px;"><span>立即下载</span></button></a>';
WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, true);
}
});
return Base::retSuccess('success', [
'name' => $fileName,

36
app/Http/Controllers/Api/ProjectController.php
View File

@ -1200,7 +1200,13 @@ class ProjectController extends AbstractController
if (Carbon::parse($time[1])->timestamp - Carbon::parse($time[0])->timestamp > 90 * 86400) {
return Base::retError('时间范围限制最大90天');
}
go(function () use ($user, $userid, $time, $type) {
$botUser = User::botGetOrCreate('system-msg');
if (empty($botUser)) {
return Base::retError('系统机器人不存在');
}
$dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid);
//
go(function () use ($user, $userid, $time, $type, $botUser, $dialog) {
Coroutine::sleep(0.1);
$headings = [];
$headings[] = '任务ID';
@ -1221,6 +1227,9 @@ class ProjectController extends AbstractController
$headings[] = '状态';
$datas = [];
//
$text = '<b>导出任务统计已完成。</b>';
$text .= "\n\n";
//
$builder = ProjectTask::select(['project_tasks.*', 'project_task_users.userid as ownerid'])
->join('project_task_users', 'project_tasks.id', '=', 'project_task_users.task_id')
->where('project_task_users.owner', 1)
@ -1318,7 +1327,9 @@ class ProjectController extends AbstractController
}
});
if (empty($datas)) {
return Base::retError('没有任何数据');
$text .= '没有任何数据';
WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, true);
return;
}
//
$sheets = [];
@ -1334,15 +1345,18 @@ class ProjectController extends AbstractController
//
$fileName = User::userid2nickname($userid[0]) ?: $userid[0];
if (count($userid) > 1) {
$fileName .= "等" . count($userid) . "位成员";
$fileName .= '等' . count($userid) . '位成员任务统计';
}
$fileName .= '任务统计_' . Base::time() . '.xls';
$fileName .= '_' . Base::time() . '.xls';
$filePath = "temp/task/export/" . date("Ym", Base::time());
$export = new BillMultipleExport($sheets);
$res = $export->store($filePath . "/" . $fileName);
if ($res != 1) {
return Base::retError('导出失败，' . $fileName . '！');
$text .= "导出失败，{$fileName}！";
WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, true);
return;
}
//
$xlsPath = storage_path("app/" . $filePath . "/" . $fileName);
$zipFile = "app/" . $filePath . "/" . Base::rightDelete($fileName, '.xls') . ".zip";
$zipPath = storage_path($zipFile);
@ -1360,21 +1374,15 @@ class ProjectController extends AbstractController
]));
$fileUrl = Base::fillUrl('api/project/task/down?key=' . urlencode($base64));
Session::put('task::export:userid', $user->userid);
$botUser = User::botGetOrCreate('system-msg');
if (empty($botUser)) {
return;
}
if ($dialog = WebSocketDialog::checkUserDialog($botUser, $user->userid)) {
$text = "<b>导出任务统计已完成。</b>";
$text .= "\n\n";
$text .= "文件名：{$fileName}";
$text .= "\n";
$text .= "文件大小：" . Base::twoFloat(filesize($zipPath) / 1024, true) . "KB";
$text .= "\n";
$text .= '<a href="' . $fileUrl . '" target="_blank"><button type="button" class="ivu-btn ivu-btn-warning" style="margin-top: 10px;"><span>立即下载</span></button></a>';
} else {
$text .= '打包失败，请稍后再试...';
}
WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $botUser->userid, false, false, true);
}
}
});
return Base::retSuccess('success', ['msg' => '正在打包，请留意系统消息。']);
}

2
language/original-api.txt
View File

@ -482,3 +482,5 @@ Api接口文档
移动成功
不能重复投票
系统机器人不存在

11
language/translate.json
View File

@ -19523,5 +19523,16 @@
"de": "Lade deine taschen herunter (*)",
"fr": "Pack à télécharger (*)",
"id": "Kemas tas untuk download (*)"
},
{
"key": "系统机器人不存在",
"zh": "",
"zh-CHT": "系統機器人不存在",
"en": "Systematic robots do not exist",
"ko": "시스템 로봇은 존재하지 않습니다",
"ja": "システムロボットは存在しません",
"de": "Roboter existieren nicht",
"fr": "Le robot système n’existe pas",
"id": "Robot sistem tidak ada"
}
]

2
public/language/api/de.json
View File

File diff suppressed because one or more lines are too long

2
public/language/api/en.json
View File

File diff suppressed because one or more lines are too long

2
public/language/api/fr.json
View File

File diff suppressed because one or more lines are too long

2
public/language/api/id.json
View File

File diff suppressed because one or more lines are too long

2
public/language/api/ja.json
View File

File diff suppressed because one or more lines are too long

2
public/language/api/key.json
View File

File diff suppressed because one or more lines are too long

2
public/language/api/ko.json
View File

File diff suppressed because one or more lines are too long

2
public/language/api/zh-CHT.json
View File

File diff suppressed because one or more lines are too long

2
public/language/api/zh.json
View File

@ -1 +1 @@
["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]
["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]