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

Lyh server 查看合并请求 !1932

合并分支 'lyh-server' 到 'master'
Lyh server 查看合并请求 !1932
李宇航
app/Console/Commands/Ai/AiVideoTask.php
app/Http/Controllers/Bside/Ai/AiVideoController.php
app/Http/Controllers/Bside/BCom/ComController.php
app/Http/Logic/Aside/Project/ProjectLogic.php
app/Http/Logic/Bside/User/UserLoginLogic.php
--- a/app/Console/Commands/Ai/AiVideoTask.php
查看文件 @c92c05e
+++ b/app/Console/Commands/Ai/AiVideoTask.php
查看文件 @c92c05e
@@ -259,6 +259,7 @@ class AiVideoTask extends Command
         $aiVideoListModel = new AiVideoList();
         if(!empty($saveData)){
             //写一条路由信息
+            RouteMap::setRoute('top-video',RouteMap::SOURCE_AI_VIDEO_LIST,0,$project_id);//写一条列表页路由
             $aiVideoListModel->truncate();
             $aiVideoListModel->insertAll($saveData);
         }
--- a/app/Http/Controllers/Bside/Ai/AiVideoController.php
查看文件 @c92c05e
+++ b/app/Http/Controllers/Bside/Ai/AiVideoController.php
查看文件 @c92c05e
@@ -13,6 +13,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Ai\AiVideoLogic;
 use App\Models\Ai\AiVideo;
+use App\Models\Ai\AiVideoList;
 class AiVideoController extends BaseController
 {
@@ -109,4 +110,23 @@ class AiVideoController extends BaseController
         $result = $aiVideoLogic->videoDelete();
         $this->response('success',Code::SUCCESS,$result);
     }
+
+
+    /**
+     * @remark :获取列表页数据
+     * @name   :getAiBlogList
+     * @author :lyh
+     * @method :post
+     * @time   :2025/2/21 16:22
+     */
+    public function getAiBlogList(AiVideoList $aiVideoList){
+        $lists = $aiVideoList->lists($this->map,$this->page,$this->row,'id',['id','route','created_at','updated_at']);
+        if(!empty($lists) && !empty($lists['list'])){
+            foreach ($lists['list'] as $k => $v){
+                $v['route'] = $this->user['domain'] . 'top-video/' . (($v['route'] > 1) ? $v['route'] : '');
+                $lists['list'][$k] = $v;
+            }
+        }
+        $this->response('success',Code::SUCCESS,$lists);
+    }
 }
--- a/app/Http/Controllers/Bside/BCom/ComController.php
查看文件 @c92c05e
+++ b/app/Http/Controllers/Bside/BCom/ComController.php
查看文件 @c92c05e
@@ -147,6 +147,10 @@ class ComController extends BaseController
             if($is_blogs != 1){
                 $info['role_menu'] = trim(str_replace(',57,',',',','.$info['role_menu'].','),',');
             }
+            $is_video = $this->getIsAiVideo();
+            if($is_video != 1){
+                $info['role_menu'] = trim(str_replace(',74,',',',','.$info['role_menu'].','),',');
+            }
             $this->map = [
                 'status'=>0,
                 'is_role'=>0,
@@ -195,6 +199,10 @@ class ComController extends BaseController
         if($is_ai_blog != 1){
             $data[] = 57;
         }
+        $is_ai_video = $this->getIsAiVideo();
+        if($is_ai_video != 1){
+            $data[] = 74;
+        }
         if(!empty($data)){
             $this->map['id'] = ['not in',$data];
         }
@@ -291,6 +299,16 @@ class ComController extends BaseController
         return $this->user['is_ai_blog'] ?? 0;
     }
