From fc07256ee581c64abe15576c5b1090a003f57911 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Thu, 5 Jun 2025 21:26:46 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/common/Logic/OrderLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/common/Logic/OrderLogic.php b/application/common/Logic/OrderLogic.php index 7a0d032..c4933b3 100644 --- a/application/common/Logic/OrderLogic.php +++ b/application/common/Logic/OrderLogic.php @@ -121,7 +121,7 @@ class OrderLogic if(!empty($auth)){ $dispatch->admin_user = '管理员：'.$auth->nickname; }else{ - $dispatch->admin_user = 'sys'; + $dispatch->admin_user = '系统'; } $hookParams = [ 'dispatch' => $dispatch, From 863a6621fd58b29c5f0d0e7394caa8cad55ff0f7 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Thu, 5 Jun 2025 21:27:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/orders/Dispatchrecord.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/admin/controller/orders/Dispatchrecord.php b/application/admin/controller/orders/Dispatchrecord.php index 488a633..3c2de1b 100644 --- a/application/admin/controller/orders/Dispatchrecord.php +++ b/application/admin/controller/orders/Dispatchrecord.php @@ -141,7 +141,7 @@ class Dispatchrecord extends Backend $dispatch->follow = 1; } $dispatch->record_count ++; - $params['admin_id'] = $this->auth->id; + //$params['admin_id'] = $this->auth->id; $result = $this->model->allowField(true)->save($params); $dispatch->save(); Db::commit(); From c0a7b7d7e87a1e6bae50bf1e4c22812df421adf6 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Thu, 5 Jun 2025 21:33:40 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/js/backend/auth/admin.js | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/public/assets/js/backend/auth/admin.js b/public/assets/js/backend/auth/admin.js index 8b97e57..1b00de7 100755 --- a/public/assets/js/backend/auth/admin.js +++ b/public/assets/js/backend/auth/admin.js @@ -79,6 +79,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], // } return Table.api.formatter.operate.call(this, value, row, index); }, + align: 'left', buttons: [ { name: "setArea", @@ -91,6 +92,31 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], icon: 'fa fa-add', refresh: true, }, + { + name: 'edit', + text: "修改", + icon: 'fa fa-pencil', + title: __('Edit'), + extend: 'data-toggle="tooltip" data-container="body"', + classname: 'btn btn-xs btn-info btn-editone', + }, + { + name: 'del', + text: "删除", + icon: 'fa fa-trash', + title: __('Delete'), + extend: 'data-toggle="tooltip"', + classname: 'btn btn-xs btn-danger btn-delone', + visible: function (row) { + if (row.id == Config.admin.id) { + return false; + } + if (row.id == 1 || row.id == 100) { + return false; + } + return true; + } + }, ], } ] From 8e581e07c1ef0df87525a4026e005a5edd6749e0 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Thu, 5 Jun 2025 21:35:34 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Message.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/admin/controller/Message.php b/application/admin/controller/Message.php index 2af1bb2..8ca1403 100644 --- a/application/admin/controller/Message.php +++ b/application/admin/controller/Message.php @@ -130,7 +130,7 @@ class Message extends Backend $count = 0; //超管不提醒新消息 //if(!$this->auth->isSuperAdmin()){ - if(!$this->auth->id != 1){ + // if(!$this->auth->id != 1){ $count = $this->model ->where('type',1) ->where('to_id',$this->auth->id) @@ -139,7 +139,7 @@ class Message extends Backend ->whereRaw("FIND_IN_SET({$this->auth->id}, read_uid) = 0 OR read_uid = '' or read_uid is null") ->whereTime('create_time', '>=', '-3 days') ->count(); - } + // } return [ 'count' => $count ]; From 8a396cbcccb8fca82e904b8a247edbc137da444b Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Thu, 5 Jun 2025 21:37:05 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/behavior/OrderDispatchLog.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/admin/behavior/OrderDispatchLog.php b/application/admin/behavior/OrderDispatchLog.php index 50f6d55..e060994 100644 --- a/application/admin/behavior/OrderDispatchLog.php +++ b/application/admin/behavior/OrderDispatchLog.php @@ -4,6 +4,7 @@ namespace app\admin\behavior; use app\admin\controller\SendMailLogic; use app\admin\model\OrderDispatch; +use app\admin\model\TtsLog; use app\common\Logic\NoticeLogic; use app\common\model\Order; use think\Exception; @@ -48,6 +49,7 @@ class OrderDispatchLog ]; $service = new NoticeLogic(); $service->dispatchNotice($dispatch); + TtsLog::create($data); } } From 6ae3d1e1630d83bac26214825494ed5e5fd491ce Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Thu, 5 Jun 2025 21:47:43 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/AutoDispatchLogic.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/admin/controller/AutoDispatchLogic.php b/application/admin/controller/AutoDispatchLogic.php index 39298c4..019c090 100644 --- a/application/admin/controller/AutoDispatchLogic.php +++ b/application/admin/controller/AutoDispatchLogic.php @@ -27,9 +27,9 @@ class AutoDispatchLogic $order->save(); return false; } - //$admin = Admin::where('id',$order->admin_id)->find(); + $admin = Admin::where('id',100)->find(); $insert = [ - 'admin_id' => 1, + 'admin_id' => $admin->id, 'admin_user' => '系统', 'order_id' => $order->id, 'type' => 2, @@ -45,8 +45,8 @@ class AutoDispatchLogic $res = $orderDispatch->allowField(true)->save($insert); $order->status = \app\admin\model\Order::STATUS_DISPATCHED; $order->dispatch_time = date('Y-m-d H:i:s'); - $order->dispatch_admin_id = 1; - $order->dispatch_admin_user = '系统'; + $order->dispatch_admin_id = $admin->id; + $order->dispatch_admin_user =$admin->nickname; $order->worker_id = $worker_id; $order->save(); @@ -54,7 +54,7 @@ class AutoDispatchLogic //日志 $hookparams['order'] = $order; $hookparams['role'] = 1; - $hookparams['auth'] = $auth; + $hookparams['auth'] = $admin; $hookparams['remark'] = '系统自动完成派单';//. $worker->name.'('.$worker->tel.')'; Hook::listen('order_change', $hookparams); From 4d8e3f6986a7c1011d7b53b59642c336aa463902 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Thu, 5 Jun 2025 21:53:08 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/AutoDispatchLogic.php | 2 +- public/assets/js/backend/orders/dispatch2.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/admin/controller/AutoDispatchLogic.php b/application/admin/controller/AutoDispatchLogic.php index 019c090..bacbfe2 100644 --- a/application/admin/controller/AutoDispatchLogic.php +++ b/application/admin/controller/AutoDispatchLogic.php @@ -54,7 +54,7 @@ class AutoDispatchLogic //日志 $hookparams['order'] = $order; $hookparams['role'] = 1; - $hookparams['auth'] = $admin; + $hookparams['auth'] = null; $hookparams['remark'] = '系统自动完成派单';//. $worker->name.'('.$worker->tel.')'; Hook::listen('order_change', $hookparams); diff --git a/public/assets/js/backend/orders/dispatch2.js b/public/assets/js/backend/orders/dispatch2.js index c0ce242..1532d5f 100644 --- a/public/assets/js/backend/orders/dispatch2.js +++ b/public/assets/js/backend/orders/dispatch2.js @@ -90,7 +90,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($, {field: 'worker_name', title: __('Worker_name'), operate: 'LIKE'}, {field: 'worker_tel', title: __('Worker_tel'), operate: 'LIKE'}, {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('自动')}, formatter: Table.api.formatter.normal, - defaultValue: '1' + // defaultValue: '1' }, From 14056b32ae9aa18584a7e25a737d734da0532f36 Mon Sep 17 00:00:00 2001 From: xman <1946321327@qq.com> Date: Thu, 5 Jun 2025 21:57:37 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/common/command/CheckOrderDispatchGotCommand.php | 2 +- application/common/command/CheckSmsPlantCommand.php | 2 +- application/common/command/CheckTTSOverTimeCommand.php | 2 +- application/common/command/CheckTTSPlantCommand.php | 2 +- application/common/command/CheckTTSTaskCommand.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/common/command/CheckOrderDispatchGotCommand.php b/application/common/command/CheckOrderDispatchGotCommand.php index ca4b3fb..ac10b22 100644 --- a/application/common/command/CheckOrderDispatchGotCommand.php +++ b/application/common/command/CheckOrderDispatchGotCommand.php @@ -17,7 +17,7 @@ class CheckOrderDispatchGotCommand extends Command protected function configure() { $this->setName('check:dispatch-toget') - ->setDescription('【自动派单未接单检测,五分钟未接单，重派派单】/【自动派单上门时间已到，未完成上门】，5分钟执行一次'); + ->setDescription('【自动派单未接单检测,五分钟未接单，重派派单】/【自动派单上门时间已到，未完成上门】，每分钟执行一次'); } protected function execute(Input $input, Output $output){ diff --git a/application/common/command/CheckSmsPlantCommand.php b/application/common/command/CheckSmsPlantCommand.php index cef0bfd..87e2563 100644 --- a/application/common/command/CheckSmsPlantCommand.php +++ b/application/common/command/CheckSmsPlantCommand.php @@ -14,7 +14,7 @@ class CheckSmsPlantCommand extends Command protected function configure() { $this->setName('check:dispatch-sms-plant') - ->setDescription('dispatch已预约任务短信提醒，每小时执行一次'); + ->setDescription('dispatch已预约任务短信提醒，每5分钟执行一次'); } protected function execute(Input $input, Output $output){ diff --git a/application/common/command/CheckTTSOverTimeCommand.php b/application/common/command/CheckTTSOverTimeCommand.php index c1b54b0..b0f0eb7 100644 --- a/application/common/command/CheckTTSOverTimeCommand.php +++ b/application/common/command/CheckTTSOverTimeCommand.php @@ -17,7 +17,7 @@ class CheckTTSOverTimeCommand extends Command protected function configure() { $this->setName('check:dispatch-tts-overtime') - ->setDescription('dispatch超时未完成任务语音通知，每10分钟执行一次'); + ->setDescription('dispatch超时未完成任务语音通知，每5分钟执行一次'); } protected function execute(Input $input, Output $output){ diff --git a/application/common/command/CheckTTSPlantCommand.php b/application/common/command/CheckTTSPlantCommand.php index 5261935..f4b797b 100644 --- a/application/common/command/CheckTTSPlantCommand.php +++ b/application/common/command/CheckTTSPlantCommand.php @@ -17,7 +17,7 @@ class CheckTTSPlantCommand extends Command protected function configure() { $this->setName('check:dispatch-tts-plant') - ->setDescription('dispatch已预约任务语音提醒，每小时执行一次'); + ->setDescription('dispatch已预约任务语音提醒，每5分钟执行一次'); } protected function execute(Input $input, Output $output){ diff --git a/application/common/command/CheckTTSTaskCommand.php b/application/common/command/CheckTTSTaskCommand.php index edcf1de..56a3ab0 100644 --- a/application/common/command/CheckTTSTaskCommand.php +++ b/application/common/command/CheckTTSTaskCommand.php @@ -17,7 +17,7 @@ class CheckTTSTaskCommand extends Command protected function configure() { $this->setName('check:dispatch-tts-task') - ->setDescription('语音发送任务，每分钟执行一次'); + ->setDescription('语音发送任务，每1分钟执行一次'); } protected function execute(Input $input, Output $output){