合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2379

@@ -84,7 +84,7 @@ class GeoQuestionRes extends Command
                     GET_RESULT:
                     GET_RESULT:
                     $error_num++;
                     $error_num++;
                     try {
                     try {
-                        echo '执行时间：'.date('Y-m-d H:i:s').'->执行次数：'.$error_num.',执行平台：'.$platform.PHP_EOL;
+                        $this->output('执行时间：'.date('Y-m-d H:i:s').'->执行次数：'.$error_num.',执行平台：'.$platform.'执行的项目id:'.$taskInfo['project_id'].PHP_EOL);
                         if ($error_num >= 3) {
                         if ($error_num >= 3) {
                             continue;
                             continue;
                         }
                         }

@@ -114,9 +114,10 @@ class GeoArticleController extends BaseController
      */
      */
     public function del(){
     public function del(){
         $this->request->validate([
         $this->request->validate([
-            'id'=>'required',
+            'ids'=>'required|array',
         ],[
         ],[
-            'id.required' => 'ID不能为空',
+            'ids.required' => 'IDs不能为空',
+            'ids.array' => '数据详情为数组',
         ]);
         ]);
         $data = $this->logic->delArticle();
         $data = $this->logic->delArticle();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);

@@ -91,9 +91,10 @@ class GeoLinkController extends BaseController
      */
      */
     public function del(){
     public function del(){
         $this->request->validate([
         $this->request->validate([
-            'id'=>'required',
+            'ids'=>'required|array',
         ],[
         ],[
-            'id.required' => 'ID不能为空',
+            'ids.required' => 'IDs不能为空',
+            'ids.array' => '数据详情为数组',
         ]);
         ]);
         $data = $this->logic->delLink();
         $data = $this->logic->delLink();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);

@@ -115,7 +115,7 @@ class GeoArticleLogic extends BaseLogic
      */
      */
     public function delArticle(){
     public function delArticle(){
         try {
         try {
-            $this->model->del($this->param);
+            $this->model->del(['id'=>['in',$this->param['ids']]]);
         }catch (\Exception $e){
         }catch (\Exception $e){
             $this->fail('删除失败，请联系管理员.');
             $this->fail('删除失败，请联系管理员.');
         }
         }

@@ -64,6 +64,13 @@ class GeoLinkLogic extends BaseLogic
      * @time   :2025/7/14 16:50
      * @time   :2025/7/14 16:50
      */
      */
     public function saveLink(){
     public function saveLink(){
+        $data = [
+            'project_id' => 1,
+            'data' => [
+                ['da'=>'ce_shi1', 'url'=>'www.baidu.com', 'send_time'=>'2021-07-09 11:12:12'],
+                ['da'=>'ce_shi2', 'url'=>'www.baidu1.com', 'send_time'=>'2021-07-10 11:13:12'],
+            ],
+        ];
         try {
         try {
             if(!empty($this->param['data'])){
             if(!empty($this->param['data'])){
                 $data = [];
                 $data = [];
@@ -92,7 +99,7 @@ class GeoLinkLogic extends BaseLogic
      */
      */
     public function delLink(){
     public function delLink(){
         try {
         try {
-            $this->model->del($this->param);
+            $this->model->del(['id'=>['in',$this->param['ids']]]);
         }catch (\Exception $e){
         }catch (\Exception $e){
             $this->fail('删除失败，请联系管理员.');
             $this->fail('删除失败，请联系管理员.');
         }
         }