fix: make ticket queues fully reachable

go
codex 3 weeks ago
parent 4c31cb7863
commit 1cc6386d10

@ -212,9 +212,17 @@ class TicketController extends AdminController
$ticketType = $this->ticketColumnExpression($schema, 'ticket_type', "'technical'");
$priority = $this->ticketColumnExpression($schema, 'priority', "'medium'");
$instanceId = $this->ticketColumnExpression($schema, 'instance_id', 'NULL');
$datatables->query('Select ticket.id as op,ticket.id,ticket.datetime,ticket.title,ticket.userid,user.user_name,'
. $ticketType . ' as ticket_type,' . $priority . ' as priority,' . $instanceId
. ' as instance_id,ticket.status from ticket,user where ticket.userid = user.id and ticket.rootid = 0');
$datatables->query('SELECT ticket.id AS op,ticket.id,'
. 'CASE WHEN ticket_activity.last_reply_at IS NULL '
. 'OR ticket_activity.last_reply_at < ticket.datetime '
. 'THEN ticket.datetime ELSE ticket_activity.last_reply_at END AS datetime,'
. 'ticket.title,ticket.userid,user.user_name,'
. $ticketType . ' AS ticket_type,' . $priority . ' AS priority,' . $instanceId
. ' AS instance_id,ticket.status FROM ticket '
. 'INNER JOIN user ON ticket.userid = user.id '
. 'LEFT JOIN (SELECT rootid, MAX(datetime) AS last_reply_at FROM ticket '
. 'WHERE rootid <> 0 GROUP BY rootid) AS ticket_activity ON ticket_activity.rootid = ticket.id '
. 'WHERE ticket.rootid = 0');
$datatables->edit('op', function ($data) {
return '<a class="btn btn-brand" href="/admin/ticket/'.$data['id'].'/view">查看</a>';
@ -236,8 +244,22 @@ class TicketController extends AdminController
return $data['status'] == 1 ? '开启' : '关闭';
});
$statusTotals = Ticket::where('rootid', 0)
->selectRaw('COUNT(*) AS total')
->selectRaw('SUM(CASE WHEN status = 1 THEN 1 ELSE 0 END) AS open_count')
->selectRaw('SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS closed_count')
->first();
$payload = $datatables->generate(false);
$payload['statusTotals'] = [
'total' => (int) ($statusTotals->total ?? 0),
'open' => (int) ($statusTotals->open_count ?? 0),
'closed' => (int) ($statusTotals->closed_count ?? 0),
];
$body = $response->getBody();
$body->write($datatables->generate());
$body->write((string) json_encode($payload, JSON_UNESCAPED_UNICODE));
return $response->withHeader('Content-Type', 'application/json; charset=utf-8');
}
private function ticketAttachmentsAvailable(): bool

