wupengfei 2 年之前
父節點
當前提交
bd58d79b52
共有 2 個文件被更改,包括 48 次插入5 次删除
  1. 2 2
      .idea/workspace.xml
  2. 46 3
      application/api/controller/Video.php

+ 2 - 2
.idea/workspace.xml

@@ -3,7 +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/Expedite.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Expedite.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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -201,7 +201,7 @@
       <workItem from="1670461023846" duration="27678000" />
       <workItem from="1670547445908" duration="12147000" />
       <workItem from="1670633686675" duration="15717000" />
-      <workItem from="1670719843429" duration="1358000" />
+      <workItem from="1670719843429" duration="3135000" />
     </task>
     <servers />
   </component>

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

@@ -912,6 +912,46 @@ class Video extends Base
         $this->success('ok',['list'=>$list]);
     }
 
+
+
+    /**
+     * @title 获取角标数量
+     * @desc 获取角标数量
+     * @author qc
+     * @method GET
+     * @url /api/Video/getMarkNum
+     * @header name:Authorization require:1 desc:Token
+     * @return name:reply_num type:int default:-- desc:未读量--回复我的
+     * @return name:comment_num type:int default:-- desc:未读量--评论我的
+     */
+    public function getMarkNum()
+    {
+        // 回复我的
+        $all_comment = VideoComment::where(['user_id'=>$this->user_id,'is_deleted'=>0])->column('id');
+        $reply_num =  VideoComment::where([['t.is_deleted','=',0],['t.lev','>=',2],['is_read'=>0],['t.pid','in',implode(',',$all_comment)]])->alias('t')->count();
+        // 评论我的
+        $comment_num = VideoComment::where([['t.is_deleted','=',0],['i.user_id','=',$this->user_id],['is_read'=>0]])
+            ->leftJoin('VideoUrl i','t.url_id = i.id')
+            ->alias('t')->count();
+        $this->success('ok',compact(['reply_num','comment_num']));
+    }
+
+    /**
+     * @title 消息已读
+     * @desc 消息已读
+     * @author qc
+     * @method POST
+     * @url /api/Video/unreadChange
+     * @header name:Authorization require:1 desc:Token
+     * @param name:id type:string default:-- desc:记录id
+     */
+    public function unreadChange()
+    {
+        VideoComment::where('id',input('post.id'))->update(['is_read'=>1]);
+        $this->success('ok');
+    }
+
+
     /**
      * @title 回复我的【回复我的--回复过我的评论】
      * @desc 回复我的
@@ -927,6 +967,7 @@ class Video extends Base
      * @return name:duration type:int default:-- desc:时长(单位:秒)
      * @return name:url_id type:string default:-- desc:url_id
      * @return name:cover type:string default:-- desc:封面
+     * @return name:is_read type:int default:-- desc:是否已读(0未读1已读)
      * @return name:create_at type:string default:-- desc:时间
      * @return name:user_name type:string default:-- desc:用户名【其他会员】
      * @return name:headimg type:string default:-- desc:用户头【其他会员】
@@ -952,7 +993,7 @@ class Video extends Base
         $sel_where[]  = ['t.pid','in',implode(',',$all_comment)];
         $list = VideoComment::where($sel_where)
             ->alias('t')
-            ->field('t.id,t.create_at,t.lev,t.content,t.pid,u.name user_name,u.headimg,i.id url_id,i.video_id,i.ali_vid,i.cover,i.duration')
+            ->field('t.id,t.create_at,t.is_read,t.lev,t.content,t.pid,u.name user_name,u.headimg,i.id url_id,i.video_id,i.ali_vid,i.cover,i.duration')
             ->leftJoin('store_member u','t.user_id = u.id')
             ->leftJoin('VideoUrl i','t.url_id = i.id')
             ->order('t.id desc')
@@ -984,6 +1025,7 @@ class Video extends Base
      * @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:is_read type:int default:-- desc:是否已读(0未读1已读)
      * @return name:duration type:int default:-- desc:时长(单位:秒)
      * @return name:cover type:string default:-- desc:封面
      * @return name:create_at type:string default:-- desc:时间
@@ -1009,7 +1051,7 @@ class Video extends Base
         $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,i.id url_id,i.video_id,i.ali_vid,i.cover,i.duration')
+            ->field('t.id,t.is_read,t.create_at,t.lev,t.content,i.title,t.pid,i.id url_id,i.video_id,i.ali_vid,i.cover,i.duration')
             ->leftJoin('VideoUrl i','t.url_id = i.id')
             ->order('t.id desc')
             ->limit($this->off_set,$this->page_num)
@@ -1086,6 +1128,7 @@ class Video extends Base
      * @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:is_read type:int default:-- desc:是否已读(0未读1已读)
      * @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:封面
@@ -1105,7 +1148,7 @@ class Video extends Base
         $sel_where[]  = ['i.user_id','=',$this->user_id];
         $list = VideoComment::where($sel_where)
             ->alias('t')
-            ->field('t.id,t.create_at,t.video_id,t.url_id,t.lev,t.content,i.title,i.cover,i.ali_vid,u.name user_name,u.headimg,i.duration')
+            ->field('t.id,t.is_read,t.create_at,t.video_id,t.url_id,t.lev,t.content,i.title,i.cover,i.ali_vid,u.name user_name,u.headimg,i.duration')
             ->leftJoin('VideoUrl i','t.url_id = i.id')
             ->leftJoin('store_member u','t.user_id = u.id')
             ->order('t.id desc')