Browse Source

重命名数据表`slides` TO `advertisings`和重命名模型

dev
李可松 4 years ago
parent
commit
7c1f42d0cc
  1. 8
      MySQL_change.sql
  2. 8
      app/Admin/Extensions/Grid/AuditAgent.php
  3. 10
      app/AdminAgent/Controllers/AdvertisingController.php
  4. 4
      app/AdminAgent/Repositories/Advertising.php
  5. 2
      app/AdminAgent/routes.php
  6. 4
      app/Http/Controllers/Api/IndexController.php
  7. 4
      app/Models/Advertising.php

8
MySQL_change.sql

@ -129,3 +129,11 @@ ALTER TABLE `users`
ALTER TABLE `articles` ALTER TABLE `articles`
ADD COLUMN `type` TINYINT NOT NULL DEFAULT 0 COMMENT '0:普通列表显示;1:大图显示;' AFTER `content`, ADD COLUMN `type` TINYINT NOT NULL DEFAULT 0 COMMENT '0:普通列表显示;1:大图显示;' AFTER `content`,
ADD COLUMN `sort` SMALLINT NOT NULL DEFAULT 255 COMMENT '排序,越小越靠前' AFTER `type`; ADD COLUMN `sort` SMALLINT NOT NULL DEFAULT 255 COMMENT '排序,越小越靠前' AFTER `type`;
# 18:16 2021/8/24
ALTER TABLE `slides`
COMMENT='广告图、轮播图等';
RENAME TABLE `slides` TO `advertisings`;

8
app/Admin/Extensions/Grid/AuditAgent.php

@ -5,7 +5,7 @@ use App\Common\UserStatus;
use App\Models\Agent; use App\Models\Agent;
use App\Models\Category; use App\Models\Category;
use App\Models\Channel; use App\Models\Channel;
use App\Models\Slide;
use App\Models\Advertising;
use Dcat\Admin\Grid\RowAction; use Dcat\Admin\Grid\RowAction;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
@ -94,8 +94,8 @@ class AuditAgent extends RowAction
} }
//首页轮播图 //首页轮播图
if (!Slide::where('agent_id', $id)->first()) {
$default_slide = Slide::where('agent_id', 0)->orderBy('id')->get()->toArray();
if (!Advertising::where('agent_id', $id)->first()) {
$default_slide = Advertising::where('agent_id', 0)->orderBy('id')->get()->toArray();
$default_slide = array_map(function ($v) use ($id, $host) { $default_slide = array_map(function ($v) use ($id, $host) {
unset($v['id']); unset($v['id']);
@ -104,7 +104,7 @@ class AuditAgent extends RowAction
$v['url'] = str_replace($host, '', $v['url']); $v['url'] = str_replace($host, '', $v['url']);
return $v; return $v;
}, $default_slide); }, $default_slide);
Slide::insert($default_slide);
Advertising::insert($default_slide);
} }
//TODO 还需要插入 演示产品、公告、专题等 //TODO 还需要插入 演示产品、公告、专题等

10
app/AdminAgent/Controllers/SlideController.php → app/AdminAgent/Controllers/AdvertisingController.php

