4x99 · yoonper · Jun 3, 2021 · May 27, 2021 · Jun 1, 2021 · Jun 3, 2021
diff --git a/app/Http/Controllers/ConfigJobController.php b/app/Http/Controllers/ConfigJobController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\ConfigJob;
+use Cron\CronExpression;
 use Illuminate\Http\Request;
 
 class ConfigJobController extends Controller
@@ -20,7 +21,11 @@ public function view()
      */
     public function index()
     {
-        return ConfigJob::orderByDesc('id')->get();
+        $data = ConfigJob::orderByDesc('id')->get();
+        foreach ($data as &$item) {
+            $item['next_scan_at'] = $this->getNextScanAt($item['scan_interval_min']);
+        }
+        return $data;
     }
 
     /**
@@ -66,6 +71,7 @@ public function update(Request $request, $id)
             $fields = ['keyword', 'scan_page', 'scan_interval_min', 'store_type', 'description'];
             $configJob = ConfigJob::find($id);
             $success = $configJob->update($request->all($fields));
+            $configJob['next_scan_at'] = $this->getNextScanAt($configJob['scan_interval_min']);
             return ['success' => $success, 'data' => $configJob];
         } catch (\Exception $e) {
             return ['success' => false, 'message' => $e->getMessage()];
@@ -87,4 +93,17 @@ public function destroy($id)
             return ['success' => false, 'message' => $e->getMessage()];
         }
     }
+
+    /**
+     * 下次扫描时间
+     *
+     * @param $interval
+     * @return string
+     */
+    private function getNextScanAt($interval)
+    {
+        $expression = "*/$interval * * * *";
+        $cron = CronExpression::factory($expression);
+        return $cron->getNextRunDate()->format('Y-m-d H:i:s');
+    }
 }
diff --git a/public/css/configJob.css b/public/css/configJob.css
@@ -1,3 +1,9 @@
+.x-grid-cell-inner {
+    white-space: pre-wrap;
+    word-break: break-all;
+    line-height: 20px;
+}
+
 .x-window-text a, .x-window-text span {
     color: #0070D5;
 }

diff --git a/resources/views/configJob/index.blade.php b/resources/views/configJob/index.blade.php
@@ -26,6 +26,7 @@
 
             var grid = Ext.create('plugin.grid', {
                 store: Ext.data.StoreManager.lookup('store'),
+                bufferedRenderer: false,
                 tbar: {
                     margin: '5 12 15 18',
                     items: [
@@ -61,28 +62,40 @@
                     {
                         text: '扫描页数',
                         dataIndex: 'scan_page',
-                        width: 170,
+                        width: 110,
                         align: 'center',
                     },
                     {
-                        text: '扫描间隔（分钟）',
+                        text: '扫描间隔',
                         dataIndex: 'scan_interval_min',
-                        width: 170,
+                        width: 110,
                         align: 'center',
+                        renderer: function (value) {
+                            return value + ' 分钟';
+                        }
                     },
                     {
                         text: '扫描结果',
                         dataIndex: 'store_type',
-                        width: 170,
+                        width: 160,
                         align: 'center',
                         renderer: function (value) {
                             return storeType[value].text;
                         }
                     },
                     {
-                        text: '最后扫描时间',
+                        text: '下次扫描时间',
+                        dataIndex: 'next_scan_at',
+                        width: 160,
+                        align: 'center',
+                        renderer: function (value) {
+                            return value ? value : '-';
+                        }
+                    },
+                    {
+                        text: '最近扫描时间',
                         dataIndex: 'last_scan_at',
-                        width: 170,
+                        width: 160,
                         align: 'center',
                         renderer: function (value) {
                             return value ? value : '-';
@@ -100,7 +113,7 @@
                     {
                         text: '操作',
                         sortable: false,
-                        width: 250,
+                        width: 220,
                         align: 'center',
                         xtype: 'widgetcolumn',
                         widget: {
@@ -182,13 +195,15 @@ function winForm(data) {
                                     name: 'scan_page',
                                     fieldLabel: '扫描页数（每页 30 条）',
                                     minValue: 1,
+                                    allowDecimals: false,
                                     value: data.scan_page ? data.scan_page : 3,
                                 },
                                 {
                                     xtype: 'numberfield',
                                     name: 'scan_interval_min',
                                     fieldLabel: '扫描间隔（分钟）',
                                     minValue: 1,
+                                    allowDecimals: false,
                                     value: data.scan_interval_min ? data.scan_interval_min : 60,
                                 },
                                 {