1

.idea/workspace.xml

@@ -3,8 +3,8 @@
   <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/Collect.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Collect.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/api/controller/Video.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Video.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/common/model/VideoUrl.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/VideoUrl.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -232,7 +232,7 @@
       <workItem from="1675990026788" duration="13260000" />
       <workItem from="1676077132290" duration="20234000" />
       <workItem from="1676250114476" duration="22971000" />
-      <workItem from="1676336530749" duration="3582000" />
+      <workItem from="1676336530749" duration="5511000" />
     </task>
     <servers />
   </component>

application/api/controller/Collect.php

@@ -18,10 +18,26 @@ class Collect extends Base
         parent::checkLogin();
     }
 
+    /**
+     * @title 收藏列表批量操作或是单个取消【所有收藏模块】
+     * @desc 收藏列表批量操作或是单个取消
+     * @author qc
+     * @method POST
+     * @url /api/Collect/cancelCollect
+     * @header name:Authorization require:1 desc:Token
+     * @param name:ids type:string  : default:'' desc:需要删除的id记录（多个用逗号隔开）
+     */
+    public function cancelCollect()
+    {
+        $ids = input('post.ids','');
+        if(!$ids) $this->error('请选择要取消收藏的记录');
+        UserCollect::where('id','in',$ids)->where('user_id','=',$this->user_id)->delete();
+        $this->success('取消成功');
+    }
 
     /**
-     * @title 用户视频收藏（单个收藏）
-     * @desc 用户视频收藏（单个收藏）
+     * @title 用户视频收藏【弃用！！！视频收藏放到视频模块/api/Video/videoCollect】
+     * @desc 用户视频收藏
      * @author qc
      * @method POST
      * @url /api/Collect/userCollect
@@ -52,7 +68,7 @@ class Collect extends Base
 
 
     /**
-     * @title 获取用户收藏列表
+     * @title 获取用户收藏列表【弃用！！！都放到对应模块】
      * @desc 获取用户收藏列表
      * @author qc
      * @method GET
@@ -99,40 +115,7 @@ class Collect extends Base
 
     }
 
-    /**
-     * @title 取消收藏
-     * @desc 取消收藏
-     * @author qc
-     * @method POST
-     * @url /api/Collect/cancelCollect
-     * @header name:Authorization require:1 desc:Token
-     * @param name:ids type:string  : default:'' desc:需要删除的id记录（用逗号隔开）
-     */
-    public function cancelCollect()
-    {
-        $ids = input('post.ids','');
-        if(!$ids) $this->error('请选择要取消收藏的记录');
-        UserCollect::where('id','in',$ids)->where('user_id','=',$this->user_id)->delete();
-        $this->success('取消成功');
-    }
 
-    /**
-     * @title 取消收藏
-     * @desc 根据类型(平台视频id||用户视频id)取消
-     * @author qc
-     * @method POST
-     * @url /api/Collect/cancelCollectByType
-     * @header name:Authorization require:1 desc:Token
-     * @param name:coll_type type:int require:1 default:1s desc:类型（1平台视频id,2用户视频id）
-     * @param name:coll_id type:int default:1 desc:取消收藏的id(平台视频id||用户视频id)
-     */
-    public function cancelCollectByType()
-    {
-        $coll_type = input('post.coll_type',1);
-        $coll_id = input('get.coll_id',0);
-        UserCollect::where(['user_id'=>$this->user_id,'coll_type'=>$coll_type,'coll_id'=>$coll_id])->delete();
-        $this->success('取消成功');
-    }
 
 
 

application/api/controller/Video.php

@@ -986,20 +986,14 @@ class Video extends Base
      * @url /api/Video/delComment
      * @header name:Authorization require:1 desc:Token
      * @param name:id type:int default:1 desc:评论记录id【多个用逗号隔开=>'1,2'】
-     * @param name:type type:string default:1 desc:消息类型【1我的评论,2评论我的】
+     * @param name:type type:string default:1 desc:消息类型【1我的评论,2评论我的,3我的回复】
      */
     public function delComment(){
         $type = input('post.type',1);
-        switch ($type)
-        {
-            case 1:
-                VideoComment::where(['user_id'=>$this->user_id])->where('id','in',input('post.id'))->update(['is_deleted'=>1]);
-                break;
-            default :
-                VideoComment::where('id','in',input('post.id'))->update(['is_read'=>input('post.is_read')]);
-                break;
-        }
-
+        $del_where = [];
+        $del_where[] = ['id','in',input('post.id')];
+        if(in_array($type,[1,3]))   $del_where[] = ['user_id','=',$this->user_id];
+        VideoComment::where($del_where)->update(['is_deleted'=>1]);
         $this->success('删除成功');
     }
 
@@ -1044,8 +1038,7 @@ class Video extends Base
         $title = input('get.title');
         if($title)  $sel_where[]  = ['i.title|i.label','like','%'.$title.'%'];
         $sel_where[]  = ['t.is_deleted','=',0];
-        $sel_where[]  = ['t.lev','>=',2];
-        //$sel_where[]  = ['t.user_id','<>',$this->user_id];
+        $sel_where[]  = ['t.user_id','<>',$this->user_id];
         $sel_where[]  = ['t.pid','in',implode(',',$all_comment)];
         $list = VideoComment::where($sel_where)
             ->alias('t')
@@ -1156,6 +1149,9 @@ class Video extends Base
      * @return name:headimg type:string default:-- desc:用户头像【用户自己的】
      * @return name:is_normal type:int default:-- desc:是否是正常记录（0已删除或是已禁用1可以正常跳转详情）
      * @return name:ali_vid:string default:-- desc:云点播id
