diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php index 399340140..4fb1a7f62 100644 --- a/app/admin/controller/Queue.php +++ b/app/admin/controller/Queue.php @@ -16,7 +16,9 @@ namespace app\admin\controller; +use app\admin\model\SystemQueue; use think\admin\Controller; +use think\admin\helper\QueryHelper; use think\admin\service\AdminService; use think\admin\service\ProcessService; use think\admin\service\QueueService; @@ -46,31 +48,31 @@ class Queue extends Controller */ public function index() { - if ($this->isSuper = AdminService::instance()->isSuper()) { - $process = ProcessService::instance(); - if ($process->iswin() || empty($_SERVER['USER'])) { - $this->command = $process->think('xadmin:queue start'); - } else { - $this->command = "sudo -u {$_SERVER['USER']} {$process->think('xadmin:queue start')}"; + $this->_query(SystemQueue::class)->layTable(function () { + $this->title = '系统任务管理'; + $this->iswin = ProcessService::instance()->iswin(); + // 超级管理面板 + if ($this->isSuper = AdminService::instance()->isSuper()) { + $process = ProcessService::instance(); + if ($process->iswin() || empty($_SERVER['USER'])) { + $this->command = $process->think('xadmin:queue start'); + } else { + $this->command = "sudo -u {$_SERVER['USER']} {$process->think('xadmin:queue start')}"; + } } - } - - // 任务状态统计 - $this->total = ['dos' => 0, 'pre' => 0, 'oks' => 0, 'ers' => 0]; - $query = $this->app->db->name($this->table)->field('status,count(1) count'); - $query->group('status')->select()->map(function ($item) { - if ($item['status'] === 1) $this->total['pre'] = $item['count']; - if ($item['status'] === 2) $this->total['dos'] = $item['count']; - if ($item['status'] === 3) $this->total['oks'] = $item['count']; - if ($item['status'] === 4) $this->total['ers'] = $item['count']; + // 任务状态统计 + $this->total = ['dos' => 0, 'pre' => 0, 'oks' => 0, 'ers' => 0]; + $query = $this->app->db->name($this->table)->field('status,count(1) count'); + $query->group('status')->select()->map(function ($item) { + if ($item['status'] === 1) $this->total['pre'] = $item['count']; + if ($item['status'] === 2) $this->total['dos'] = $item['count']; + if ($item['status'] === 3) $this->total['oks'] = $item['count']; + if ($item['status'] === 4) $this->total['ers'] = $item['count']; + }); + }, function (QueryHelper $query) { + $query->timeBetween('enter_time,exec_time')->dateBetween('create_at'); + $query->equal('status')->like('code,title,command'); }); - - // 页面变量赋值 - $this->title = '系统任务管理'; - $this->iswin = ProcessService::instance()->iswin(); - // 任务列表查询及分页 - $query = $this->_query($this->table)->timeBetween('enter_time,exec_time')->dateBetween('create_at'); - $query->equal('status')->like('code,title,command')->order('loops_time desc,id desc')->page(); } /** diff --git a/app/admin/model/SystemQueue.php b/app/admin/model/SystemQueue.php new file mode 100644 index 000000000..02c0242d5 --- /dev/null +++ b/app/admin/model/SystemQueue.php @@ -0,0 +1,59 @@ + 0 ? format_datetime($value) : ''; + } + + /** + * 执行结束时间处理 + * @param mixed $value + * @param array $data + * @return string + */ + public function getOuterTimeAttr($value, array $data): string + { + if ($value > 0 && $value > $data['enter_time']) { + return sprintf("%.4f", $data['outer_time'] - $data['enter_time']) . ' 秒'; + } else { + return '-'; + } + } + + /** + * 格式化创建时间 + * @param string $value + * @return string + */ + public function getCreateAtAttr(string $value): string + { + return format_datetime($value); + } +} \ No newline at end of file diff --git a/app/admin/view/queue/index.html b/app/admin/view/queue/index.html index 02ee24100..4dac1da44 100644 --- a/app/admin/view/queue/index.html +++ b/app/admin/view/queue/index.html @@ -1,4 +1,4 @@ -{extend name='main'} +{extend name='table'} {block name="button"} @@ -14,7 +14,7 @@ - + {/block} @@ -23,7 +23,7 @@
-
等待处理
+
等待处理
{$total.pre|default=0}
待处理的任务数量
@@ -31,7 +31,7 @@
-
正在处理
+
正在处理
{$total.dos|default=0}
处理中的任务数量
@@ -39,7 +39,7 @@
-
处理完成
+
处理完成
{$total.oks|default=0}
处理完成的任务数量
@@ -47,7 +47,7 @@
-
处理失败
+
处理失败
{$total.ers|default=0}
处理失败的任务数量
@@ -56,76 +56,74 @@
{include file='queue/index_search'} - - {notempty name='list'} - - - - - - - - - {/notempty} - - {foreach $list as $key=>$vo} - - - - - - - {/foreach} - -
- - 任务信息任务时间任务状态
- - - 任务编号：{$vo.code|default=''}
- 任务名称：{$vo.title|default=''}
- 任务指令：{$vo.command|default=''} - 		- 计划时间：{$vo.exec_time|format_datetime} {if isset($vo.exec_pid) and $vo.exec_pid>0}（ 进程 {$vo.exec_pid|default='-'} ）{/if}
- {if $vo.enter_time>0 and $vo.outer_time>0} 执行时间：{$vo.enter_time|format_datetime}（ 耗时 {:sprintf("%.4f",$vo.outer_time-$vo.enter_time)} 秒 ）{elseif $vo.status eq 2} 执行时间：{$vo.enter_time|format_datetime}（ 任务执行中 ）{else}执行时间：任务还没有执行，等待执行...{/if}
- 创建时间：{$vo.create_at|format_datetime} {if isset($vo.loops_time) and $vo.loops_time > 0}（ 每 {$vo.loops_time|default='0'} 秒执行，共 {$vo.attempts} 次）{else}（ 共执行 {$vo.attempts} 次 ） {/if} - 		-
- - 循 - - - - 复 - - 单 - - - - 等待处理 - - 正在处理 - - 处理完成 - - 处理失败 - - - - - - - - - - - - - - -
-
{$vo.exec_desc|raw|default="没有获取到状态描述"}
-
- {empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} +
-{/block} \ No newline at end of file +{/block} + +{block name='script'} + + + +{/block} diff --git a/public/static/admin.js b/public/static/admin.js index 15aa03256..89f955cab 100644 --- a/public/static/admin.js +++ b/public/static/admin.js @@ -665,7 +665,9 @@ $(function () { opt.page = params.page !== false ? (params.page || true) : false, opt.autoSort = params.autoSort === true; opt.loading = params.loading === true, opt.limit = params.limit || 20, opt.cols = params.cols || [[]]; opt.done = function () { - $(elem).next().find(".layui-btn:not([data-table-id])").attr('data-table-id', elem.id); + var tableView = $(elem).next(); + tableView.find('[data-load]:not([data-table-id])').attr('data-table-id', elem.id); + tableView.find('[data-action]:not([data-table-id])').attr('data-table-id', elem.id); }; // 动态设置最大高度 if (opt.height === 'full') { @@ -730,7 +732,12 @@ $(function () { (function (confirm, callable) { confirm ? $.msg.confirm(confirm, callable) : callable(); })(emap.confirm, function () { - $.form.load(emap.load, data, 'get', null, true, emap.tips, emap.time); + var call = !emap.tableId ? false : function (ret) { + if (ret.code > 0) return $.msg.success(ret.info, 3, function () { + $('#' + emap.tableId).trigger('reload'); + }), false; + } + $.form.load(emap.load, data, 'get', call, true, emap.tips, emap.time); }); }); @@ -799,12 +806,12 @@ $(function () { (function (confirm, callable) { confirm ? $.msg.confirm(confirm, callable) : callable(); })(emap.confirm, function () { - var callable = !emap.tableId ? false : function (ret) { + var call = !emap.tableId ? false : function (ret) { if (ret.code > 0) return $.msg.success(ret.info, 3, function () { $('#' + emap.tableId).trigger('reload'); }), false; } - $.form.load(emap.action, data, emap.method || 'post', callable, load, tips, emap.time) + $.form.load(emap.action, data, emap.method || 'post', call, load, tips, emap.time) }); });