From ba7b78a736f7eabafefc102fcf36f32111ea62e0 Mon Sep 17 00:00:00 2001
From: "525833532@qq.com" <QQ525833532>
Date: Wed, 17 Aug 2022 10:58:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=82=E6=AD=A5=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8F=AF=E8=AE=BE=E7=BD=AE=E7=AC=AC=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=97=B6=E9=97=B4=EF=BC=9A=E4=BE=BF=E4=BA=8E?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=A6=82=20=E9=9C=80=E8=A6=81=E6=AF=8F?=
 =?UTF-8?q?=E5=A4=A9=E5=87=8C=E6=99=A8=E6=89=A7=E8=A1=8C=E7=9A=84=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E5=90=AF=E5=8A=A8=E6=97=B6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=BB=B6=E6=97=B6=E6=97=B6=E9=97=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=86=8D=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=AC=A1=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Queue.php  | 42 +++++++++++++++++++++++++++++++++
 app/admin/view/queue/exec.html  | 24 +++++++++++++++++++
 app/admin/view/queue/index.html |  2 +-
 3 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 app/admin/view/queue/exec.html

diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php
index a7152eed1..0880271b2 100644
--- a/app/admin/controller/Queue.php
+++ b/app/admin/controller/Queue.php
@@ -112,4 +112,46 @@ class Queue extends Controller
     {
         SystemQueue::mDelete();
     }
+
+
+    /**
+     * 设置重复任务的下次执行时间
+     * @auth true
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function exec()
+    {
+        if ($this->request->isGet()) {
+            SystemQueue::mForm('', 'code');
+        } else {
+            try {
+                $data = $this->_vali([
+                    'code.require' => '任务编号不能为空！',
+                    'exec_time.require' => '执行时间不能为空',
+                ]);
+
+                // 任务编号
+                $map = ['code' => $data['code']];
+                $info = SystemQueue::mk()->where($map)->find();
+                if (empty($info)) $this->error('任务不存在');
+
+                // 订单状态检查
+                if ($info['status'] <> 1) $this->error('任务当前状态不可重置下次执行时间');
+
+                // 更新任务下次执行时间
+                $this->app->db->transaction(function () use ($map, $data) {
+                    SystemQueue::mk()->where($map)->update([
+                        'exec_time' => strtotime($data['exec_time'])
+                    ]);
+                });
+                $this->success('任务重置成功！');
+            } catch (HttpResponseException $exception) {
+                throw $exception;
+            } catch (Exception $exception) {
+                $this->error($exception->getMessage());
+            }
+        }
+    }
 }
diff --git a/app/admin/view/queue/exec.html b/app/admin/view/queue/exec.html
new file mode 100644
index 000000000..3c30f0e9d
--- /dev/null
+++ b/app/admin/view/queue/exec.html
@@ -0,0 +1,24 @@
+<form action="{:sysuri()}" method="post" data-auto="true" class="layui-form layui-card" data-table-id="MenuTable">
+
+    <div class="layui-card-body">
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">下次执行时间</label>
+            <div class="layui-input-block">
+                <input name="exec_time" value='' data-date-input="datetime" required placeholder="请选择下次执行时间，请勿早于当前时间" class="layui-input">
+                <p class="help-block"><b>仅重复任务可设置下次执行时间</b></p>
+				<p class="help-block">启动重复任务时可设置延时时间</p>
+                <p class="help-block">再手动修改下次(第一次的)时间即可</p>
+            </div>
+        </div>
+
+    </div>
+
+    <div class="hr-line-dashed"></div>
+    {notempty name='vo.code'}<input type='hidden' value='{$vo.code}' name='code'>{/notempty}
+
+    <div class="layui-form-item text-center">
+        <button class="layui-btn" type='submit' data-confirm="确定要重置该任务的下次执行时间吗？">保存数据</button>
+        <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/admin/view/queue/index.html b/app/admin/view/queue/index.html
index cf1b5d516..ec5d4c03a 100644
--- a/app/admin/view/queue/index.html
+++ b/app/admin/view/queue/index.html
@@ -104,7 +104,7 @@
     {{# if(d.status===4||d.status===3){ }}
     <a class="layui-btn layui-btn-sm" data-confirm="确定要重置该任务吗？" data-queue="{:url('redo')}?code={{d.code}}">重 置</a>
     {{# }else{ }}
-    <a class="layui-btn layui-btn-sm layui-btn-disabled">重 置</a>
+    <a class="layui-btn layui-btn-sm" data-width="400px" data-modal='{:url("exec")}?code={{d.code}}'">重 置</a>
     {{# } }}
     <!--{/if}-->