周海龙 / globalso · 提交

转到一个项目

作者 liyuhang
提交 0f35777c49a96cefd74b1b57c2d6dc2ca688141f 1 个父辈 2bcb68f5

gx

内嵌 并排对比
正在显示 3 个修改的文件 包含 111 行增加 和 32 行删除
@@ -30,6 +30,9 @@ class NewsCategoryController extends BaseController @@ -30,6 +30,9 @@ class NewsCategoryController extends BaseController
30 */ 30 */
31 public function add(NewsCategoryRequest $request,NewsCategoryModel $newsCategory){ 31 public function add(NewsCategoryRequest $request,NewsCategoryModel $newsCategory){
32 $request->validated(); 32 $request->validated();
  33 + $this->param['project_id'] = $this->user['project_id'];
  34 + $this->param['Operator_id'] = $this->uid;
  35 + $this->param['create_id'] = $this->uid;
33 $rs = $newsCategory->add($this->param); 36 $rs = $newsCategory->add($this->param);
34 if($rs === false){ 37 if($rs === false){
35 $this->response('error',Code::USER_ERROR); 38 $this->response('error',Code::USER_ERROR);
@@ -49,10 +52,12 @@ class NewsCategoryController extends BaseController @@ -49,10 +52,12 @@ class NewsCategoryController extends BaseController
49 ],[ 52 ],[
50 'id.required' => 'ID不能为空' 53 'id.required' => 'ID不能为空'
51 ]); 54 ]);
  55 + $this->param['Operator_id'] = $this->uid;
52 $rs = $newsCategory->edit($this->param,['id'=>$this->param['id']]); 56 $rs = $newsCategory->edit($this->param,['id'=>$this->param['id']]);
53 if($rs === false){ 57 if($rs === false){
54 $this->response('error',Code::USER_ERROR); 58 $this->response('error',Code::USER_ERROR);
55 } 59 }
  60 + //写入日志
56 $this->response('success',Code::SUCCESS); 61 $this->response('success',Code::SUCCESS);
57 } 62 }
58 63
@@ -70,7 +75,8 @@ class NewsCategoryController extends BaseController @@ -70,7 +75,8 @@ class NewsCategoryController extends BaseController
70 'id.required' => 'ID不能为空', 75 'id.required' => 'ID不能为空',
71 'status.required' => 'status不能为空' 76 'status.required' => 'status不能为空'
72 ]); 77 ]);
73 - $rs = $newsCategory->edit(['status'=>$this->param['status']],['id'=>$this->param['id']]); 78 + $this->param['Operator_id'] = $this->uid;
  79 + $rs = $newsCategory->edit($this->param,['id'=>$this->param['id']]);
