修改采集器添加规则任务

app/JsonRpc/CollectorService.php

@@ -150,7 +150,88 @@ 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();
+        if(empty($web->toArray())){
+            return Result::error('请输入正确的网站id！');
+            
+        }else{
+            $rulename = Rule::where('name',$data['name'])->get();
+            //查找是否存在规则名称重复的
+            if(empty($rulename->toArray())){
+                //（若是多类型参数一起传过来则根据类型，只获取对应类型需要的参数）
+                switch($data['type']){
 
+                    case 1:
+                        $rule = [
+                            'name' => $data['name'],
+                            'web_id' => $data['web_id'],
+                            'first_url' => $data['first_url'],
+                            'second_start' => $data['second_start'],
+                            'second_num' => $data['second_num'],
+                            'second_end' => $data['second_end'],
+                            'end_pagenum' => $data['end_pagenum'],
+                            'start' => $data['start'],
+                            'con_url' => $data['con_url'],
+                            'title' => $data['title'],
+                            'content' => $data['content']
+                        ];
+                        // var_dump("============1============");       
+                        break;         
+                    case 2:
+                        $rule = [
+                            'name' => $data['name'],
+                            'web_id' => $data['web_id'],
+                            'first_url' => $data['first_url'],
+                            'parameter' => $data['parameter'],
+                            'start' => $data['start'],
+                            'title' => $data['title'],
+                            'content' => $data['content']
+                        ];  
+                        // var_dump("============2============");       
+                        break;        
+                    default:
+                        $rule = [
+                            'name' => $data['name'],
+                            'web_id' => $data['web_id'],
+                            'diy_rule' => $data['diy_rule']
+                        ];        
+                        // var_dump("============3============");       
+                        break;              
+                }
+                if(!empty($data['con_start']) && $data['type'] == 1){
+
+                    $rule ['con_start'] = $data['con_start'];
+                }
+                if(!empty($data['source']) && $data['type'] != 3){
+
+                    $rule ['source'] = $data['source'];
+                }
+                if(isset($data['writer_class']) && $data['type'] != 3){
+                    $rule ['writer_class'] = $data['writer_class'];
+                }
+                if(isset($data['writer']) && $data['type'] != 3){
+                    $rule ['writer'] = $data['writer'];
+                }
+                var_dump($data);
+                date_default_timezone_set('Asia/Shanghai');
+                //若不存在，根据网站类型添加到不行类型的规则表中
+                $result = Rule::insertGetId($rule);
+                
+            }else{
+                return Result::error('此任务已存在！');
+            } 
+             
+        }
+        return Result::success($result);
+        
+    }
     /**
      * 获取并搜索规则任务
      * @param array $data
@@ -275,82 +356,6 @@ class CollectorService implements CollectorServiceInterface
        return  Result::success([]);
     }
 
-
-    /**
-     * 添加任务规则
-     * @param array $data
-     * @return array|mixed
-     */
-    public function addRule(array $data): array
-    {
-        $web = Web::where('id',$data['web_id'])->get();
-        if(empty($web->toArray())){
-            return Result::error('请输入正确的网站id！');
-            
-        }else{
-            $rulename = Rule::where('name',$data['name'])->get();
-            //查找是否存在规则名称重复的
-            if(empty($rulename->toArray())){
-                //（若是多类型参数一起传过来则根据类型，只获取对应类型需要的参数）
-                switch($data['type']){
-                    case 1:
-                        $rule = [
-                            'name' => $data['name'],
-                            'web_id' => $data['web_id'],
-                            'first_url' => $data['first_url'],
-                            'second_start' => $data['second_start'],
-                            'second_num' => $data['second_num'],
-                            'second_end' => $data['second_end'],
-                            'end_pagenum' => $data['end_pagenum'],
-                            'start' => $data['start'],
-                            'title' => $data['title'],
-                            'content' => $data['content']
-                        ];
-                        // var_dump("============1============");       
-                        break;         
-                    case 2:
-                        $rule = [
-                            'name' => $data['name'],
-                            'web_id' => $data['web_id'],
-                            'first_url' => $data['first_url'],
-                            'parameter' => $data['parameter'],
-                            'start' => $data['start'],
-                            'title' => $data['title'],
-                            'content' => $data['content']
-                        ];  
-                        // var_dump("============2============");       
-                        break;        
-                    default:
-                        $rule = [
-                            'name' => $data['name'],
-                            'web_id' => $data['web_id'],
-                            'diy_rule' => $data['diy_rule']
-                        ];        
-                        // var_dump("============3============");       
-                        break;              
-                }
-                if(!empty($data['source']) && $data['type'] != 3){
-
-                    $rule ['source'] = $data['source'];
-                }
-                if(isset($data['writer_class']) && $data['type'] != 3){
-                    $rule ['writer_class'] = $data['writer_class'];
-                }
-                if(isset($data['writer']) && $data['type'] != 3){
-                    $rule ['writer'] = $data['writer'];
-                }
-                date_default_timezone_set('Asia/Shanghai');
-                //若不存在，根据网站类型添加到不行类型的规则表中
-                $result = Rule::insertGetId($rule);
-                
-            }else{
-                return Result::error('此任务已存在！');
-            } 
-             
-        }
-        return Result::success($result);
-    }
-
     /**
      * 修改规则任务
      * @param array $data