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

Lyh server



查看合并请求 !2123

@@ -15,6 +15,7 @@ use App\Models\Channel\Channel;
 use App\Models\Channel\User;
 use App\Models\Channel\Zone;
 use App\Models\Com\City;
+use App\Models\Com\NoticeLog;
 use App\Models\Com\UpdateLog;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServersIp;
@@ -1229,4 +1230,20 @@ class ProjectController extends BaseController
         $this->response('success', Code::SUCCESS, $lists);
     }
 
+    /**
+     * @remark :生成关键词图表数据
+     * @name   :generateCountCharts
+     * @author :lyh
+     * @method :post
+     * @time   :2025/6/10 10:51
+     */
+    public function generateCountCharts(){
+        $noticeModel = new NoticeLog();
+        $info = $noticeModel->read(['type'=>NoticeLog::TYPE_GENERATE_COUNT_CHARTS,'status'=>0,'data'=>['like','%"'.$this->param['project_id'].'"%']]);
+        if($info !== false){
+            $this->fail('当前数据在生成中');
+        }
+        NoticeLog::createLog(NoticeLog::TYPE_GENERATE_COUNT_CHARTS, ['project_id' => $this->user['project_id']]);
+        $this->response('success');
+    }
 }

@@ -81,7 +81,7 @@ class NewsLogic extends BaseLogic
             $this->edit(['url' => $route], ['id' => $id]);
             $this->curlDelRoute(['new_route'=>$route]);
         }
-        $this->model->saveExtendInfo($id,$this->param['extend'] ?? []);
+        $this->model->saveExtendInfo($id,$this->param['extend'] ?? [],$this->user['project_id']);
         $this->addUpdateNotify(RouteMap::SOURCE_NEWS,$route);
         return $this->success(['id'=>$id]);
     }

@@ -14,6 +14,7 @@ class NoticeLog extends Base
     const TYPE_RANK_DATA = 'rank_data';
     const TYPE_INIT_PROJECT = 'init_project';
     const TYPE_INIT_KEYWORD_COMMON = 'init_keyword_common';//聚合页关键词评论
+    const TYPE_GENERATE_COUNT_CHARTS = 'generate_count_charts';//聚合页关键字图片生成
     const TYPE_COPY_PROJECT = 'copy_project';
     const TYPE_INIT_KEYWORD = 'init_keyword';
     const DELETE_PRODUCT_CATEGORY = 'delete_product_category';

@@ -109,7 +109,7 @@ class News extends Base
      * @method :post
      * @time   :2023/11/9 15:02
      */
-    public function saveExtendInfo($news_id,$extend){
+    public function saveExtendInfo($news_id,$extend,$project_id){
         //先删除以前的数据
         $extendInfoModel = new NewsExtendInfo();
         $extendInfoModel->del(['news_id'=>$news_id]);
@@ -120,7 +120,7 @@ class News extends Base
             if(empty($v['values'])){
                 continue;
             }
-            $v = $this->saveHandleExtend($v,$news_id);
+            $v = $this->saveHandleExtend($v,$news_id,$project_id);
             $extendInfoModel->add($v);
         }
         return true;
@@ -133,7 +133,7 @@ class News extends Base
      * @method :post
      * @time   :2023/12/6 15:11
      */
-    public function saveHandleExtend(&$v,$news_id){
+    public function saveHandleExtend(&$v,$news_id,$project_id){
         unset($v['title']);
         if($v['type'] == 3){
             foreach ($v['values'] as $k1=>$v1){
@@ -148,7 +148,7 @@ class News extends Base
             }
             $v['values'] = json_encode($v['values']);
         }
-        $v['project_id'] = $this->user['project_id'];
+        $v['project_id'] = $project_id;
         $v['news_id'] = $news_id;
         return $v;
     }

@@ -209,6 +209,7 @@ Route::middleware(['aloginauth'])->group(function () {
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');
             Route::any('/save', [Aside\Project\KeywordPrefixController::class, 'save'])->name('admin.keyword_save');
             Route::any('/del', [Aside\Project\KeywordPrefixController::class, 'del'])->name('admin.keyword_del');
+            Route::any('/generateCountCharts', [Aside\Project\ProjectController::class, 'generateCountCharts'])->name('admin.keyword_generateCountCharts');
         });
         //企业资料库
         Route::prefix('enterprise_product')->group(function () {