74 if($rs === false){ 80 if($rs === false){
75 $this->response('error',Code::USER_ERROR); 81 $this->response('error',Code::USER_ERROR);
76 } 82 }
@@ -90,22 +96,18 @@ class NewsCategoryController extends BaseController @@ -90,22 +96,18 @@ class NewsCategoryController extends BaseController
90 'id.required' => 'ID不能为空', 96 'id.required' => 'ID不能为空',
91 ]); 97 ]);
92 foreach ($this->param['id'] as $v){ 98 foreach ($this->param['id'] as $v){
93 - var_dump($v);  
94 //查询是否有子分类 99 //查询是否有子分类
95 - $id = $newsCategory->read(['pid'=>$v],['id']);  
96 - if($id !== false){ 100 + $rs = $newsCategory->read(['pid'=>$v],['id']);
  101 + if($rs !== false){
97 $this->response('当前分类拥有子分类不允许删除',Code::USER_ERROR); 102 $this->response('当前分类拥有子分类不允许删除',Code::USER_ERROR);
98 } 103 }
99 //查看当前分内下是否有商品 104 //查看当前分内下是否有商品
100 - $id = $news->read(['category_id'=>$v],['id']);  
101 -  
102 - if($id !== false){ 105 + $rs = $news->read(['category_id'=>$v],['id']);
  106 + if($rs !== false){
103 $this->response('当前分类拥有商品',Code::USER_ERROR); 107 $this->response('当前分类拥有商品',Code::USER_ERROR);
104 } 108 }
105 } 109 }
106 - $this->param['id'] = ['in',$id];  
107 - var_dump($this->map);  
108 - die(); 110 + $this->param['id'] = ['in',$this->param['id']];
109 $rs = $newsCategory->del($this->param); 111 $rs = $newsCategory->del($this->param);
110 if($rs === false){ 112 if($rs === false){
111 $this->response('error',Code::USER_ERROR); 113 $this->response('error',Code::USER_ERROR);
@@ -2,17 +2,99 @@ @@ -2,17 +2,99 @@
2 2
3 namespace App\Http\Controllers\Bside\News; 3 namespace App\Http\Controllers\Bside\News;
4 4
  5 +use App\Enums\Common\Code;
5 use App\Http\Controllers\Bside\BaseController; 6 use App\Http\Controllers\Bside\BaseController;
  7 +use App\Http\Requests\Bside\News\NewsRequest;
  8 +use App\Models\News\News as NewsModel;
  9 +use Illuminate\Http\Request;
6 10
7 class NewsController extends BaseController 11 class NewsController extends BaseController
8 { 12 {
9 /** 13 /**
10 * @name :获取新闻列表 14 * @name :获取新闻列表
  15 + * @return json
  16 + * @author :liyuhang
  17 + * @method
  18 + */
  19 + public function lists(NewsModel $news){
  20 + $lists = $news->lists($this->map,$this->page,$this->row,$this->order);
  21 + $this->response('success',Code::SUCCESS,$lists);
  22 + }
  23 +
  24 + /**
  25 + * @name :添加分类
  26 + * @return json
  27 + * @author :liyuhang
  28 + * @method
  29 + */
  30 + public function add(NewsRequest $newsRequest,NewsModel $news){
  31 + $newsRequest->validated();
  32 + $this->param['user_id'] = $this->uid;
  33 + $this->param['Operator_id'] = $this->uid;
  34 + $rs = $news->add($this->param);
  35 + if($rs === false){
  36 + $this->response('error',Code::USER_ERROR);
  37 + }
  38 + $this->response('success');
  39 + }
  40 +
  41 + /**
  42 + * @name :编辑分类
11 * @return void 43 * @return void
12 * @author :liyuhang 44 * @author :liyuhang
13 * @method 45 * @method
14 */ 46 */
15 - public function lists(){ 47 + public function edit(NewsRequest $newsRequest,NewsModel $news){
  48 + $newsRequest->validate([
  49 + 'id'=>['required'],
  50 + ],[
  51 + 'id.required' => 'ID不能为空',
  52 + ]);
  53 + $this->param['Operator_id'] = $this->uid;
  54 + $rs = $news->edit($this->param,['id'=>$this->param['id']]);
  55 + if($rs === false){
  56 + $this->response('error',Code::USER_ERROR);
  57 + }
  58 + //写入日志
  59 + $this->response('success',Code::SUCCESS);
  60 + }
16 61
  62 + /**
  63 + * @name :编辑状态/与排序
  64 + * @return void
  65 + * @author :liyuhang
  66 + * @method
  67 + */
  68 + public function status(Request $request,NewsModel $news){
  69 + $request->validate([
  70 + 'id'=>['required'],
  71 + ],[
  72 + 'id.required' => 'ID不能为空',
  73 + ]);
  74 + $this->param['Operator_id'] = $this->uid;
  75 + $rs = $news->edit($this->param,['id'=>$this->param['id']]);
  76 + if($rs === false){
  77 + $this->response('error',Code::USER_ERROR);
  78 + }
  79 + $this->response('success');
  80 + }
  81 + /**
  82 + * @name :删除分类
  83 + * @return void
  84 + * @author :liyuhang
  85 + * @method
  86 + */
  87 + public function del(Request $request,NewsModel $news){
  88 + $request->validate([
  89 + 'id'=>['required'],
  90 + ],[
  91 + 'id.required' => 'ID不能为空',
  92 + ]);
  93 + $this->param['id'] = ['in',$this->param['id']];
  94 + $rs = $news->del($this->param);
  95 + if($rs === false){
  96 + $this->response('error',Code::USER_ERROR);
  97 + }
  98 + $this->response('success');
17 } 99 }
18 } 100 }
@@ -125,46 +125,41 @@ class Base extends Model @@ -125,46 +125,41 @@ class Base extends Model
125 $query->where($k,$v); 125 $query->where($k,$v);
126 continue; 126 continue;
127 } 127 }
128 - foreach ($v as $k1 => $v1){  
129 - if(!is_array($v1)){  
130 - $query->where($k1,$v1);  
131 - continue;  
132 - }  
133 - switch ($v1[0]){ 128 + switch ($v[0]){
134 case 'like': 129 case 'like':
135 // like查询 ['name|title'=> ['like','%a%']] 130 // like查询 ['name|title'=> ['like','%a%']]
136 - if (strpos($k1, '|') !== false) {  
137 - $query->where(function ($query) use ($k1,$v1) {  
138 - $item = explode('|', $k1); 131 + if (strpos($k, '|') !== false) {
  132 + $query->where(function ($query) use ($k,$v) {
  133 + $item = explode('|', $k);
139 foreach ($item as $vo) { 134 foreach ($item as $vo) {
140 - $query->orWhere($vo, $v1[0], $v1[1]); 135 + $query->orWhere($vo, $v[0], $v[1]);
141 } 136 }
142 }); 137 });
143 } else { 138 } else {
144 - $query->where($k1,$v1[0], $v1[1]); 139 + $query->where($k, $v[0], $v[1]);
145 } 140 }
146 break; 141 break;
147 case 'in': 142 case 'in':
148 - // in查询 ['id'=>['in'=>[1,2,3]]]  
149 - $query->whereIn($k1, $v1[1]); 143 + // in查询 ['id'=>['in',[1,2,3]]]
  144 + $query->whereIn($k, $v[1]);
150 break; 145 break;
151 case 'no in': 146 case 'no in':
152 - // in查询 ['id'=>['not in'=>[1,2,3]]]  
153 - $query->whereNotIn($k1, $v1[1]); 147 + // in查询 ['id'=>['not in',[1,2,3]]]
  148 + $query->whereNotIn($k, $v[1]);
154 break; 149 break;
155 case 'between': 150 case 'between':
156 - // in查询 ['id'=>['between'=>[create1,create2]]]  
157 - $query->whereBetween($k1, $v1[1]); 151 + // in查询 ['id'=>['between',[create1,create2]]]
  152 + $query->whereBetween($k, $v[1]);
158 case 'not between': 153 case 'not between':
159 - // not between查询 ['created_at'=>['not between'=>['xxx', 'xxx]]]  
160 - $query->whereNotBetween($k1, $v1[1]); 154 + // not between查询 ['created_at'=>['not between',['xxx', 'xxx]]]
  155 + $query->whereNotBetween($k, $v[1]);
161 break; 156 break;
162 default: 157 default:
163 - $query->where($k1,$v1[0],$v1[1]); 158 + $query->where($k,$v[0],$v[1]);
164 break; 159 break;
165 } 160 }
166 } 161 }
167 - } 162 +
168 }); 163 });
169 return $query; 164 return $query;
170 } 165 }