+    /**
+     * @remark :ai视频
+     * @name   :getIsAiVideo
+     * @author :lyh
+     * @method :post
+     * @time   :2025/5/6 14:33
+     */
+    public function getIsAiVideo(){
+        return $this->user['is_ai_video'] ?? 0;
+    }
     /**
      * @name :登录用户编辑资料/修改密码
--- a/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @c92c05e
+++ b/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @c92c05e
@@ -166,7 +166,7 @@ class ProjectLogic extends BaseLogic
         }else{
             $this->param = $this->handleLevelStr($this->param);//处理星级客户暂停优化默认参数
             $this->saveSeoPlan($this->param);//保存seo白帽类型,上线保存一条审核记录
-            $this->checkAiBlog($this->param);//开启白帽验证参数
+            $this->checkAiBlog($this->param);//开启ai相关功能验证参数
             DB::beginTransaction();
             try {
                 //初始化项目
@@ -174,8 +174,9 @@ class ProjectLogic extends BaseLogic
                 //双向绑定服务器,需放到保存项目的上方
                 $this->setServers($this->param['serve_id'],$this->param['id']);
                 //ai_blog
-                $this->setAiBlog($this->param['id'],$this->param['main_lang_id'],$this->param['is_ai_blog'],
-                    $this->param['company']??"", $this->param['deploy_optimize']['company_en_name'] ?? '',$this->param['deploy_optimize']['company_en_description'] ?? '');
+                $this->setAiBlog($this->param['id'],$this->param['main_lang_id'],$this->param['is_ai_blog'] ?? 0,
+                    $this->param['company']??"", $this->param['deploy_optimize']['company_en_name'] ?? '',
+                    $this->param['deploy_optimize']['company_en_description'] ?? '',$this->param['is_ai_video'] ?? 0);
                 //保存项目信息
                 $this->saveProject($this->param);
                 //保存建站部署信息
@@ -217,6 +218,7 @@ class ProjectLogic extends BaseLogic
             if (in_array('2', $param['level']) || in_array('3', $param['level'])) {
                 //优化设置默认关闭
                 $param['is_ai_blog'] = 0;
+                $param['is_ai_video'] = 0;
                 $param['deploy_optimize']['is_ai_blog_send'] = 0;
                 $param['deploy_optimize']['is_auto_keywords'] = 0;
             }
@@ -259,7 +261,7 @@ class ProjectLogic extends BaseLogic
     }
     /**
-     * @remark :开启白帽验证参数
+     * @remark :开启ai博客及视频
      * @name   :checkAiBlog
      * @author :lyh
      * @method :post
@@ -287,11 +289,11 @@ class ProjectLogic extends BaseLogic
      * @method :post
      * @time   :2025/2/13 16:02
      */
-    public function setAiBlog($project_id,$main_lang_id,$is_ai_blog,$company,$company_en_name,$company_en_description){
-        if(empty($main_lang_id) || empty($is_ai_blog)){
+    public function setAiBlog($project_id,$main_lang_id,$is_ai_blog,$company,$company_en_name,$company_en_description,$is_ai_video = 0){
+        if(empty($main_lang_id) || (empty($is_ai_blog) && empty($is_ai_video))){
             return true;
         }
-        $projectInfo = $this->model->read(['id'=>$project_id],['title','is_ai_blog','main_lang_id','company']);
+        $projectInfo = $this->model->read(['id'=>$project_id],['title','main_lang_id','company']);
         $projectOptimize = DeployOptimize::where('project_id', $project_id)->first();
         //获取项目主语种
         $languageModel = new WebLanguage();
--- a/app/Http/Logic/Bside/User/UserLoginLogic.php
查看文件 @c92c05e
+++ b/app/Http/Logic/Bside/User/UserLoginLogic.php
查看文件 @c92c05e
@@ -274,7 +274,8 @@ class UserLoginLogic
         $info['is_show_blog'] = $project['is_show_blog'];
         $info['upload_config'] = $project['upload_config'];
         $info['main_lang_id'] = $project['main_lang_id'];
-        $info['is_ai_blog'] = $project['is_ai_blog'];
+        $info['is_ai_blog'] = $project['is_ai_blog'] ?? 0;
+        $info['is_ai_video'] = $project['is_ai_video'] ?? 0;
         $info['image_max'] = $project['image_max'];
         $info['is_del_inquiry'] = $project['is_del_inquiry'] ?? 0;
         $info['uptime_type'] = $this->getHistory($project);