Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: 优化签到数据结构

Browse Source
This commit is contained in:
kuaifan
2022-12-13 09:24:30 +08:00
parent 154b145e33
commit 4efbc7db25
9 changed files with 194 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1412,25 +1412,18 @@ class UsersController extends AbstractController
$start = Carbon::parse(date("Y-m-01 00:00:00", strtotime($ym)));
$end = (clone $start)->addMonth()->subSecond();
//
$records = UserCheckinRecord::whereUserid($user->userid)->whereBetween('created_at', [$start, $end])->orderBy('id')->get();
$records = UserCheckinRecord::whereUserid($user->userid)->whereBetween('created_at', [$start, $end])->orderBy('id')->get()->keyBy('date');
$array = [];
$startT = $start->timestamp;
$endT = $end->timestamp;
while ($startT < $endT) {
$between = [Carbon::createFromTimestamp($startT), Carbon::createFromTimestamp($startT + 86400)];
$firstRecord = $records->whereBetween("created_at", $between)->first();
$lastRecord = $records->whereBetween("created_at", $between)->last();
$firstTimestamp = $firstRecord ? Carbon::parse($firstRecord->created_at)->toDateTimeString() : '';
$lastTimestamp = $lastRecord ? Carbon::parse($lastRecord->created_at)->toDateTimeString() : '';
if ($firstTimestamp) {
$data = [
'time' => $firstTimestamp,
'all' => [$firstTimestamp],
$sameDate = date("Y-m-d", $startT);
$sameRecord = isset($records[$sameDate]) ? $records[$sameDate] : null;
if ($sameRecord) {
$array[] = [
'date' => $sameDate,
'section' => $sameRecord->atSection(),
];
if ($lastTimestamp) {
$data['all'][] = $lastTimestamp;
}
$array[] = $data;
}
$startT += 86400;
}