@ -607,11 +607,16 @@ class UserController extends BaseController
{
$pageNum = 1;
if (isset($request->getQueryParams()["page"])) {
$pageNum = $request->getQueryParams()["page"];
$pageNum = max(1, (int) $request->getQueryParams()["page"]);
}
$openTickets = Ticket::where("userid", $this->user->id)->where("rootid", 0)->where("status", 1)->count();
$closedTickets = Ticket::where("userid", $this->user->id)->where("rootid", 0)->where("status", 0)->count();
$tickets = Ticket::where("userid", $this->user->id)->where("rootid", 0)->orderBy("datetime", "desc")->paginate(15, ['*'], 'page', $pageNum);
$tickets = Ticket::where("userid", $this->user->id)->where("rootid", 0)
->selectRaw('ticket.*, COALESCE((SELECT MAX(ticket_replies.datetime) '
. 'FROM ticket AS ticket_replies WHERE ticket_replies.rootid = ticket.id), '
. 'ticket.datetime) AS last_activity_at')
->orderByDesc('last_activity_at')->orderByDesc('id')
->paginate(15, ['*'], 'page', $pageNum);
$tickets->setPath('/user/ticket');
return $this->view()->assign('tickets', $tickets)

@ -15,6 +15,12 @@ class Ticket extends Model
{
return date("Y-m-d H:i:s", $this->attributes['datetime']);
}
public function lastActivity()
{
$timestamp = $this->attributes['last_activity_at'] ?? $this->attributes['datetime'];
return date("Y-m-d H:i:s", (int) $timestamp);
}
public function User()
{

@ -84,7 +84,7 @@
<th style="width: 100px;">类型</th>
<th style="width: 90px;">优先级</th>
<th style="width: 100px;">实例</th>
<th style="width: 190px;">时间</th>
<th style="width: 190px;">最近活动</th>
<th style="width: 110px;">状态</th>
<th style="width: 120px;" class="text-end">操作</th>
</tr>
@ -97,6 +97,14 @@
</table>
</div>
</div>
<div class="card-footer d-flex align-items-center justify-content-between flex-wrap gap-2">
<span class="text-muted fs-13" id="ticketPageSummary">读取中</span>
<div class="d-flex align-items-center gap-2">
<button class="btn btn-sm btn-light" id="ticketPagePrevious" type="button" disabled>上一页</button>
<span class="badge text-bg-light" id="ticketPageNumber">第 1 页</span>
<button class="btn btn-sm btn-light" id="ticketPageNext" type="button" disabled>下一页</button>
</div>
</div>
</div>
<div class="admin-toast" id="ticketToast"></div>
@ -112,8 +120,16 @@
var search = document.getElementById('ticketSearch');
var reload = document.getElementById('ticketReload');
var toast = document.getElementById('ticketToast');
var pageSummary = document.getElementById('ticketPageSummary');
var pageNumber = document.getElementById('ticketPageNumber');
var previousPage = document.getElementById('ticketPagePrevious');
var nextPage = document.getElementById('ticketPageNext');
var filter = 'all';
var allRows = [];
var page = 0;
var pageSize = 25;
var recordsFiltered = 0;
var requestSerial = 0;
var searchTimer = null;
if (window.VenixAdminSearchState) {
window.VenixAdminSearchState.bind(search);
@ -154,32 +170,24 @@
return item.status === '开启' || item.status === '1' || item.status === 1;
}
function updateStats(data) {
var normalized = data.map(normalize);
var openCount = normalized.filter(isOpen).length;
total.textContent = normalized.length;
open.textContent = openCount;
closed.textContent = normalized.length - openCount;
function updateStats(totals, fallbackTotal) {
totals = totals || {};
total.textContent = typeof totals.total === 'number' ? totals.total : fallbackTotal;
open.textContent = typeof totals.open === 'number' ? totals.open : '--';
closed.textContent = typeof totals.closed === 'number' ? totals.closed : '--';
}
function render(data) {
var keyword = (search.value || '').toLowerCase().trim();
var normalized = data.map(normalize);
var filtered = normalized.filter(function (item) {
var text = [item.id, item.title, item.userid, item.user_name, item.datetime].join(' ').toLowerCase();
var statusMatched = filter === 'all' || (filter === 'open' && isOpen(item)) || (filter === 'closed' && !isOpen(item));
return statusMatched && (!keyword || text.indexOf(keyword) !== -1);
});
count.textContent = '共 ' + filtered.length + ' 条';
count.textContent = '共 ' + recordsFiltered + ' 条';
if (!filtered.length) {
if (!normalized.length) {
rows.innerHTML = '<tr><td colspan="9" class="text-center text-muted py-4">暂无工单</td></tr>';
return;
}
rows.innerHTML = '';
filtered.forEach(function (item) {
normalized.forEach(function (item) {
var tr = document.createElement('tr');
var openStatus = isOpen(item);
tr.innerHTML =
@ -199,25 +207,41 @@
function buildParams() {
var params = new URLSearchParams();
params.set('draw', '1');
params.set('start', '0');
params.set('length', '500');
params.set('search[value]', '');
params.set('order[0][column]', '1');
params.set('start', String(page * pageSize));
params.set('length', String(pageSize));
params.set('search[value]', search.value.trim());
params.set('order[0][column]', '2');
params.set('order[0][dir]', 'desc');
['op', 'id', 'datetime', 'title', 'userid', 'user_name', 'ticket_type', 'priority', 'instance_id', 'status'].forEach(function (column, index) {
params.set('columns[' + index + '][data]', column);
params.set('columns[' + index + '][name]', '');
params.set('columns[' + index + '][searchable]', 'true');
params.set('columns[' + index + '][orderable]', 'true');
params.set('columns[' + index + '][search][value]', '');
params.set('columns[' + index + '][search][value]', column === 'status'
? (filter === 'open' ? '1' : (filter === 'closed' ? '0' : ''))
: '');
params.set('columns[' + index + '][search][regex]', 'false');
});
return params;
}
function loadTickets() {
rows.innerHTML = '<tr><td colspan="9" class="text-center text-muted py-4">工单加载中</td></tr>';
function updatePagination() {
var pages = Math.max(1, Math.ceil(recordsFiltered / pageSize));
var first = recordsFiltered ? page * pageSize + 1 : 0;
var last = Math.min((page + 1) * pageSize, recordsFiltered);
previousPage.disabled = page <= 0;
nextPage.disabled = page + 1 >= pages;
pageNumber.textContent = '第 ' + (page + 1) + ' / ' + pages + ' 页';
pageSummary.textContent = recordsFiltered ? '显示 ' + first + '–' + last + ' 条' : '暂无匹配工单';
}
function loadTickets(resetPage) {
if (resetPage) page = 0;
var serial = ++requestSerial;
rows.innerHTML = '<tr><td colspan="9" class="text-center text-muted py-4">工单加载中</td></tr>';
count.textContent = '读取中';
previousPage.disabled = true;
nextPage.disabled = true;
fetch('/admin/ticket/ajax', {
method: 'POST',
@ -233,12 +257,16 @@
}
return response.json();
}).then(function (json) {
allRows = json.data || [];
updateStats(allRows);
render(allRows);
if (serial !== requestSerial) return;
recordsFiltered = Number(json.recordsFiltered || 0);
updateStats(json.statusTotals, Number(json.recordsTotal || 0));
render(json.data || []);
updatePagination();
}).catch(function () {
if (serial !== requestSerial) return;
rows.innerHTML = '<tr><td colspan="9" class="text-center text-danger py-4">工单读取失败</td></tr>';
count.textContent = '读取失败';
pageSummary.textContent = '读取失败';
showToast('工单读取失败', 'is-error');
});
}
@ -249,16 +277,27 @@
document.querySelectorAll('[data-ticket-filter]').forEach(function (item) {
item.classList.toggle('active', item === button);
});
render(allRows);
loadTickets(true);
});
});
reload.addEventListener('click', loadTickets);
previousPage.addEventListener('click', function () {
if (page <= 0) return;
page -= 1;
loadTickets(false);
});
nextPage.addEventListener('click', function () {
if ((page + 1) * pageSize >= recordsFiltered) return;
page += 1;
loadTickets(false);
});
reload.addEventListener('click', function () { loadTickets(false); });
search.addEventListener('input', function () {
render(allRows);
window.clearTimeout(searchTimer);
searchTimer = window.setTimeout(function () { loadTickets(true); }, 250);
});
loadTickets();
loadTickets(true);
})();
</script>
{/literal}

@ -54,7 +54,7 @@
{elseif $ticket->priority|default:'' == 'low'}<span class="vu-ticket-tag">低优先级</span>{/if}
</div>
<h3>{$ticket->title|escape:"html"}</h3>
<p><i class="mdi mdi-clock-outline" aria-hidden="true"></i>{$ticket->datetime()}</p>
<p><i class="mdi mdi-clock-outline" aria-hidden="true"></i>最近活动 {$ticket->lastActivity()}</p>
</div>
<div class="vu-support-ticket-side">
<span class="vu-support-status {if $ticket->status==1}is-open{else}is-closed{/if}">

@ -570,6 +570,7 @@ ALTER TABLE `ss_password_reset`
ALTER TABLE `ticket`
ADD PRIMARY KEY (`id`),
ADD KEY `ticket_overview_root_status` (`rootid`,`status`),
ADD KEY `ticket_activity_root_datetime` (`rootid`,`datetime`),
ADD KEY `ticket_instance` (`instance_id`,`userid`,`rootid`);
ALTER TABLE `user`

@ -0,0 +1,47 @@
<?php
$root = dirname(__DIR__);
$template = file_get_contents($root . '/resources/views/venix/admin/ticket/index.tpl');
$controller = file_get_contents($root . '/app/Controllers/Admin/TicketController.php');
$userController = file_get_contents($root . '/app/Controllers/UserController.php');
$schema = file_get_contents($root . '/sql/ss.sql');
$assert = static function ($condition, string $message): void {
if (!$condition) {
throw new RuntimeException($message);
}
};
$assert(
!str_contains($template, "params.set('length', '500')"),
'The administrator ticket page must not preload a capped pseudo-complete queue.'
);
$assert(
str_contains($template, "params.set('start', String(page * pageSize))")
&& str_contains($template, "params.set('length', String(pageSize))")
&& str_contains($template, "params.set('search[value]', search.value.trim())"),
'The administrator ticket page must send real server-side paging and search parameters.'
);
$assert(
str_contains($template, 'recordsFiltered')
&& str_contains($template, 'ticketPagePrevious')
&& str_contains($template, 'ticketPageNext'),
'The administrator ticket page must project filtered totals into paging controls.'
);
$assert(
str_contains($controller, 'last_reply_at')
&& str_contains($controller, "'statusTotals'")
&& str_contains($controller, 'generate(false)'),
'The ticket API must expose recent activity and complete status totals.'
);
$assert(
str_contains($userController, 'last_activity_at')
&& str_contains($userController, 'orderByDesc'),
'The user ticket queue must use the same recent-activity ordering contract.'
);
$assert(
str_contains($schema, 'ticket_activity_root_datetime'),
'The ticket schema must index root/activity time for the recent-activity projection.'
);
echo "Administrator ticket queue contract passed.\n";
Loading…
Cancel
Save