github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-01 05:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

签到通知加上设备备注

Browse Source
This commit is contained in:
kuaifan 2023-01-29 08:05:27 +08:00
parent c35454f4e1
commit 78f197e7f9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ class PublicController extends AbstractController
}
//
$macs = explode(",", $mac);
$creates = [];
$checkins = [];
foreach ($macs as $mac) {
$mac = strtoupper($mac);
if (Base::isMac($mac) && $UserCheckinMac = UserCheckinMac::whereMac($mac)->first()) {
@ -114,7 +114,7 @@ class PublicController extends AbstractController
$record = UserCheckinRecord::where($array)->first();
if (empty($record)) {
$record = UserCheckinRecord::createInstance($array);
$creates[] = $UserCheckinMac->userid;
$checkins[] = $UserCheckinMac;
}
$record->times = Base::array2json(array_merge($record->times, [$nowTime]));
$record->report_time = $time;
@ -123,13 +123,15 @@ class PublicController extends AbstractController
}
}
//
if ($creates && $setting['notice'] === 'open') {
if ($checkins && $setting['notice'] === 'open') {
$botUser = User::botGetOrCreate('check-in');
if ($botUser) {
foreach ($creates as $create) {
$dialog = WebSocketDialog::checkUserDialog($botUser->userid, $create);
foreach ($checkins as $checkin) {
$dialog = WebSocketDialog::checkUserDialog($botUser->userid, $checkin->userid);
if ($dialog) {
$text = "签到成功，签到时间：" . date("H:i");
$hi = date("H:i");
$remark = $checkin->remark ?: $checkin->mac;
$text = "签到成功，签到时间: {$hi} ({$remark})";
WebSocketDialogMsg::sendMsg(null, $dialog->id, 'text', ['text' => $text], $botUser->userid); // todo 未能在任务end事件来发送任务
}
}