+     * @return name:app_name type:string default:-- desc:发布者
+     * @return name:app_logo type:string default:-- desc:发布者头像
+     * @return name:read_num type:string default:-- desc:播放量
      */
     public function getCommentVideo()
     {
@@ -1167,16 +1163,19 @@ class Video extends Base
         $sel_where[]  = ['t.is_deleted','=',0];
         $list = VideoComment::where($sel_where)
             ->alias('t')
-            ->field('t.id,t.create_at,t.is_top,t.video_id,t.url_id,t.lev,t.content,i.title,i.cover,i.ali_vid,i.cover,i.duration')
+            ->field('t.id,t.create_at,t.is_top,t.video_id,t.url_id,t.lev,t.content,i.title,i.user_id buid, i.cover,i.ali_vid,i.cover,i.duration,iread_num')
             ->leftJoin('VideoUrl i','t.url_id = i.id')
             ->order('t.is_top desc, id desc')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
-        foreach ($list as &$v)
-        {
+        foreach ($list as &$v) {
             $v['user_name'] = $user_info['name'];
             $v['headimg'] = $user_info['headimg'];
             $v['is_normal'] = CheckPower::checkModulesPower($v['video_id'],$v['url_id'],$this->request->controller());
+            $video_auth = VideoUrl::getVideoAuth($v['buid'],APPNAME,APPLOGO);
+            $v['app_name'] = $video_auth['app_name'];
+            $v['app_logo'] = $video_auth['app_logo'];
+            $v['read_num']  = numTransform($v['read_num']);
         }
         $this->success('ok',['list'=>$list]);
 
@@ -1294,6 +1293,13 @@ class Video extends Base
      * @return name:duration type:int default:-- desc:时长（单位：秒）
      * @return name:is_vip type:int default:-- desc:是否是vip[0否1是]
      * @return name:is_normal type:int default:-- desc:是否是正常记录（0已删除或是已禁用1可以正常跳转详情）
+     * @return name:transmit_num type:int default:-- desc:转发量
+     * @return name:comment_num type:int default:-- desc:评论量
+     * @return name:is_praise type:int default:-- desc:是否点赞
+     * @return name:praise_num type:int default:-- desc:点赞量
+     * @return name:praise_num type:int default:-- desc:点赞量
+     * @return name:is_collect type:int default:-- desc:是否收藏
+     * @return name:collect_num type:int default:-- desc:收藏量
      */
     public function getVideoCollect()
     {
@@ -1304,18 +1310,60 @@ class Video extends Base
         $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.is_vip,i.ali_vid,i.duration')
+            ->field('t.id,t.create_at,t.coll_id video_id,t.children_id url_id,i.title,i.cover,i.comment_num,i.is_vip,i.ali_vid,i.duration,i.user_id buid')
             ->leftJoin('VideoUrl i','t.children_id = i.id')
             ->order('id desc')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         array_walk($list,function (&$v){
             $v['is_normal'] = CheckPower::checkModulesPower($v['video_id'],$v['url_id'],$this->request->controller());
+            $v['transmit_num'] = numTransform($v['transmit_num']);
+            $v['comment_num'] = VideoComment::getVideoCommentNum($v['url_id']);
+            $v['is_praise']  = VideoCommentLike::where(['user_id'=>$this->user_id,'type'=>2,'like_id'=>$v['url_id']])->count();
+            $v['praise_num'] = VideoCommentLike::where(['type'=>2,'like_id'=>$v['url_id']])->count();
+            $v['is_collect'] =  UserCollect::checkCollectByType($this->user_id,1,$v['video_id'],$v['url_id']);
+            $v['collect_num'] =  UserCollect::getCollectNum(1,$v['video_id'],$v['url_id']);
+            $video_auth = VideoUrl::getVideoAuth($v['buid'],APPNAME,APPLOGO);
+            $v['app_name'] = $video_auth['app_name'];
+            $v['app_logo'] = $video_auth['app_logo'];
+
         });
         $this->success('ok',['list'=>$list]);
     }
 
     /**
+     * @title 用户视频收藏||取消收藏
+     * @desc 用户视频收藏
+     * @author qc
+     * @method POST
+     * @url /api/Video/videoCollect
+     * @header name:Authorization require:1 desc:Token
+     * @param name:coll_id type:int require:1 default:-- desc:收藏id（平台视频点赞用video_arr的iD）
+     * @param name:status type:int default:0 desc:收藏状态（0取消收藏【未收藏】，1收藏）
+     */
+    public function videoCollect()
+    {
+        $coll_type  = input('post.coll_type',1);
+        $url_id    = input('post.coll_id',0);
+        $video_id = VideoUrl::where('id',$url_id)->value('video_id');
+        $collect_check = UserCollect::where(['user_id'=>$this->user_id,'coll_type'=>$coll_type,'coll_id'=>$video_id,'children_id'=>$url_id])->find();
+        if($collect_check) {
+            UserCollect::where(['user_id'=>$this->user_id,'coll_type'=>$coll_type,'coll_id'=>$video_id,'children_id'=>$url_id])->delete();
+            $this->success('取消收藏成功',['status'=>0]);
+        }else{
+            Data::save('UserCollect', [
+                'user_id'=>$this->user_id,
+                'coll_type'=>$coll_type,
+                'coll_id'=>$video_id,
+                'children_id'=>$url_id,
+                'create_int'=>time()],'user_id',['user_id'=>$this->user_id,'coll_type'=>$coll_type, 'coll_id'=>$video_id,'children_id'=>$url_id]);
+            $this->success('收藏成功',['status'=>1]);
+        }
+    }
+
+
+
+    /**
      * @title 视频点赞列表【我的点赞】
      * @desc 视频点赞列表
      * @author qc