解决代码冲突

app/JsonRpc/CollectorService.php

@@ -213,33 +213,36 @@ class CollectorService implements CollectorServiceInterface
         }
         return Result::success($result);
     }
-    
     /**
      * 获取并搜索规则任务
      * @param array $data
      * @return array|mixed
      */
+
     public function getRule(array $data): array
     {
+
         $where = [];
+        
         if(isset($data['web_id'])){
             $web = Web::where('id',$data['web_id'])->get();
             if(empty($web->toArray())){
                 return Result::error('请输入正确的网站id!');
                 
             }else{
+                //若是根据网站跳转到的规则任务则存到$where数组中
                 $where = [
                     ['web_id','=', $data['web_id']]
                 ];
             }
         } 
+
         if(isset($data['keyWord'])){
             //若存在搜索词,则存到条件数组$where中
             $where = [
                 ['name','like','%'.$data['keyWord'].'%']
             ];
         }
-        var_dump("===============",$where);
         if(empty($where)){
             $rep = Rule::withCount(relations:'arts')->limit($data['pageSize'])->orderBy("created_at","desc")->offset(($data['page']-1)*$data['pageSize'])->get();
         }else{
@@ -255,8 +258,12 @@ class CollectorService implements CollectorServiceInterface
             'rep' => $rep->toArray(),
             'count' => $count
         ];
+
         return Result::success($data);
+
     }
+    
+
      /**
      * 获取某个任务规则
      * @param array $data
@@ -264,13 +271,15 @@ class CollectorService implements CollectorServiceInterface
      */
     public function getOneRule(array $data): array
     {
-        $result = Rule::where('id',$data['id'])->first();
+
+        $result = Rule::withCount(relations:'arts')->where('id',$data['id'])->first();
         if(empty($result)){
             return Result::error('请输入正确的规则任务id！');
             
         }else{
             return Result::success($result);
         } 
+
     }
     /**
      * 修改规则任务
@@ -340,6 +349,7 @@ class CollectorService implements CollectorServiceInterface
      * @param array $data
      * @return array
      */
+
     public function sendCrawler(array $data): array
     {
         //通过规则id 查询规则类型
@@ -380,6 +390,7 @@ class CollectorService implements CollectorServiceInterface
                 $parames = json_decode($info['parameter'],true);
 
 //                var_dump($parames);die;
+
                 $parames['webSiteCode'] = [trim($parames['webSiteCode'], "[]")]; //['jbkzzx'];//
                 $parames['channelCode'] =  [trim($parames['channelCode'], "[]")]; // ['c100008'];//
                 $other = [
@@ -391,7 +402,11 @@ class CollectorService implements CollectorServiceInterface
                 var_dump("开始调用接口方法====",$parames);
 //                die;
                 $this->foreachCurl($wecUrl,$parames,$other);
+
                 Rule::where(['id'=>$data['id']])->update(['status'=>2]);
+
+
+
         }
         return  Result::success([]);
     }
@@ -400,7 +415,7 @@ class CollectorService implements CollectorServiceInterface
      * 把可采集的列表页连接 打包成一个大数组
      * @return void
      */
-    public function addUrlArr($data):array
+    public function addUrlArr($data)
     {
         $arrList = [];
         array_push($arrList,$data['first_url']);
@@ -425,6 +440,7 @@ class CollectorService implements CollectorServiceInterface
         return $arrList;
     }
 
+    
     /**
      * 按照规则采集数据
      * @return void