web / yoho-live · Commits

Go to a project

Authored by xiaofeng.yao@yoho.cn
Commit 0b312b8984d775e696678e8b51d9728b1d425171 1 parent bae7c0d6

房间列表增加在线人数一列

Inline Side-by-side
Showing 3 changed files with 51 additions and 37 deletions
... ... @@ -22,7 +22,7 @@ class LiveController extends BaseController
*/
public function actionRoom()
{
$filter = Filter::self()->livingStatus()->keyword()->submit()->reset();
if ($condition = $filter->get_where(true)){
$model = \app\models\Room::condition($condition);
... ... @@ -30,30 +30,30 @@ class LiveController extends BaseController
$model = \app\models\Room::find();
}
//var_dump($condition);
$count = clone $model;
$pagination = new Pagination(['totalCount' =>$count->count()]);
$list = $model
->with('master')
->with(['master','roomNums'])
->offset($pagination->offset)->limit($pagination->limit)
->orderBy(['create_time'=>SORT_DESC,'update_time'=>SORT_DESC])
->all();
//var_dump($list);
foreach ($list as $model){
$app = array_map(function($val){
return ArrayHelper::getValue(Yii::$app->params['config']['app'], $val);
},explode(',',$model->app));
$model->app = implode('<br />', array_filter($app));
}
return $this->render('room',[
'filter'=>$filter,
'pagination'=>$pagination,
'list'=>$list,
]);
}
/**
* 主播
* @return type
... ... @@ -81,7 +81,7 @@ class LiveController extends BaseController
'list'=>$masters,
]);
}
/**
* 视频
* @return type
... ... @@ -99,7 +99,7 @@ class LiveController extends BaseController
if(!empty($video->master_id)) {
$liveMasterIds[] = $video->master_id;
}
$app = array_map(function($val){
return ArrayHelper::getValue(Yii::$app->params['config']['app'], $val);
},explode(',',$video->app));
... ... @@ -113,7 +113,7 @@ class LiveController extends BaseController
/**
* 视频编辑
*
*
* @return
*/
public function actionVideoedit()
... ... @@ -131,13 +131,13 @@ class LiveController extends BaseController
Yii::$app->session->setFlash('success', '编辑成功。');
}
}
else
else
{
Yii::$app->session->setFlash('error', '保存失败。');
}
return $this->refresh();
}
else
else
{
$id = Yii::$app->request->get('id', 0);
$video = Video::findOne(['id'=> $id]);
... ... @@ -151,10 +151,10 @@ class LiveController extends BaseController
return $this->render('videoedit', ['video' => $video, 'uploader' => $uploader]);
}
}
/**
* 视频状态设置
* @return
* @return
*/
public function actionVideosetstate()
{
... ... @@ -174,7 +174,7 @@ class LiveController extends BaseController
$this->renderJson(403,'post方式');
}
}
/**
* 添加主播
* @return type
... ... @@ -204,10 +204,10 @@ class LiveController extends BaseController
}
return $this->redirect('/live/master');
}
//图片上传组件
$uploader = \backend\widgets\UploadImage::self()->logo('pic');
return $this->render('add_master',[
'row'=> $model,
'uploader'=>$uploader,
... ... @@ -259,32 +259,32 @@ class LiveController extends BaseController
* @return type
*/
public function actionDelmaster(){
if (!$id = Yii::$app->getRequest()->getQueryParam('id')){
return $this->redirect($this->_refer);
}
$model = new Master;
if (!$model = $model->findOne($id)){
Yii::$app->session->setFlash('error', '找不到该主播');
return $this->redirect($this->_refer);
}
if($model->delete()){
Yii::$app->session->setFlash('success', '删除成功');
}else{
Yii::$app->session->setFlash('error', '删除失败。');
}
return $this->redirect($this->_refer);
}
/**
* 创建直播间
* @return type
*/
public function actionRoomcreate()
{
{
$model = new \app\models\Room;
if (Yii::$app->getRequest()->isPost){
$post = Yii::$app->getRequest()->post();
... ... @@ -296,15 +296,15 @@ class LiveController extends BaseController
$model->setAttributes($post);
}
}
//所有主播
$masters = \app\models\Master::getId2name();
$masters = [''=>'0 无主播']+$masters;
//图片上传组件
$picUploader = \backend\widgets\UploadImage::self()->single('pic');
$backgroundUploader = \backend\widgets\UploadImage::self()->single('background_pic');
return $this->render('roomedit',[
'model'=> $model,
'picUploader'=>$picUploader,
... ... @@ -312,7 +312,7 @@ class LiveController extends BaseController
'masters'=>$masters,
]);
}
/**
* 编辑直播间
* @return type
... ... @@ -322,13 +322,13 @@ class LiveController extends BaseController
if (!$id = Yii::$app->getRequest()->getQueryParam('id')){
return $this->redirect($this->_refer);
}
$model = new \app\models\Room;
if (!$model = $model->findOne($id)){
Yii::$app->session->setFlash('error', '找不到该直播间');
return $this->redirect($this->_refer);
}
if (Yii::$app->getRequest()->isPost){
$post = Yii::$app->getRequest()->post();
if ($model->edit($post)){
... ... @@ -338,17 +338,17 @@ class LiveController extends BaseController
Yii::$app->session->setFlash('error', '编辑失败。');
}
}
$model->app = explode(',',$model->app);
//所有主播
$masters = \app\models\Master::getId2name();
$masters = [''=>'0 无主播']+$masters;
//图片上传组件
$picUploader = \backend\widgets\UploadImage::self()->single('pic',$model->pic);
$backgroundUploader = \backend\widgets\UploadImage::self()->single('background_pic',$model->background_pic);
return $this->render('roomedit',[
'model'=> $model,
'picUploader'=>$picUploader,
... ... @@ -356,7 +356,7 @@ class LiveController extends BaseController
'masters'=>$masters,
]);
}
/**
* 直播间操作
* @return type
... ... @@ -369,12 +369,12 @@ class LiveController extends BaseController
if (!$type = Yii::$app->getRequest()->getQueryParam('type')){
return $this->redirect($this->_refer);
}
if (!$model = Room::findOne($id)){
Yii::$app->session->setFlash('error', '找不到该直播间');
return $this->redirect($this->_refer);
}
switch ($type){
case 'del'://删除直播间
$r = $model->del();
... ... @@ -393,7 +393,7 @@ class LiveController extends BaseController
}else{
Yii::$app->session->setFlash('error', '操作失败');
}
return $this->redirect($this->_refer);
}
}
... ...
... ... @@ -4,6 +4,7 @@ namespace app\models;
use Yii;
use common\lib\QcloudApi\Client as QcloudApiClient;
use common\models\RoomNums;
/**
* This is the model class for table "{{%room}}".
... ... @@ -109,7 +110,15 @@ class Room extends \yii\db\ActiveRecord
{
return $this->hasOne(Video::className(), ['room_id'=>'room_id'])->where(['and',['>','live_start_time',0],['live_end_time'=>0]])->orderBy(['create_time'=>SORT_DESC]);
}
/**
* 关联表-计数
* @return type
*/
public function getRoomNums()
{
return $this->hasOne(RoomNums::className(), ['room_id'=>'room_id']);
}
/**
* 生成房间ID
*/
... ...
... ... @@ -39,6 +39,7 @@ $this->title = $this->params['main_title'].'-'.$this->params['sub_title'];
<th>是否精选</th>
<th>马甲状态</th>
<th>直播状态</th>
<th>在线人数</th>
<th>操作</th>
</tr>
</thead>
... ... @@ -57,6 +58,10 @@ $this->title = $this->params['main_title'].'-'.$this->params['sub_title'];
<td><?=Yii::$app->params['config']['vest'][$model->vest]?></td>
<td><?=Yii::$app->params['config']['room_living'][$model->living]?></td>
<td>
真实:<?=$model->roomNums->online_num ? :0?>,
马甲:<?=$model->roomNums->vest_online_num ? :0?>
</td>
<td>
<a href="/live/roomedit/<?=$model->id?>" class="btn btn-default btn-white">编辑</a>
... ...