修改获取及搜索任务规则

app/JsonRpc/CollectorService.php

@@ -138,6 +138,11 @@ class CollectorService implements CollectorServiceInterface
         }
         return Result::success($result);
     }
+    /**
+     * 添加任务规则
+     * @param array $data
+     * @return array|mixed
+     */
     public function addRule(array $data): array
     {
         $web = Web::where('id',$data['web_id'])->get();
@@ -213,26 +218,30 @@ class CollectorService implements CollectorServiceInterface
      */
     public function getRule(array $data): array
     {
-        $web = Web::where('id',$data['web_id'])->get();
-        if(empty($web->toArray())){
-            return Result::error('请输入正确的网站id!');
-            
-        }else{
-            $where = [
-                ['web_id','=', $data['web_id']]
-            ];
-            if(isset($data['keyWord'])){
-                //若存在搜索词,则存到条件数组$where中
+        if(isset($data['web_id'])){
+            $web = Web::where('id',$data['web_id'])->get();
+            if(empty($web->toArray())){
+                return Result::error('请输入正确的网站id!');
+                
+            }else{
                 $where = [
-                    ['name','like','%'.$data['keyWord'].'%']
+                    ['web_id','=', $data['web_id']]
                 ];
             }
-            $rep = Rule::withCount(relations:'arts')->where($where)->limit($data['pageSize'])->orderBy("created_at","desc")->offset(($data['page']-1)*$data['pageSize'])->get();
-            $count = Rule::where($where)->count();
-            if($count==0){
-                return Result::error('暂无相关规则任务！');
-            }       
+
+        } 
+        if(isset($data['keyWord'])){
+            //若存在搜索词,则存到条件数组$where中
+            $where = [
+                ['name','like','%'.$data['keyWord'].'%']
+            ];
         }
+        $rep = Rule::withCount(relations:'arts')->where($where)->limit($data['pageSize'])->orderBy("created_at","desc")->offset(($data['page']-1)*$data['pageSize'])->get();
+        $count = Rule::where($where)->count();
+        if($count==0){
+            return Result::error('暂无相关规则任务！');
+        }       
+        
         $data = [
             'rep' => $rep->toArray(),
             'count' => $count

runtime/logs/hyperf.log

@@ -1853,3 +1853,62 @@
 [2024-11-27T00:45:39.864622+00:00] sql.INFO: [12.71] select count(*) as aggregate from `col_article` where (`rule_id` = '12') [] []
 =======
 >>>>>>> e4885d7b505b4e8a167ccf93db3f2368c0b661a7
+[2024-11-27T06:38:58.814347+00:00] sql.INFO: [59.68] select * from `col_web` order by `created_at` desc limit 10 offset 0 [] []
+[2024-11-27T06:38:58.841757+00:00] sql.INFO: [14.22] select count(*) as aggregate from `col_web` [] []
+[2024-11-27T07:23:21.430386+00:00] sql.INFO: [68.34] select * from `col_article` where `id` = '3' limit 1 [] []
+[2024-11-27T07:24:03.970081+00:00] sql.INFO: [15.03] select * from `col_web` order by `created_at` desc limit 10 offset 0 [] []
+[2024-11-27T07:24:04.201722+00:00] sql.INFO: [226.16] select count(*) as aggregate from `col_web` [] []
+[2024-11-27T07:31:16.390652+00:00] sql.INFO: [287.56] select * from `col_web` order by `created_at` desc limit 10 offset 0 [] []
+[2024-11-27T07:31:16.417511+00:00] sql.INFO: [14.45] select count(*) as aggregate from `col_web` [] []
+[2024-11-27T07:31:17.165144+00:00] sql.INFO: [16.22] select * from `col_web` order by `created_at` desc limit 10 offset 0 [] []
+[2024-11-27T07:31:17.203862+00:00] sql.INFO: [34.52] select count(*) as aggregate from `col_web` [] []
+[2024-11-27T07:31:18.495625+00:00] sql.INFO: [227.6] select * from `col_web` order by `created_at` desc limit 10 offset 0 [] []
+[2024-11-27T07:31:18.519134+00:00] sql.INFO: [15.16] select count(*) as aggregate from `col_web` [] []
+[2024-11-27T07:31:24.487410+00:00] sql.INFO: [16.61] select * from `col_web` order by `created_at` desc limit 10 offset 0 [] []
+[2024-11-27T07:31:24.509667+00:00] sql.INFO: [14.07] select count(*) as aggregate from `col_web` [] []
+[2024-11-27T07:31:36.253372+00:00] sql.INFO: [14.17] select * from `col_web` order by `created_at` desc limit 10 offset 0 [] []
+[2024-11-27T07:31:36.268372+00:00] sql.INFO: [12.67] select count(*) as aggregate from `col_web` [] []
+[2024-11-27T07:31:46.455836+00:00] sql.INFO: [15.53] select * from `col_web` where `id` = '20' [] []
+[2024-11-27T07:31:46.542877+00:00] sql.INFO: [41.05] select `col_rule`.*, (select count(*) from `col_article` where `col_rule`.`id` = `col_article`.`rule_id`) as `arts_count` from `col_rule` where (`web_id` = '20') order by `created_at` desc limit 10 offset 0 [] []
+[2024-11-27T07:31:46.556686+00:00] sql.INFO: [13.22] select count(*) as aggregate from `col_rule` where (`web_id` = '20') [] []
+[2024-11-27T07:31:50.354560+00:00] sql.INFO: [16.91] select * from `col_web` order by `created_at` desc limit 10 offset 0 [] []
+[2024-11-27T07:31:50.384772+00:00] sql.INFO: [23.72] select count(*) as aggregate from `col_web` [] []
+[2024-11-27T07:31:52.563576+00:00] sql.INFO: [14.47] select * from `col_web` where `id` = '19' [] []
+[2024-11-27T07:31:52.582707+00:00] sql.INFO: [18.06] select `col_rule`.*, (select count(*) from `col_article` where `col_rule`.`id` = `col_article`.`rule_id`) as `arts_count` from `col_rule` where (`web_id` = '19') order by `created_at` desc limit 10 offset 0 [] []
+[2024-11-27T07:31:52.598796+00:00] sql.INFO: [14.48] select count(*) as aggregate from `col_rule` where (`web_id` = '19') [] []
+[2024-11-27T07:31:56.655356+00:00] sql.INFO: [274.79] select * from `col_article` where (`rule_id` = '12') order by `col_article`.`id` desc limit 10 offset 0 [] []
+[2024-11-27T07:31:56.966472+00:00] sql.INFO: [288.96] select `name` from `category` where `category`.`id` in (0) [] []
+[2024-11-27T07:31:56.982002+00:00] sql.INFO: [14.62] select count(*) as aggregate from `col_article` where (`rule_id` = '12') [] []
+[2024-11-27T07:32:05.826132+00:00] sql.INFO: [16.97] select * from `col_article` where (`rule_id` = '12') order by `col_article`.`id` desc limit 10 offset 0 [] []
+[2024-11-27T07:32:05.843191+00:00] sql.INFO: [13.45] select `name` from `category` where `category`.`id` in (0) [] []
+[2024-11-27T07:32:05.858482+00:00] sql.INFO: [14.86] select count(*) as aggregate from `col_article` where (`rule_id` = '12') [] []
+[2024-11-27T07:32:09.123306+00:00] sql.INFO: [31.72] select * from `col_article` where `id` = '3' limit 1 [] []
+[2024-11-27T07:32:24.933509+00:00] sql.INFO: [264.6] select * from `col_article` where (`rule_id` = '12') order by `col_article`.`id` desc limit 10 offset 0 [] []
+[2024-11-27T07:32:24.952121+00:00] sql.INFO: [15.04] select `name` from `category` where `category`.`id` in (0) [] []
+[2024-11-27T07:32:24.966641+00:00] sql.INFO: [13.85] select count(*) as aggregate from `col_article` where (`rule_id` = '12') [] []
+[2024-11-27T07:32:35.901455+00:00] sql.INFO: [25.19] select * from `col_article` where (`rule_id` = '12') order by `col_article`.`id` desc limit 10 offset 0 [] []
+[2024-11-27T07:32:35.920734+00:00] sql.INFO: [14.49] select `name` from `category` where `category`.`id` in (0) [] []
+[2024-11-27T07:32:35.936127+00:00] sql.INFO: [14.77] select count(*) as aggregate from `col_article` where (`rule_id` = '12') [] []
+[2024-11-27T07:33:13.257105+00:00] sql.INFO: [42.57] select * from `col_article` where (`rule_id` = '12') order by `col_article`.`id` desc limit 10 offset 0 [] []
+[2024-11-27T07:33:13.275285+00:00] sql.INFO: [15.33] select `name` from `category` where `category`.`id` in (0) [] []
+[2024-11-27T07:33:13.291977+00:00] sql.INFO: [14.94] select count(*) as aggregate from `col_article` where (`rule_id` = '12') [] []
+[2024-11-27T07:35:42.098673+00:00] sql.INFO: [82.34] select * from `col_article` where (`rule_id` = '12') order by `col_article`.`id` desc limit 10 offset 0 [] []
+[2024-11-27T07:35:42.225204+00:00] sql.INFO: [116.83] select `name` from `category` where `category`.`id` in (0) [] []
+[2024-11-27T07:35:42.238757+00:00] sql.INFO: [12.98] select count(*) as aggregate from `col_article` where (`rule_id` = '12') [] []
+[2024-11-27T07:43:24.165602+00:00] sql.INFO: [1773.3] select * from `col_article` where (`rule_id` = '12') order by `col_article`.`id` desc limit 10 offset 0 [] []
+[2024-11-27T07:43:24.606799+00:00] sql.INFO: [437.74] select `name` from `category` where `category`.`id` in (0) [] []
+[2024-11-27T07:43:24.622805+00:00] sql.INFO: [15.07] select count(*) as aggregate from `col_article` where (`rule_id` = '12') [] []
+[2024-11-27T07:43:30.231191+00:00] sql.INFO: [33.52] select * from `col_article` where (`rule_id` = '12') order by `col_article`.`id` desc limit 10 offset 0 [] []
+[2024-11-27T07:43:30.249189+00:00] sql.INFO: [13.52] select `name` from `category` where `category`.`id` in (0) [] []
+[2024-11-27T07:43:30.266495+00:00] sql.INFO: [16.73] select count(*) as aggregate from `col_article` where (`rule_id` = '12') [] []
+[2024-11-27T07:51:36.555099+00:00] sql.INFO: [929.19] select * from `col_article` where (`rule_id` = '3') [] []
+[2024-11-27T07:51:36.571171+00:00] sql.INFO: [15.41] select * from `col_article` where (`rule_id` = '3' and `state` = '0') order by `col_article`.`id` desc limit 5 offset 0 [] []
+[2024-11-27T07:51:37.208189+00:00] sql.INFO: [636.57] select count(*) as aggregate from `col_article` where (`rule_id` = '3' and `state` = '0') [] []
+[2024-11-27T07:51:43.948012+00:00] sql.INFO: [18.02] select * from `col_article` where (`rule_id` = '3') order by `col_article`.`id` desc limit 5 offset 0 [] []
+[2024-11-27T07:51:43.961194+00:00] sql.INFO: [12.52] select count(*) as aggregate from `col_article` where (`rule_id` = '3') [] []
+[2024-11-27T07:51:54.027965+00:00] sql.INFO: [17.55] select * from `col_article` where (`rule_id` = '12') order by `col_article`.`id` desc limit 5 offset 0 [] []
+[2024-11-27T07:51:55.341984+00:00] sql.INFO: [1307.6] select `name` from `category` where `category`.`id` in (0) [] []
+[2024-11-27T07:51:55.357238+00:00] sql.INFO: [14.71] select count(*) as aggregate from `col_article` where (`rule_id` = '12') [] []
+[2024-11-27T07:58:57.008536+00:00] sql.INFO: [77.13] select * from `col_article` where (`rule_id` = '12') order by `col_article`.`id` desc limit 10 offset 0 [] []
+[2024-11-27T07:58:57.070197+00:00] sql.INFO: [53.82] select `name` from `category` where `category`.`id` in (0) [] []
+[2024-11-27T07:58:57.117912+00:00] sql.INFO: [46.51] select count(*) as aggregate from `col_article` where (`rule_id` = '12') [] []