@ -2,14 +2,14 @@
namespace App\AdminAgent\Controllers; namespace App\AdminAgent\Controllers;
use App\AdminAgent\Repositories\Slide;
use App\AdminAgent\Repositories\Advertising;
use Dcat\Admin\Admin; use Dcat\Admin\Admin;
use Dcat\Admin\Form; use Dcat\Admin\Form;
use Dcat\Admin\Grid; use Dcat\Admin\Grid;
use Dcat\Admin\Show; use Dcat\Admin\Show;
use Dcat\Admin\Http\Controllers\AdminController; use Dcat\Admin\Http\Controllers\AdminController;
class SlideController extends AdminController
class AdvertisingController extends AdminController
{ {
/** /**
* Make a grid builder. * Make a grid builder.
@ -18,7 +18,7 @@ class SlideController extends AdminController
*/ */
protected function grid() protected function grid()
{ {
return Grid::make(new Slide(), function (Grid $grid) {
return Grid::make(new Advertising(), function (Grid $grid) {
$grid->model()->where('agent_id', Admin::user()->id)->orderBy('sort')->orderBy('id', 'DESC'); $grid->model()->where('agent_id', Admin::user()->id)->orderBy('sort')->orderBy('id', 'DESC');
$grid->column('id')->sortable(); $grid->column('id')->sortable();
@ -47,7 +47,7 @@ class SlideController extends AdminController
*/ */
protected function detail($id) protected function detail($id)
{ {
return Show::make($id, new Slide(), function (Show $show) {
return Show::make($id, new Advertising(), function (Show $show) {
//不允许查看非自己的数据 //不允许查看非自己的数据
if ($show->model()->agent_id != Admin::user()->id) { if ($show->model()->agent_id != Admin::user()->id) {
Admin::exit('数据不存在'); Admin::exit('数据不存在');
@ -72,7 +72,7 @@ class SlideController extends AdminController
*/ */
protected function form() protected function form()
{ {
return Form::make(new Slide(), function (Form $form) {
return Form::make(new Advertising(), function (Form $form) {
//不允许查看非自己的数据 //不允许查看非自己的数据
if ($form->isEditing() && $form->model()->agent_id != Admin::user()->id) { if ($form->isEditing() && $form->model()->agent_id != Admin::user()->id) {
return $form->response()->error('数据不存在'); return $form->response()->error('数据不存在');

4
app/AdminAgent/Repositories/Slide.php → app/AdminAgent/Repositories/Advertising.php

@ -2,10 +2,10 @@
namespace App\AdminAgent\Repositories; namespace App\AdminAgent\Repositories;
use App\Models\Slide as Model;
use App\Models\Advertising as Model;
use Dcat\Admin\Repositories\EloquentRepository; use Dcat\Admin\Repositories\EloquentRepository;
class Slide extends EloquentRepository
class Advertising extends EloquentRepository
{ {
/** /**
* Model. * Model.

2
app/AdminAgent/routes.php

@ -20,7 +20,7 @@ Route::group([
$router->resource('user/list', 'UserController'); $router->resource('user/list', 'UserController');
$router->resource('user/verifier', 'UserController'); $router->resource('user/verifier', 'UserController');
$router->resource('order/list', 'OrderController'); $router->resource('order/list', 'OrderController');
$router->resource('slide/list', 'SlideController');
$router->resource('advertising/list', 'AdvertisingController');
$router->resource('special/list', 'SpecialController'); $router->resource('special/list', 'SpecialController');
$router->resource('waterfall_ad/list', 'WaterfallAdController'); $router->resource('waterfall_ad/list', 'WaterfallAdController');
$router->resource('message/list', 'MessageController'); $router->resource('message/list', 'MessageController');

4
app/Http/Controllers/Api/IndexController.php

@ -5,7 +5,7 @@ use App\Http\Controllers\Controller;
use App\Models\Channel; use App\Models\Channel;
use App\Models\Notice; use App\Models\Notice;
use App\Models\AgentProduct; use App\Models\AgentProduct;
use App\Models\Slide;
use App\Models\Advertising;
use App\Models\Special; use App\Models\Special;
use App\Models\UserChannel; use App\Models\UserChannel;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
@ -23,7 +23,7 @@ class IndexController extends Controller
$img_prefix = Storage::disk('public')->url(''); $img_prefix = Storage::disk('public')->url('');
# 轮播图 # 轮播图
$slide = Slide::where(['agent_id' => $this->agent_id, 'status' => 1])
$slide = Advertising::where(['agent_id' => $this->agent_id, 'status' => 1])
->orderBy('sort')->orderBy('id', 'DESC')->limit(10) ->orderBy('sort')->orderBy('id', 'DESC')->limit(10)
->get(['title', 'picture', 'type', 'url']); ->get(['title', 'picture', 'type', 'url']);
foreach ($slide as &$v) { foreach ($slide as &$v) {

4
app/Models/Slide.php → app/Models/Advertising.php

@ -6,10 +6,10 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
/** /**
* 轮播图 * 轮播图
* Class Slide
* Class Advertising
* @package App\Models * @package App\Models
*/ */
class Slide extends BaseModel
class Advertising extends BaseModel
{ {
use HasFactory; use HasFactory;
Loading…
Cancel
Save