优化定时任务调度耗时
This commit is contained in:
@@ -20,6 +20,7 @@ use App\Enums\CurrencySource;
|
||||
use App\Events\MessageSent;
|
||||
use App\Jobs\SaveMessageJob;
|
||||
use App\Models\PositionDutyLog;
|
||||
use App\Models\Room;
|
||||
use App\Models\Sysparam;
|
||||
use App\Models\User;
|
||||
use App\Services\ChatStateService;
|
||||
@@ -27,6 +28,7 @@ use App\Services\ChatUserPresenceService;
|
||||
use App\Services\UserCurrencyService;
|
||||
use App\Services\VipService;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Redis;
|
||||
|
||||
@@ -65,6 +67,8 @@ class AutoSaveExp extends Command
|
||||
*/
|
||||
public function handle(): int
|
||||
{
|
||||
$startedAt = microtime(true);
|
||||
|
||||
// 读取奖励配置
|
||||
$expGainRaw = Sysparam::getValue('exp_per_heartbeat', '1');
|
||||
$jjbGainRaw = Sysparam::getValue('jjb_per_heartbeat', '0');
|
||||
@@ -81,15 +85,22 @@ class AutoSaveExp extends Command
|
||||
|
||||
// 统计本次处理总人次(一个用户在多个房间会被计算多次)
|
||||
$totalProcessed = 0;
|
||||
$usersByUsername = $this->preloadOnlineUsers($roomMap);
|
||||
|
||||
foreach ($roomMap as $roomId => $usernames) {
|
||||
foreach ($usernames as $username) {
|
||||
$this->processUser($username, $roomId, $expGainRaw, $jjbGainRaw, $superLevel);
|
||||
$user = $usersByUsername->get($username);
|
||||
if (! $user) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$this->processUser($user, $roomId, $expGainRaw, $jjbGainRaw, $superLevel);
|
||||
$totalProcessed++;
|
||||
}
|
||||
}
|
||||
|
||||
$this->info("自动存点完成,共处理 {$totalProcessed} 个在线用户。");
|
||||
$elapsedMs = (int) round((microtime(true) - $startedAt) * 1000);
|
||||
$this->info('自动存点完成,共扫描 '.count($roomMap)." 个在线房间,处理 {$totalProcessed} 个在线用户,耗时 {$elapsedMs}ms。");
|
||||
|
||||
return Command::SUCCESS;
|
||||
}
|
||||
@@ -108,7 +119,7 @@ class AutoSaveExp extends Command
|
||||
$roomMap = [];
|
||||
|
||||
// 从数据库取出所有房间 ID
|
||||
$roomIds = \App\Models\Room::pluck('id');
|
||||
$roomIds = Room::pluck('id');
|
||||
|
||||
foreach ($roomIds as $roomId) {
|
||||
// Laravel 的 Redis facade 会自动加配置的前缀,与 ChatStateService 存入时完全一致
|
||||
@@ -121,27 +132,46 @@ class AutoSaveExp extends Command
|
||||
return $roomMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 预加载所有在线用户名对应的用户资料与身份关系,避免循环内逐个查询用户和身份信息。
|
||||
*
|
||||
* @param array<int, array<string>> $roomMap 在线房间与用户名映射
|
||||
* @return Collection<string, User> 以用户名为键的用户集合
|
||||
*/
|
||||
private function preloadOnlineUsers(array $roomMap): Collection
|
||||
{
|
||||
$usernames = collect($roomMap)
|
||||
->flatten()
|
||||
->unique()
|
||||
->values();
|
||||
|
||||
if ($usernames->isEmpty()) {
|
||||
return collect();
|
||||
}
|
||||
|
||||
return User::query()
|
||||
->with(['activePosition.position.department', 'vipLevel'])
|
||||
->whereIn('username', $usernames)
|
||||
->get()
|
||||
->keyBy('username');
|
||||
}
|
||||
|
||||
/**
|
||||
* 为单个在线用户执行存点逻辑,并在其所在房间推送存点通知。
|
||||
*
|
||||
* @param string $username 用户名
|
||||
* @param User $user 已预加载身份关系的在线用户
|
||||
* @param int $roomId 所在房间ID
|
||||
* @param string $expGainRaw 经验奖励原始配置(支持 "1" 或 "1-10" 范围)
|
||||
* @param string $jjbGainRaw 金币奖励原始配置
|
||||
* @param int $superLevel 管理员等级阈值
|
||||
*/
|
||||
private function processUser(
|
||||
string $username,
|
||||
User $user,
|
||||
int $roomId,
|
||||
string $expGainRaw,
|
||||
string $jjbGainRaw,
|
||||
int $superLevel
|
||||
): void {
|
||||
$user = User::where('username', $username)->first();
|
||||
if (! $user) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 1. 计算奖励量(经验/金币 均支持 VIP 倍率)
|
||||
$expGain = $this->parseRewardValue($expGainRaw);
|
||||
$expMultiplier = $this->vipService->getExpMultiplier($user);
|
||||
@@ -165,8 +195,11 @@ class AutoSaveExp extends Command
|
||||
$user, 'gold', $actualJjbGain, CurrencySource::AUTO_SAVE, '自动存点', $roomId,
|
||||
);
|
||||
}
|
||||
$user->refresh(); // 刷新获取最新属性(service 已原子更新)
|
||||
$user->load(['activePosition.position.department', 'vipLevel']); // 存点通知需要展示部门、职务与会员身份。
|
||||
if ($actualExpGain > 0 || $actualJjbGain > 0) {
|
||||
// 刷新获取最新属性(service 已原子更新),同时保留后续通知需要展示的身份关系。
|
||||
$user->refresh();
|
||||
$user->load(['activePosition.position.department', 'vipLevel']);
|
||||
}
|
||||
|
||||
// 3. 自动升降级逻辑
|
||||
// - 有在职职务的用户:等级固定为职务对应等级,不随经验变化
|
||||
@@ -241,7 +274,7 @@ class AutoSaveExp extends Command
|
||||
'id' => $this->chatState->nextMessageId($roomId),
|
||||
'room_id' => $roomId,
|
||||
'from_user' => '系统',
|
||||
'to_user' => $username, // 定向推送给本人
|
||||
'to_user' => $user->username, // 定向推送给本人
|
||||
'content' => $content,
|
||||
'is_secret' => true, // 私信模式:前端过滤,只有收件人才能看到
|
||||
'font_color' => '#16a34a', // 草绿色
|
||||
|
||||
Reference in New Issue
Block a user