wupengfei 2 years ago
parent
commit
38bc08d764
2 changed files with 83 additions and 7 deletions
  1. 4 4
      .idea/workspace.xml
  2. 79 3
      application/api/controller/Video.php

+ 4 - 4
.idea/workspace.xml

@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/api/controller/Article.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Article.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -221,7 +220,8 @@
       <workItem from="1664498426748" duration="13957000" />
       <workItem from="1665189429149" duration="5358000" />
       <workItem from="1665206979508" duration="7749000" />
-      <workItem from="1665276346161" duration="17063000" />
+      <workItem from="1665276346161" duration="19728000" />
+      <workItem from="1665362529961" duration="1550000" />
     </task>
     <servers />
   </component>
@@ -247,10 +247,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1175" y="519" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1659079177590" />
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1665305211083">
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1665305500186">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1665305211083" />
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1665305500186" />
     <state x="283" y="145" width="1942" height="1088" key="DiffContextDialog" timestamp="1665216465958">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

+ 79 - 3
application/api/controller/Video.php

@@ -2,6 +2,7 @@
 namespace app\api\controller;
 use app\common\model\SeriesVideoCate;
 use app\common\model\UserCollect;
+use app\common\model\UserLearn;
 use app\common\model\UserLevelRank;
 use app\common\model\UserMessage;
 use app\common\model\UserSearch;
@@ -851,6 +852,7 @@ class Video extends Base
      * @return name:parent_comment.title type:string default:-- desc:视频标题
      * @return name:parent_comment.video_id type:string default:-- desc:视频id
      * @return name:parent_comment.url_id type:string default:-- desc:url_id
+     * @return name:parent_comment.ali_vid:string default:-- desc:云点播id
      */
     public function getReplayComment()
     {
@@ -873,7 +875,7 @@ class Video extends Base
             ->select()->toArray();
         foreach ($list as &$v) {
             $parent_comment = VideoComment::where([['t.id','=',$v['pid']]])
-                ->field('t.id,t.video_id,t.url_id,t.content,i.title,i.cover,t.pid,u.name')
+                ->field('t.id,t.video_id,t.url_id,t.content,i.title,i.cover,t.pid,u.name,i.ali_vid')
                 ->alias('t')
                 ->leftJoin('store_member i','t.url_id = i.id')
                 ->leftJoin('store_member u','t.user_id = u.id')
@@ -906,8 +908,9 @@ class Video extends Base
      * @return name:parent_comment.content type:string default:-- desc:内容
      * @return name:parent_comment.name type:string default:-- desc:会员名称
      * @return name:parent_comment.title type:string default:-- desc:视频标题
-     * @return name:parent_comment.article_id type:string default:-- desc:视频id
+     * @return name:parent_comment.video_id type:string default:-- desc:视频id
      * @return name:parent_comment.url_id type:string default:-- desc:url_id
+     * @return name:parent_comment.ali_vid:string default:-- desc:云点播id
      */
     public function getReplyVideo()
     {
@@ -929,7 +932,7 @@ class Video extends Base
             $v['user_name'] = $user_info['name'];
             $v['headimg'] = $user_info['headimg'];
             $parent_comment = VideoComment::where([['t.id','=',$v['pid']]])
-                ->field('t.id,t.video_id,t.url_id,t.content,i.title,i.cover,t.pid,u.name')
+                ->field('t.id,t.video_id,t.url_id,t.content,i.title,i.cover,t.pid,u.name,i.ali_vid')
                 ->alias('t')
                 ->leftJoin('VideoUrl i','t.url_id = i.id')
                 ->leftJoin('store_member u','t.user_id = u.id')
@@ -940,6 +943,79 @@ class Video extends Base
     }
 
 
+    /**
+     * @title 已购视频列表
+     * @desc 已购视频列表
+     * @author qc
+     * @method GET
+     * @url /api/Video/getPurchaseVideo
+     * @header name:Authorization require:1 desc:Token
+     * @param  name:title type:string default:-- desc:标题
+     * @param  name:page type:int default:0 desc:页数
+     * @param  name:page_num type:int default:20 desc:每页数
+     * @return name:title type:string default:-- desc:标题
+     * @return name:video_id type:string default:-- desc:视频id
+     * @return name:url_id type:string default:-- desc:url_id
+     * @return name:cover type:string default:-- desc:封面
+     * @return name:create_at type:string default:-- desc:时间
+     * @return name:ali_vid type:string default:-- desc:云点播id
+     */
+    public function getPurchaseVideo()
+    {
+        $sel_where  = [];
+        $title = input('get.title');
+        if($title)  $sel_where[]  = ['i.title','like','%'.$title.'%'];
+        $sel_where[]  = ['t.user_id','=',$this->user_id];
+        $sel_where[]  = ['t.type','=',1];
+        $list = UserLearn::where($sel_where)
+            ->alias('t')
+            ->field('t.id,t.create_at,t.first_id video_id,t.second_id url_id,i.title,i.cover,i.ali_vid')
+            ->leftJoin('VideoUrl i','t.second_id = i.id')
+            ->order('id desc')
+            ->limit($this->off_set,$this->page_num)
+            ->select()->toArray();
+        $this->success('ok',['list'=>$list]);
+    }
+
+
+
+    /**
+     * @title 视频收藏记录【我的收藏】
+     * @desc 视频收藏记录
+     * @author qc
+     * @method GET
+     * @url /api/Video/getVideoCollect
+     * @header name:Authorization require:1 desc:Token
+     * @param  name:title type:string default:-- desc:标题
+     * @param  name:page type:int default:0 desc:页数
+     * @param  name:page_num type:int default:20 desc:每页数
+     * @return name:title type:string default:-- desc:标题
+     * @return name:video_id type:string default:-- desc:视频id
+     * @return name:url_id type:string default:-- desc:url_id
+     * @return name:cover type:string default:-- desc:封面
+     * @return name:create_at type:string default:-- desc:时间
+     * @return name:ali_vid type:string default:-- desc:云点播id
+     */
+    public function getVideoCollect()
+    {
+        $sel_where  = [];
+        $title = input('get.title');
+        if($title)  $sel_where[]  = ['i.title','like','%'.$title.'%'];
+        $sel_where[]  = ['t.user_id','=',$this->user_id];
+        $sel_where[]  = ['t.coll_type','=',1];
+        $list = UserCollect::where($sel_where)
+            ->alias('t')
+            ->field('t.id,t.create_at,t.coll_id video_id,t.children_id url_id,i.title,i.cover,i.ali_vid')
+            ->leftJoin('VideoUrl i','t.children_id = i.id')
+            ->order('id desc')
+            ->limit($this->off_set,$this->page_num)
+            ->select()->toArray();
+        $this->success('ok',['list'=>$list]);
+    }
+
+
+
+
 
 
 }