周海龙 / globalso · 提交

转到一个项目

作者 liyuhang
提交 72594647ed06e35896c5034d025b9f4ac99daa6b 1 个父辈 b92964e6

gx

内嵌 并排对比
正在显示 14 个修改的文件 包含 99 行增加 和 124 行删除
... ... @@ -6,9 +6,7 @@ use App\Enums\Common\Code;
use App\Http\Controllers\Bside\BaseController;
use App\Http\Logic\Bside\Blog\BlogCategoryLogic;
use App\Http\Requests\Bside\Blog\BlogCategoryRequest;
use App\Models\Blog\Blog as BlogModel;
use App\Models\Blog\BlogCategory as BlogCategoryModel;
use Illuminate\Http\Request;
class BlogCategoryController extends BaseController
{
... ...
... ... @@ -3,14 +3,12 @@
namespace App\Http\Controllers\Bside\Blog;
use App\Enums\Common\Code;
use App\Helper\Common;
use App\Http\Controllers\Bside\BaseController;
use App\Http\Logic\Bside\Blog\BlogCategoryLogic;
use App\Http\Logic\Bside\Blog\BlogLabelLogic;
use App\Http\Logic\Bside\Blog\BlogLogic;
use App\Http\Requests\Bside\Blog\BlogRequest;
use App\Models\Blog\Blog as BlogModel;
use Illuminate\Http\Request;
class BlogController extends BaseController
{
... ...
... ... @@ -65,7 +65,7 @@ class BlogLabelController extends BaseController
],[
'id.required' => 'ID不能为空',
]);
$blogLabelLogic->edit_blog_label();
$blogLabelLogic->status_blog_label();
//TODO::写入日志
$this->response('success');
}
... ...
... ... @@ -7,6 +7,7 @@ use App\Http\Controllers\Bside\BaseController;
use App\Http\Controllers\Bside\Ids;
use App\Http\Controllers\Bside\json;
use App\Http\Logic\Bside\ProjectGroupLogic;
use App\Http\Logic\Bside\User\GroupLogic;
use App\Http\Requests\Bside\User\ProjectGroupRequest;
use App\Models\ProjectGroup as ProjectGroupModel;
use App\Models\User\User as UserModel;
... ... @@ -36,16 +37,13 @@ class ProjectGroupController extends BaseController
* @author :liyuhang
* @method
*/
public function info(ProjectGroupModel $projectGroupModel){
public function info(GroupLogic $groupLogic){
$this->request->validate([
'id'=>['required', new Ids()],
],[
'id.required' => 'ID不能为空',
]);
$rs = $projectGroupModel->read($this->param);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$groupLogic->group_info();
$this->response('success');
}
/**
... ... @@ -54,10 +52,8 @@ class ProjectGroupController extends BaseController
* @author :liyuhang
* @method
*/
public function get_user_lists(UserModel $userModel){
$this->map['project_id'] = $this->user['project_id'];
//获取当前项目下的所有用户
$lists = $userModel->list($this->map);
public function get_user_lists(GroupLogic $groupLogic){
$lists = $groupLogic->user_list();
$this->response('success',Code::SUCCESS,$lists);
}
/**
... ... @@ -68,18 +64,9 @@ class ProjectGroupController extends BaseController
* @author :liyuhang
* @method
*/
public function add(ProjectGroupRequest $request,ProjectGroupModel $projectGroupModel){
public function add(ProjectGroupRequest $request,GroupLogic $groupLogic){
$request->validated();
$this->param['project_id'] = $this->user['project_id'];
//TODO::成员列表：user_list
if(!isset($this->param['user_list']) || empty($this->param['user_list'])){
$this->param['user_list'] = $this->uid;
}
$this->param['admin_id'] = $this->uid;
$rs = $projectGroupModel->add($this->param);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$groupLogic->group_add($this->param);
$this->response('success');
}
... ... @@ -91,16 +78,13 @@ class ProjectGroupController extends BaseController
* @author :liyuhang
* @method
*/
public function edit(ProjectGroupRequest $request,ProjectGroupModel $projectGroupModel){
public function edit(ProjectGroupRequest $request,GroupLogic $groupLogic){
$request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
]);
$rs = $projectGroupModel->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$groupLogic->group_edit();
$this->response('success');
}
... ... @@ -110,16 +94,13 @@ class ProjectGroupController extends BaseController
* @author :liyuhang
* @method
*/
public function del(ProjectGroupModel $projectGroupModel){
public function del(GroupLogic $groupLogic){
$this->request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
]);
$rs = $projectGroupModel->del($this->param);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$groupLogic->group_del($this->param);
$this->response('success');
}
}
... ...
... ... @@ -113,16 +113,7 @@ class BlogCategoryLogic extends BaseLogic
* @method
*/
public function info_blog_category(){
//读取缓存
$info = Common::get_user_cache($this->model->getTable(),$this->param['id']);
if(empty($info)){
$info = $this->model->read($this->param);
if($info === false){
$this->fail('error');
}
//写入缓存
Common::set_user_cache($info,$this->model->getTable(),$this->param['id']);
}
$info = $this->info($this->param);
return $this->success($info);
}
... ...
... ... @@ -76,15 +76,22 @@ class BlogLabelLogic extends BaseLogic
$this->fail('当前标签名称已存在');
}
$this->param['operator_id'] = $this->user['id'];
$rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
//TODO::路由映射
if($rs === false){
$this->fail('error');
}
$this->edit($this->param,['id'=>$this->param['id']]);
return $this->success();
}
/**
* @name :编辑状态
* @return array
* @author :liyuhang
* @method
*/
public function status_blog_label(){
$this->param['operator_id'] = $this->user['id'];
$this->edit($this->param,['id'=>$this->param['id']]);
return $this->success();
}
/**
* @name :删除标签
* @return array
* @author :liyuhang
... ... @@ -101,12 +108,7 @@ class BlogLabelLogic extends BaseLogic
}
}
$this->param['id'] = ['in',$this->param['id']];
$rs = $this->model->del($this->param);
if($rs === false){
$this->fail('error');
}
//清除缓存
Common::del_user_cache($this->model->getTable(),$ids);
$this->del($this->param,$ids);
return $this->success();
}
}
... ...
... ... @@ -116,9 +116,7 @@ class BlogLogic extends BaseLogic
$this->param['image'] = $this->upload();
}
RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $this->param['id'], $this->user['project_id']);
$this->model->edit($this->param,['id'=>$this->param['id']]);
//清除缓存
Common::del_user_cache($this->model->getTable(),$this->param['id']);
$this->edit($this->param,['id'=>$this->param['id']]);
DB::commit();
}catch (\Exception $e){
DB::rollBack();
... ...
... ... @@ -22,10 +22,7 @@ class MailLogic extends BaseLogic
* @author :liyuhang
*/
public function mail_info(){
$info = $this->model->read($this->param);
if($info === false){
$this->fail('当前数据不存在',Code::USER_ERROR);
}
$info = $this->info($this->param);
//生成一条阅读记录
$mailUserModel = new MailUserModel();
$data = [
... ...
... ... @@ -44,10 +44,7 @@ class NewsCategoryLogic extends BaseLogic
* @method
*/
public function info_news_category(){
$info = $this->model->read($this->param);
if($info === false){
$this->fail('error',Code::USER_ERROR);
}
$info = $this->info($this->param);
return $this->success($info);
}
/**
... ... @@ -114,10 +111,7 @@ class NewsCategoryLogic extends BaseLogic
$this->fail('当前分类名称已存在');
}
$this->param['operator_id'] = $this->user['id'];
$rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->fail('error');
}
$this->edit($this->param,['id'=>$this->param['id']]);
return $this->success();
}
... ... @@ -130,10 +124,7 @@ class NewsCategoryLogic extends BaseLogic
*/
public function status_news_category(){
$this->param['operator_id'] = $this->user['id'];
$rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->fail('error');
}
$this->edit($this->param,['id'=>$this->param['id']]);
return $this->success();
}
/**
... ... @@ -144,6 +135,7 @@ class NewsCategoryLogic extends BaseLogic
* @method
*/
public function del_news_category(){
$ids = $this->param['id'];
foreach ($this->param['id'] as $v){
//查询是否有子分类
$rs = $this->model->read(['pid'=>$v],['id']);
... ... @@ -158,10 +150,7 @@ class NewsCategoryLogic extends BaseLogic
}
}
$this->param['id'] = ['in',$this->param['id']];
$rs = $this->model->del($this->param);
if($rs === false){
$this->fail('error');
}
$this->del($this->param,$ids);
return $this->success();
}
}
... ...
... ... @@ -158,18 +158,14 @@ class NewsLogic extends BaseLogic
* @method
*/
public function news_info(){
$info = $this->model->read($this->param);
//获取分类名称
$cate = explode(',',trim($info['category_id'],','));
$newsCategoryModel = new NewsCategoryModel();
$category_list = $newsCategoryModel->list(['id'=>['in',$cate]],'id',['name']);
$str = '';
foreach ($category_list as $v){
$str .= $v['name'].',';
}
$info['category_id'] = trim($str,',');
if($info === false){
$this->fail('error');
//读取缓存
$info = Common::get_user_cache($this->model->getTable(),$this->param['id']);
if(empty($info)){
$info = $this->model->read($this->param);
$newsCategoryLogic = new NewsCategoryLogic();
$info = $newsCategoryLogic->get_category_name($info);
//写入缓存
Common::set_user_cache($info,$this->model->getTable(),$this->param['id']);
}
return $this->success($info);
}
... ... @@ -181,11 +177,9 @@ class NewsLogic extends BaseLogic
* @method
*/
public function news_del(){
$ids = $this->param['id'];
$this->param['id'] = ['in',$this->param['id']];
$rs = $this->model->del($this->param);
if($rs === false){
$this->fail('error');
}
$this->del($this->param,$ids);
return $this->success();
}
}
... ...
... ... @@ -14,4 +14,47 @@ class GroupLogic extends BaseLogic
$this->model = new ProjectGroup();
$this->param = $this->requestAll;
}
public function user_list(){
return $this->success();
}
/**
* @name :添加
* @return void
* @author :liyuhang
* @method
*/
public function group_add(){
return $this->success();
}
/**
* @name :编辑
* @return void
* @author :liyuhang
* @method
*/
public function group_edit(){
return $this->success();
}
/**
* @name :详情
* @return void
* @author :liyuhang
* @method
*/
public function group_info(){
return $this->success();
}
/**
* @name :删除
* @return void
* @author :liyuhang
* @method
*/
public function group_del(){
return $this->success();
}
}
... ...
... ... @@ -64,10 +64,7 @@ class RoleLogic extends BaseLogic
if($info !== false){
$this->fail('当前添加的角色已存在');
}
$rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->fail('error');
}
$this->edit($this->param,['id'=>$this->param['id']]);
return $this->success();
}
... ... @@ -78,10 +75,7 @@ class RoleLogic extends BaseLogic
* @method
*/
public function role_status(){
$rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->fail('error',Code::USER_PARAMS_ERROE);
}
$this->edit($this->param,['id'=>$this->param['id']]);
return $this->success();
}
... ... @@ -100,11 +94,9 @@ class RoleLogic extends BaseLogic
$this->fail('当前角色下有用户存在，不允许删除',Code::USER_ERROR);
}
}
$ids = $this->param['id'];
$this->param['id'] = ['in',$this->param['id']];
$rs = $this->model->del($this->param);
if($rs === false){
$this->fail('error',Code::USER_ERROR);
}
$this->del($this->param,$ids);
return $this->success();
}
... ... @@ -115,10 +107,7 @@ class RoleLogic extends BaseLogic
* @method
*/
public function role_info(){
$info = $this->model->read($this->param);
if($info === false){
$this->fail('error',Code::USER_ERROR);
}
$info = $this->info($this->param);
return $this->success($info);
}
... ...
... ... @@ -24,10 +24,7 @@ class UserLogic extends BaseLogic
* @method
*/
public function user_info(){
$info = $this->model->read($this->param);
if($info === false){
$this->fail('error',Code::USER_ERROR);
}
$info = $this->info($this->param);
return $this->success($info);
}
/**
... ... @@ -111,11 +108,9 @@ class UserLogic extends BaseLogic
* @method
*/
public function user_del(){
$this->param['operator_id'] = $this->user['id'];
$rs = $this->model->edit(['status'=>2],['id'=>['in',$this->param['id']]]);
if($rs === false){
$this->fail('error',Code::USER_ERROR);
}
$ids = $this->param['id'];
$this->param['id'] = ['in',$this->param['id']];
$this->del($this->param,$ids);
return $this->success();
}
... ...
... ... @@ -324,12 +324,12 @@ class Logic
* @author :liyuhang
* @method
*/
public function edit($map,$id){
$rs = $this->model->edit($map,['id'=>$id]);
public function edit($map,$condition){
$rs = $this->model->edit($map,$condition);
if($rs === false){
$this->fail('error');
}
CommonHelper::del_user_cache($this->model->getTable(),$id);
CommonHelper::del_user_cache($this->model->getTable(),$condition['id']);
$this->success();
}
... ... @@ -344,7 +344,7 @@ class Logic
if(empty($info)){
$info = $this->model->read($map);
if($info === false){
$this->fail('error');
$this->fail('当前数据不存在');
}
CommonHelper::set_user_cache($info,$this->model->getTable(),$map['id']);
}
... ...