Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -9,7 +9,6 @@
 
 
 namespace App\Http\Controllers\Aside\Com;
 namespace App\Http\Controllers\Aside\Com;
 
 
-use App\Helper\Common;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Models\Com\UpdateLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Com\UpdateOldInfo;
 use App\Models\Com\UpdateOldInfo;
@@ -17,7 +16,6 @@ use App\Models\Domain\DomainInfo;
 use App\Models\Project\ProjectUpdateTdk;
 use App\Models\Project\ProjectUpdateTdk;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Redis;
 
 
 /**
 /**
  * @remark :b端网站更新相关
  * @remark :b端网站更新相关
@@ -105,12 +103,23 @@ class UpdateController extends BaseController
         //关闭数据库
         //关闭数据库
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
 
 
-        $update = ['collect_status' => 0];
-        if ($this->param['type'] == 2 && !$domain_info) {
-            $update['status'] = 0;
+        if ($domain_info) {
+            $old_info = UpdateOldInfo::where('project_id', $this->param['project_id'])->first();
+            if (!$old_info) {
+                $old_info = new UpdateOldInfo();
+                $old_info->project_id = $this->param['project_id'];
+                $old_info->link_type = 0;
+                $old_info->old_domain_online = $domain_info->domain;
+            }
+            $old_info->old_domain_test = $test_domain;
+            $old_info->save();
         }
         }
 
 
-        UpdateLog::where('project_id', $this->param['project_id'])->whereIn('api_type', ['post', 'page', 'news', 'blog'])->update($update);
+        UpdateLog::where('project_id', $this->param['project_id'])->whereNotIn('api_type', ['category', 'category_news', 'website_info', 'tag'])->update(['collect_status' => 0]);
+
+        if ($this->param['type'] == 2 && !$domain_info) {
+            UpdateLog::where('project_id', $this->param['project_id'])->whereNotIn('api_type', ['category', 'category_news'])->update(['status' => 0]);
+        }
 
 
         $this->response('采集任务添加成功');
         $this->response('采集任务添加成功');
     }
     }

@@ -287,4 +287,25 @@ class BlogController extends BaseController
         $logic->setAllSort();
         $logic->setAllSort();
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :批量设置产品分类及状态
+     * @name   :batchSetCategory
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/15 17:51
+     */
+    public function batchSetCategory(BlogLogic $logic){
+        $this->request->validate([
+            'id'=>'required',
+            'category_id'=>'required',
+            'status'=>'required'
+        ],[
+            'id.required' => '产品ID不能为空',
+            'category_id.required' => '分类ID不能为空',
+            'status.required'=>'状态不能为空'
+        ]);
+        $logic->batchSetCategory();
+        $this->response('success');
+    }
 }
 }

@@ -274,4 +274,26 @@ class NewsController extends BaseController
         $newsLogic->setAllSort();
         $newsLogic->setAllSort();
         $this->response('success');
         $this->response('success');
     }
     }
+
+
+    /**
+     * @remark :批量设置产品分类及状态
+     * @name   :batchSetCategory
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/15 17:51
+     */
+    public function batchSetCategory(NewsLogic $logic){
+        $this->request->validate([
+            'id'=>'required',
+            'category_id'=>'required',
+            'status'=>'required'
+        ],[
+            'id.required' => '产品ID不能为空',
+            'category_id.required' => '分类ID不能为空',
+            'status.required'=>'状态不能为空'
+        ]);
+        $logic->batchSetCategory();
+        $this->response('success');
+    }
 }
 }

@@ -361,7 +361,7 @@ class BTemplateLogic extends BaseLogic
             'template_id' => $template_id,
             'template_id' => $template_id,
             'project_id' => $this->user['project_id'],
             'project_id' => $this->user['project_id'],
             'type'=>$type,
             'type'=>$type,
-            'is_custom'=>$is_custom,
+            'is_custom'=>0,
         ];
         ];
         $commonTemplateModel = new BTemplateCommon();
         $commonTemplateModel = new BTemplateCommon();
         $commonInfo = $commonTemplateModel->read($data);
         $commonInfo = $commonTemplateModel->read($data);

@@ -362,4 +362,32 @@ class BlogLogic extends BaseLogic
 
 
         return false;
         return false;
     }
     }
+
+    /**
+     * @remark :批量设置产品分类及状态
+     * @name   :batchSetCategory
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/15 17:53
+     */
+    public function batchSetCategory(){
+        if(isset($this->param['category_id']) && !empty($this->param['category_id'])) {
+            DB::connection('custom_mysql')->beginTransaction();
+            $this->param['category_id'] = ','.implode(',',$this->param['category_id']).',';
+            try {
+                //批量
+                $param = [
+                    'category_id'=>$this->param['category_id'],
+                    'status'=>$this->param['status']
+                ];
+                $this->model->edit($param,['id'=>['in',$this->param['id']]]);
+                DB::connection('custom_mysql')->commit();
+                //对应添加关联表
+            }catch (\Exception $e){
+                DB::connection('custom_mysql')->rollBack();
+                $this->fail('系统错误，请联系管理员');
+            }
+        }
+        return $this->success();
+    }
 }
 }

@@ -396,4 +396,32 @@ class NewsLogic extends BaseLogic
 
 
         return false;
         return false;
     }
     }
+
+    /**
+     * @remark :批量设置产品分类及状态
+     * @name   :batchSetCategory
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/15 17:53
+     */
+    public function batchSetCategory(){
+        if(isset($this->param['category_id']) && !empty($this->param['category_id'])) {
+            DB::connection('custom_mysql')->beginTransaction();
+            $this->param['category_id'] = ','.implode(',',$this->param['category_id']).',';
+            try {
+                //批量
+                $param = [
+                    'category_id'=>$this->param['category_id'],
+                    'status'=>$this->param['status']
+                ];
+                $this->model->edit($param,['id'=>['in',$this->param['id']]]);
+                DB::connection('custom_mysql')->commit();
+                //对应添加关联表
+            }catch (\Exception $e){
+                DB::connection('custom_mysql')->rollBack();
+                $this->fail('系统错误，请联系管理员');
+            }
+        }
+        return $this->success();
+    }
 }
 }

@@ -75,6 +75,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/status', [\App\Http\Controllers\Bside\News\NewsController::class, 'status'])->name('news_status');
         Route::any('/status', [\App\Http\Controllers\Bside\News\NewsController::class, 'status'])->name('news_status');
         Route::any('/sort', [\App\Http\Controllers\Bside\News\NewsController::class, 'sort'])->name('news_sort');
         Route::any('/sort', [\App\Http\Controllers\Bside\News\NewsController::class, 'sort'])->name('news_sort');
         Route::any('/allSort', [\App\Http\Controllers\Bside\News\NewsController::class, 'allSort'])->name('news_allSort');
         Route::any('/allSort', [\App\Http\Controllers\Bside\News\NewsController::class, 'allSort'])->name('news_allSort');
+        Route::any('/batchSetCategory', [\App\Http\Controllers\Bside\News\NewsController::class, 'batchSetCategory'])->name('news_batchSetCategory');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\News\NewsController::class, 'getStatusNumber'])->name('news_statusNum');
         Route::any('/statusNum', [\App\Http\Controllers\Bside\News\NewsController::class, 'getStatusNumber'])->name('news_statusNum');
     });
     });