wupengfei пре 2 година
родитељ
комит
b7524bb592
3 измењених фајлова са 73 додато и 14 уклоњено
  1. 4 3
      .idea/workspace.xml
  2. 4 4
      application/api/controller/Article.php
  3. 65 7
      application/api/controller/Video.php

+ 4 - 3
.idea/workspace.xml

@@ -3,6 +3,7 @@
   <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" />
@@ -220,7 +221,7 @@
       <workItem from="1664498426748" duration="13957000" />
       <workItem from="1665189429149" duration="5358000" />
       <workItem from="1665206979508" duration="7749000" />
-      <workItem from="1665276346161" duration="16775000" />
+      <workItem from="1665276346161" duration="17063000" />
     </task>
     <servers />
   </component>
@@ -246,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="1665304441627">
+    <state x="1106" y="469" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog" timestamp="1665305211083">
       <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="1665304441627" />
+    <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="283" y="145" width="1942" height="1088" key="DiffContextDialog" timestamp="1665216465958">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

+ 4 - 4
application/api/controller/Article.php

@@ -805,7 +805,7 @@ class Article extends Base
      * @desc 我的评论
      * @author qc
      * @method GET
-     * @url /api/Article/getReplayArticle
+     * @url /api/Article/getReplyArticle
      * @header name:Authorization require:1 desc:Token
      * @param  name:title type:string default:-- desc:标题
      * @param  name:page type:int default:0 desc:页数
@@ -824,7 +824,7 @@ class Article extends Base
      * @return name:parent_comment.article_id type:string default:-- desc:文章id
      * @return name:parent_comment.item_id type:string default:-- desc:item_id
      */
-    public function getReplayArticle()
+    public function getReplyArticle()
     {
         $user_info = $this->userInfo();
         $sel_where  = [];
@@ -859,7 +859,7 @@ class Article extends Base
      * @desc 回复我的
      * @author qc
      * @method GET
-     * @url /api/Article/getReplayComment
+     * @url /api/Article/getReplyComment
      * @header name:Authorization require:1 desc:Token
      * @param  name:title type:string default:-- desc:标题
      * @param  name:page type:int default:0 desc:页数
@@ -878,7 +878,7 @@ class Article extends Base
      * @return name:parent_comment.article_id type:string default:-- desc:文章id
      * @return name:parent_comment.item_id type:string default:-- desc:item_id
      */
-    public function getReplayComment()
+    public function getReplyComment()
     {
         $all_comment = ArticleComment::where(['user_id'=>$this->user_id,'is_deleted'=>0])->column('id');
         if(empty($all_comment)) $this->success('ok',['list'=>null]);

+ 65 - 7
application/api/controller/Video.php

@@ -31,8 +31,8 @@ class Video extends Base
     }
 
     /**
-     * @title 图文接口说明
-     * @desc  图文接口说明
+     * @title 视频接口说明
+     * @desc  视频接口说明
      * @author  qc
      * @url /api/Video/classIntro
      * @method GET
@@ -327,8 +327,8 @@ class Video extends Base
      * @return name:video_arr.collect_num type:int default:-- desc:收藏量
      * @return name:video_arr.praise_num type:int default:-- desc:点赞量
      * @return name:video_arr.is_praise type:int default:-- desc:是否点赞
-     * @return name:video_arr.article_id type:int default:-- desc:关联图文id【单个id||系列id】
-     * @return name:video_arr.article_item type:int default:-- desc:关联图文详情id【item_list.id】
+     * @return name:video_arr.article_id type:int default:-- desc:关联视频id【单个id||系列id】
+     * @return name:video_arr.article_item type:int default:-- desc:关联视频详情id【item_list.id】
      * @return name:video_arr.datum_id type:int default:-- desc:资料id【单个id||系列id】
      * @return name:video_arr.datum_item type:int default:-- desc:资料详情id【url_arr.id】
      * @return name:video_arr.ppt type:string default:-- desc:关联ppt链接
@@ -791,8 +791,8 @@ class Video extends Base
     public function learn(){}
 
     /**
-     * @title 图文学习历史
-     * @desc 图文学习历史
+     * @title 视频学习历史
+     * @desc 视频学习历史
      * @author qc
      * @method GET
      * @url /api/Video/getLearnHistory
@@ -848,7 +848,7 @@ class Video extends Base
      * @return name:parent_comment type:array default:-- desc:你的评论内容【别人回复的那个评论】
      * @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.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
      */
@@ -884,4 +884,62 @@ class Video extends Base
     }
 
 
+
+    /**
+     * @title 我的回复【我的回复--我回复过的评论】
+     * @desc 我的评论
+     * @author qc
+     * @method GET
+     * @url /api/Video/getReplyVideo
+     * @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:user_name type:string default:-- desc:用户名【用户自己的】
+     * @return name:headimg type:string default:-- desc:用户头像【用户自己的】
+     * @return name:parent_comment type:array default:-- desc:上级评论内容【你评论的那个评论】
+     * @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.url_id type:string default:-- desc:url_id
+     */
+    public function getReplyVideo()
+    {
+        $user_info = $this->userInfo();
+        $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.is_deleted','=',0];
+        $sel_where[]  = ['t.lev','=',2];
+        $list = VideoComment::where($sel_where)
+            ->alias('t')
+            ->field('t.id,t.create_at,t.lev,t.content,i.title,t.pid')
+            ->leftJoin('VideoUrl i','t.url_id = i.id')
+            ->order('t.id desc')
+            ->limit($this->off_set,$this->page_num)
+            ->select()->toArray();
+        foreach ($list as &$v) {
+            $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')
+                ->alias('t')
+                ->leftJoin('VideoUrl i','t.url_id = i.id')
+                ->leftJoin('store_member u','t.user_id = u.id')
+                ->find()->toArray();
+            $v['parent_comment'] = $parent_comment;
+        }
+        $this->success('ok',['list'=>$list]);
+    }
+
+
+
+
 }