Commit 13878207 authored by wangtao's avatar wangtao

管理后台 看板

parent df27f326
...@@ -72,7 +72,7 @@ class Course extends AdminBase ...@@ -72,7 +72,7 @@ class Course extends AdminBase
$post = input(); $post = input();
$result = $this->course->update([$post['af'] => $post['av']], [['id', '=', $post['id']]]); $result = $this->course->update([$post['af'] => $post['av']], [['id', '=', $post['id']]]);
if($post['av'] == 'is_sell'){ if($post['af'] == 'is_sell'){
$course_id = $post['id']; $course_id = $post['id'];
event('Course', ['course_id' => $course_id, 'tasktype' => 'course', 'action' => 'shcourseupdate']); event('Course', ['course_id' => $course_id, 'tasktype' => 'course', 'action' => 'shcourseupdate']);
} }
......
...@@ -81,6 +81,10 @@ class CourseClass extends AdminBase ...@@ -81,6 +81,10 @@ class CourseClass extends AdminBase
$post = input(); $post = input();
$this->courseclass->update([$post['af'] => $post['av']], [['id', '=', $post['id']]]); $this->courseclass->update([$post['af'] => $post['av']], [['id', '=', $post['id']]]);
if($post['af'] == 'sort'){
$course_id = $this->courseclass->where('id', $post['id'])->value('course_id');
event('Course', ['course_id' => $course_id, 'tasktype' => 'course', 'action' => 'shcourseupdate']);
}
return $this->returnMsg('修改成功'); return $this->returnMsg('修改成功');
} }
...@@ -94,6 +98,7 @@ class CourseClass extends AdminBase ...@@ -94,6 +98,7 @@ class CourseClass extends AdminBase
$course_id_arr = $this->courseclass->where("id IN(" . $ids . ")")->column('course_id'); $course_id_arr = $this->courseclass->where("id IN(" . $ids . ")")->column('course_id');
$course_id_arr = array_unique($course_id_arr); $course_id_arr = array_unique($course_id_arr);
foreach ($course_id_arr as $course_id) { foreach ($course_id_arr as $course_id) {
event('Course', ['course_id' => $course_id, 'tasktype' => 'course', 'action' => 'shcourseupdate']); event('Course', ['course_id' => $course_id, 'tasktype' => 'course', 'action' => 'shcourseupdate']);
} }
......
...@@ -72,6 +72,10 @@ class CourseClassCategory extends AdminBase ...@@ -72,6 +72,10 @@ class CourseClassCategory extends AdminBase
$post = input(); $post = input();
$this->courseclasscategory->update([$post['af'] => $post['av']], [['id', '=', $post['id']]]); $this->courseclasscategory->update([$post['af'] => $post['av']], [['id', '=', $post['id']]]);
if($post['af'] == 'sort'){
$course_id = $this->courseclasscategory->where('id', $post['id'])->value('course_id');
event('Course', ['course_id' => $course_id, 'tasktype' => 'course', 'action' => 'shcourseupdate']);
}
return $this->returnMsg('修改成功'); return $this->returnMsg('修改成功');
} }
......
...@@ -161,7 +161,7 @@ class Upload extends BaseController ...@@ -161,7 +161,7 @@ class Upload extends BaseController
$data['username'] = isset($this->manUser['username']) ? $this->manUser['username'] : 'webapi'; $data['username'] = isset($this->manUser['username']) ? $this->manUser['username'] : 'webapi';
$data['fileid'] = UploadFile::insertGetId($data); $data['fileid'] = UploadFile::insertGetId($data);
$data['fileurl'] = $file_http_url . VT_DIR . $domain . '/' . $fileName;
//压缩容量 //压缩容量
if ($data['filesize'] > 300 && $engine == 'local') { if ($data['filesize'] > 300 && $engine == 'local') {
...@@ -176,6 +176,7 @@ class Upload extends BaseController ...@@ -176,6 +176,7 @@ class Upload extends BaseController
imagedestroy($pics); imagedestroy($pics);
} }
} }
$data['fileurl'] = $file_http_url . VT_DIR . $domain . '/' . $fileName;
return $this->returnMsg('上传成功!', 1, $data); return $this->returnMsg('上传成功!', 1, $data);
} }
......
...@@ -77,6 +77,10 @@ class ShCourseClass extends BaseController ...@@ -77,6 +77,10 @@ class ShCourseClass extends BaseController
if(isset($parm['cate_id']) && $parm['cate_id']){ if(isset($parm['cate_id']) && $parm['cate_id']){
$map[] = ['cate_id', '=', $parm['cate_id']]; $map[] = ['cate_id', '=', $parm['cate_id']];
} }
if(isset($parm['course_id']) && $parm['course_id']){
$map[] = ['course_id', '=', $parm['course_id']];
}
$page = $request->param('page', 1); $page = $request->param('page', 1);
$pageSize = $request->param('pageSize', 10); $pageSize = $request->param('pageSize', 10);
$where = ['is_del' => 0, 'user_id' => $request->userId]; $where = ['is_del' => 0, 'user_id' => $request->userId];
...@@ -116,7 +120,7 @@ class ShCourseClass extends BaseController ...@@ -116,7 +120,7 @@ class ShCourseClass extends BaseController
return $vo; return $vo;
} }
$parm = $request->param(); $parm = $request->param();
$info = ShCourseClassModel::find($parm['course_class_id'])->append(['tvfilepath', 'course_class_cate','course_title']); $info = ShCourseClassModel::find($parm['course_class_id'])->append(['tvfile', 'course_class_cate','course_title']);
return $this->returnMsg('操作成功', 1, $info); return $this->returnMsg('操作成功', 1, $info);
} }
......
...@@ -60,6 +60,9 @@ class ShCourseClassCategory extends BaseController ...@@ -60,6 +60,9 @@ class ShCourseClassCategory extends BaseController
$map[] = ['title', 'like', '%' . $parm['searchKeyWords'] . '%']; $map[] = ['title', 'like', '%' . $parm['searchKeyWords'] . '%'];
} }
if(isset($parm['course_id']) && $parm['course_id']){
$map[] = ['course_id', '=', $parm['course_id']];
}
$page = $request->param('page', 1); $page = $request->param('page', 1);
$pageSize = $request->param('pageSize', 10); $pageSize = $request->param('pageSize', 10);
$list = ShCourseCategoryModel::where($where)->where($map) $list = ShCourseCategoryModel::where($where)->where($map)
......
...@@ -43,6 +43,9 @@ class ShCourseWork extends BaseController ...@@ -43,6 +43,9 @@ class ShCourseWork extends BaseController
if (isset($parm['searchKeyWords']) && $parm['searchKeyWords']) { if (isset($parm['searchKeyWords']) && $parm['searchKeyWords']) {
$map[] = ['title', 'like', '%' . $parm['searchKeyWords'] . '%']; $map[] = ['title', 'like', '%' . $parm['searchKeyWords'] . '%'];
} }
if(isset($parm['course_id']) && $parm['course_id']){
$map[] = ['course_id', '=', $parm['course_id']];
}
$page = $request->param('page', 1); $page = $request->param('page', 1);
$pageSize = $request->param('pageSize', 10); $pageSize = $request->param('pageSize', 10);
$list = ShCourseWorkModel::where($where)->where($map) $list = ShCourseWorkModel::where($where)->where($map)
......
...@@ -23,10 +23,10 @@ class Index extends \app\BaseController ...@@ -23,10 +23,10 @@ class Index extends \app\BaseController
*/ */
public function index(){ public function index(){
$this->redirect('admin');
$re = Response::create(app()->getRootPath().'app/v_msg.tpl','view')->assign(['msg'=>'欢迎使用 Veitool11 后台管理开发框架!这是前台首页展示内容。','site'=>vconfig('site_title','VEITOOL快捷开发框架')])->header(); // $re = Response::create(app()->getRootPath().'app/v_msg.tpl','view')->assign(['msg'=>'欢迎使用这是前台首页展示内容。','site'=>vconfig('site_title',开发')])->header();
throw new HttpResponseException($re); // throw new HttpResponseException($re);
} }
} }
\ No newline at end of file
...@@ -34,7 +34,7 @@ class Jobtask ...@@ -34,7 +34,7 @@ class Jobtask
} catch (\Exception $e) { } catch (\Exception $e) {
Db::rollback(); Db::rollback();
Log::write('失败:' . $e->getMessage()); Log::write('失败:' . $e->getMessage());
$job->release(); //$delay为延迟时间 // $job->release(); //$delay为延迟时间
} }
} }
...@@ -99,20 +99,24 @@ class Jobtask ...@@ -99,20 +99,24 @@ class Jobtask
} elseif ($data['action'] == 'shcourseupdate') { } elseif ($data['action'] == 'shcourseupdate') {
//更新状态数据 删除,上下架 //更新状态数据 删除,上下架
$courseinfo = ShCourse::field('id,is_sell,is_del,is_hot,is_tj')->where('id', $data['course_id'])->find(); $courseinfo = Db::name('sh_course')->field('id,is_sell,is_del,is_hot,is_tj')->where('id', $data['course_id'])->find();
CourseModel::update($courseinfo); Db::name('course')->where('id', $data['course_id'])->update($courseinfo);
//处理课时 //处理课时
$course_class_list = ShCourseClass::field('id,is_del,is_sell')->where('course_id', $data['course_id'])->select()->toArray(); $course_class_list = Db::name('sh_course_class')->field('id,is_del,is_sell,sort')->where('course_id', $data['course_id'])->select()->toArray();
CourseClass::saveAll($course_class_list); foreach ($course_class_list as $item) {
Db::name('course_class')->update($item);
}
//处理章节 //处理章节
$course_class_category = ShCourseClassCategory::field('id,is_del')->where('course_id', $data['course_id'])->select()->toArray(); $course_class_category = Db::name('sh_course_class_category')->field('id,is_del,sort')->where('course_id', $data['course_id'])->select()->toArray();
CourseClassCategory::saveAll($course_class_category);
foreach ($course_class_category as $item) {
Db::name('course_class_category')->update($item);
}
//处理作业 //处理作业
$course_work = ShCourseWork::field('id,is_del')->where('course_id', $data['course_id'])->select()->toArray(); $course_work = Db::name('sh_course_work')->field('id,is_del')->where('course_id', $data['course_id'])->select()->toArray();
CourseWork::saveAll($course_work); foreach ($course_work as $item) {
Db::name('course_work')->update($item);
}
} elseif ($data['action'] == 'courseupdateclick') { } elseif ($data['action'] == 'courseupdateclick') {
//更新销量阅读量 //更新销量阅读量
...@@ -160,6 +164,7 @@ class Jobtask ...@@ -160,6 +164,7 @@ class Jobtask
} elseif ($data['action'] == 'shcourseupdate') { } elseif ($data['action'] == 'shcourseupdate') {
//更新状态数据 删除,上下架 //更新状态数据 删除,上下架
$courseinfo = Db::name('sh_course')->field('is_sell,is_del')->where('id', $data['course_id'])->find(); $courseinfo = Db::name('sh_course')->field('is_sell,is_del')->where('id', $data['course_id'])->find();
Db::name('course')->where('id', $data['course_id'])->update($courseinfo); Db::name('course')->where('id', $data['course_id'])->update($courseinfo);
......
...@@ -55,4 +55,10 @@ class ShCourseClass extends Model ...@@ -55,4 +55,10 @@ class ShCourseClass extends Model
{ {
return get_upload_file($data['tv_file']); return get_upload_file($data['tv_file']);
} }
//视频地址
public function getTvfileAttr($value, $data)
{
return get_upload_file($data['tv_file'],'info');
}
} }
\ No newline at end of file
...@@ -25,7 +25,6 @@ class course ...@@ -25,7 +25,6 @@ class course
public function onCourse($event) public function onCourse($event)
{ {
Queue::push(Jobtask::class, $event); // 推送到队列的任务类及其数据参数 Queue::push(Jobtask::class, $event); // 推送到队列的任务类及其数据参数
// $this->synccourse($event);
} }
public function subscribe(Event $event) public function subscribe(Event $event)
...@@ -34,4 +33,5 @@ class course ...@@ -34,4 +33,5 @@ class course
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment