feat: 任命/撤销通知系统 + 用户名片UI优化
- 任命/撤销事件增加 type 字段区分类型 - 任命：全屏礼花 + 紫色弹窗 + 紫色系统消息 - 撤销：灰色弹窗 + 灰色系统消息，无礼花 - 消息分发：操作者/被操作者显示在私聊面板，其他人显示在公屏 - 系统消息加随机鼓励语（各5条轮换） - ChatStateService 修复 Redis key 前缀扫描问题（getAllActiveRoomIds） - 用户名片折叠优化：管理员视野、职务履历均可折叠 - 管理操作 + 职务操作合并为「🔧 管理操作」折叠区 - 悄悄话改为「🎁 送礼物」按钮，礼物面板内联展开
This commit is contained in:
202
app/Http/Controllers/Admin/AppointmentController.php
Normal file
202
app/Http/Controllers/Admin/AppointmentController.php
Normal file
@@ -0,0 +1,202 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* 文件功能：后台任命管理控制器
|
||||
* 管理员可以在此查看所有在职人员、进行新增任命和撤销职务
|
||||
* 任命/撤销通过 AppointmentService 执行，权限日志自动记录
|
||||
*
|
||||
* @author ChatRoom Laravel
|
||||
*
|
||||
* @version 1.0.0
|
||||
*/
|
||||
|
||||
namespace App\Http\Controllers\Admin;
|
||||
|
||||
use App\Events\AppointmentAnnounced;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Department;
|
||||
use App\Models\Position;
|
||||
use App\Models\User;
|
||||
use App\Models\UserPosition;
|
||||
use App\Services\AppointmentService;
|
||||
use App\Services\ChatStateService;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class AppointmentController extends Controller
|
||||
{
|
||||
/**
|
||||
* 注入任命服务
|
||||
*/
|
||||
public function __construct(
|
||||
private readonly AppointmentService $appointmentService,
|
||||
private readonly ChatStateService $chatState,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* 任命管理主列表（当前全部在职人员）
|
||||
*/
|
||||
public function index(): View
|
||||
{
|
||||
// 所有在职记录（按部门 rank 倒序、职务 rank 倒序）
|
||||
$activePositions = UserPosition::query()
|
||||
->where('is_active', true)
|
||||
->with([
|
||||
'user',
|
||||
'position.department',
|
||||
'appointedBy',
|
||||
])
|
||||
->join('positions', 'user_positions.position_id', '=', 'positions.id')
|
||||
->join('departments', 'positions.department_id', '=', 'departments.id')
|
||||
->orderByDesc('departments.rank')
|
||||
->orderByDesc('positions.rank')
|
||||
->select('user_positions.*')
|
||||
->get();
|
||||
|
||||
// 部门+职务（供新增任命弹窗下拉选择，带在职人数统计）
|
||||
$departments = Department::with([
|
||||
'positions' => fn ($q) => $q->withCount('activeUserPositions')->ordered(),
|
||||
])->ordered()->get();
|
||||
|
||||
return view('admin.appointments.index', compact('activePositions', 'departments'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 执行新增任命
|
||||
* 管理员在后台直接任命用户，操作人为当前登录管理员
|
||||
*/
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
$request->validate([
|
||||
'username' => 'required|string|exists:users,username',
|
||||
'position_id' => 'required|exists:positions,id',
|
||||
'remark' => 'nullable|string|max:255',
|
||||
]);
|
||||
|
||||
$operator = Auth::user();
|
||||
$target = User::where('username', $request->username)->firstOrFail();
|
||||
$targetPosition = Position::with('department')->findOrFail($request->position_id);
|
||||
|
||||
$result = $this->appointmentService->appoint($operator, $target, $targetPosition, $request->remark);
|
||||
|
||||
if ($result['ok']) {
|
||||
// 向所有当前有人在线的聊天室广播礼花公告（后台操作人不在聊天室内）
|
||||
foreach ($this->chatState->getAllActiveRoomIds() as $roomId) {
|
||||
broadcast(new AppointmentAnnounced(
|
||||
roomId: $roomId,
|
||||
targetUsername: $target->username,
|
||||
positionIcon: $targetPosition->icon ?? '🎖️',
|
||||
positionName: $targetPosition->name,
|
||||
departmentName: $targetPosition->department?->name ?? '',
|
||||
operatorName: $operator->username,
|
||||
));
|
||||
}
|
||||
|
||||
return redirect()->route('admin.appointments.index')->with('success', $result['message']);
|
||||
}
|
||||
|
||||
return redirect()->route('admin.appointments.index')->with('error', $result['message']);
|
||||
}
|
||||
|
||||
/**
|
||||
* 撤销职务
|
||||
*/
|
||||
public function revoke(Request $request, UserPosition $userPosition): RedirectResponse
|
||||
{
|
||||
$operator = Auth::user();
|
||||
$target = $userPosition->user;
|
||||
|
||||
// 撤销前先记录职务信息（撤销后关联就断了）
|
||||
$userPosition->load('position.department');
|
||||
$posIcon = $userPosition->position?->icon ?? '🎖️';
|
||||
$posName = $userPosition->position?->name ?? '';
|
||||
$deptName = $userPosition->position?->department?->name ?? '';
|
||||
|
||||
$result = $this->appointmentService->revoke($operator, $target, $request->remark);
|
||||
|
||||
if ($result['ok']) {
|
||||
// 向所有活跃房间广播撤销公告
|
||||
if ($posName) {
|
||||
foreach ($this->chatState->getAllActiveRoomIds() as $roomId) {
|
||||
broadcast(new AppointmentAnnounced(
|
||||
roomId: $roomId,
|
||||
targetUsername: $target->username,
|
||||
positionIcon: $posIcon,
|
||||
positionName: $posName,
|
||||
departmentName: $deptName,
|
||||
operatorName: $operator->username,
|
||||
type: 'revoke',
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
return redirect()->route('admin.appointments.index')->with('success', $result['message']);
|
||||
}
|
||||
|
||||
return redirect()->route('admin.appointments.index')->with('error', $result['message']);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看某任职记录的在职登录日志
|
||||
*/
|
||||
public function dutyLogs(UserPosition $userPosition): View
|
||||
{
|
||||
$userPosition->load(['user', 'position.department', 'appointedBy']);
|
||||
|
||||
$logs = $userPosition->dutyLogs()
|
||||
->orderByDesc('login_at')
|
||||
->paginate(30);
|
||||
|
||||
return view('admin.appointments.duty-logs', compact('userPosition', 'logs'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看某任职记录的权限操作日志
|
||||
*/
|
||||
public function authorityLogs(UserPosition $userPosition): View
|
||||
{
|
||||
$userPosition->load(['user', 'position.department']);
|
||||
|
||||
$logs = $userPosition->authorityLogs()
|
||||
->with(['targetUser', 'targetPosition'])
|
||||
->orderByDesc('created_at')
|
||||
->paginate(30);
|
||||
|
||||
return view('admin.appointments.authority-logs', compact('userPosition', 'logs'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 历史任职记录（全部 is_active=false 的记录）
|
||||
*/
|
||||
public function history(): View
|
||||
{
|
||||
$history = UserPosition::query()
|
||||
->where('is_active', false)
|
||||
->with(['user', 'position.department', 'appointedBy', 'revokedBy'])
|
||||
->orderByDesc('revoked_at')
|
||||
->paginate(30);
|
||||
|
||||
return view('admin.appointments.history', compact('history'));
|
||||
}
|
||||
|
||||
/**
|
||||
* 搜索用户（供任命弹窗 Ajax 快速查找）
|
||||
*/
|
||||
public function searchUsers(Request $request): JsonResponse
|
||||
{
|
||||
$keyword = $request->input('q', '');
|
||||
|
||||
$users = User::query()
|
||||
->where('id', '!=', 1) // 排除超级管理员
|
||||
->where('username', 'like', "%{$keyword}%")
|
||||
->whereDoesntHave('activePosition') // 排除已有职务的用户
|
||||
->select('id', 'username', 'user_level')
|
||||
->limit(10)
|
||||
->get();
|
||||
|
||||
return response()->json($users);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user