Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
media-resource
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨昕
media-resource
Commits
38f5bec7
Commit
38f5bec7
authored
Jul 08, 2020
by
杨昕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加媒资类别模块
parent
2d0f40b4
Pipeline
#9840
passed with stages
in 33 seconds
Changes
6
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
136 additions
and
7 deletions
+136
-7
MediaController.php
app/Http/Controllers/Web/MediaController.php
+44
-0
MediaModel.php
app/Model/MediaModel.php
+8
-2
module.json
public/module.json
+80
-1
media_add.blade.php
resources/views/admin/media/media_add.blade.php
+0
-0
media_edit.blade.php
resources/views/admin/media/media_edit.blade.php
+3
-3
media_list.blade.php
resources/views/admin/media/media_list.blade.php
+1
-1
No files found.
app/Http/Controllers/Web/MediaController.php
View file @
38f5bec7
...
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Web;
...
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Web;
use
App\Model\MediaCategoryModel
;
use
App\Model\MediaCategoryModel
;
use
App\Model\MediaModel
;
use
App\Model\MediaModel
;
use
App\Tool\SrsHookValidate
;
use
Illuminate\Http\Request
;
use
Illuminate\Http\Request
;
use
App\Http\Controllers\Controller
;
use
App\Http\Controllers\Controller
;
...
@@ -57,4 +58,47 @@ class MediaController extends Controller
...
@@ -57,4 +58,47 @@ class MediaController extends Controller
return
success
(
$res
);
return
success
(
$res
);
}
}
/**
* 显示
* @param Request $request
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @throws \App\Exceptions\ControllerException
*/
public
function
create
(
Request
$request
){
$reslut
=
handler_drive
(
function
()
use
(
$request
){
$media_types
=
MediaCategoryModel
::
catgList
(
$request
);
return
$media_types
;
});
$data
[
'media_types'
]
=
$reslut
;
$data
[
'media_id'
]
=
'mda-'
.
generateRandomNum
(
16
);
return
view
(
'admin.media.media_add'
,
$data
);
}
/**
* @param Request $request
* @return \Illuminate\Http\JsonResponse
* @throws \App\Exceptions\ControllerException
*/
public
function
store
(
Request
$request
){
$id
=
handler_drive
(
function
()
use
(
$request
){
SrsHookValidate
::
srsHookCallback
(
$request
,[
'media_name'
=>
'required'
,
'media_type'
=>
'required'
,
'media_id'
=>
'required'
,
'access_key'
=>
''
,
'secret_key'
=>
''
,
'media_url'
=>
'required'
,
]);
return
MediaModel
::
hookRestoreMedia
(
$request
);
});
return
success
(
$id
);
}
}
}
app/Model/MediaModel.php
View file @
38f5bec7
...
@@ -40,7 +40,7 @@ class MediaModel extends Eloquent
...
@@ -40,7 +40,7 @@ class MediaModel extends Eloquent
$tmp
[
$catg
[
'_id'
]]
=
$catg
[
'name'
];
$tmp
[
$catg
[
'_id'
]]
=
$catg
[
'name'
];
}
}
$medias
=
MediaModel
::
where
(
$where
)
->
paginate
(
10
);
$medias
=
MediaModel
::
where
(
$where
)
->
orderBy
(
"create_time"
,
"desc"
)
->
paginate
(
10
);
foreach
(
$medias
as
$media
){
foreach
(
$medias
as
$media
){
$media
[
'media_type'
]
=
$tmp
[
$media
[
'media_type_id'
]];
$media
[
'media_type'
]
=
$tmp
[
$media
[
'media_type_id'
]];
...
@@ -276,6 +276,9 @@ class MediaModel extends Eloquent
...
@@ -276,6 +276,9 @@ class MediaModel extends Eloquent
public
static
function
getMediaList
(
$request
){
public
static
function
getMediaList
(
$request
){
try
{
try
{
/**
*[{"bookNum":["hb15011","2"],"mediaCatg":"一题一码"}]
*/
$params
=
json_decode
(
$request
->
params
,
true
);
$params
=
json_decode
(
$request
->
params
,
true
);
if
(
empty
(
$params
)){
if
(
empty
(
$params
)){
...
@@ -309,7 +312,10 @@ class MediaModel extends Eloquent
...
@@ -309,7 +312,10 @@ class MediaModel extends Eloquent
$res
[]
=
$item
->
groupBy
(
"book_num"
);
$res
[]
=
$item
->
groupBy
(
"book_num"
);
}
}
if
(
isset
(
$res
[
0
])
||
empty
(
$res
[
0
])){
/**
* 排除res为空
*/
if
(
!
isset
(
$res
[
0
])
||
empty
(
$res
[
0
])){
return
[];
return
[];
}
}
...
...
public/module.json
View file @
38f5bec7
...
@@ -124,7 +124,7 @@
...
@@ -124,7 +124,7 @@
"id"
:
11
,
"id"
:
11
,
"pid"
:
0
,
"pid"
:
0
,
"name"
:
"媒资管理"
,
"name"
:
"媒资管理"
,
"icon"
:
"æ
23
;"
,
"icon"
:
"æ
0d
;"
,
"link"
:
"/manager"
,
"link"
:
"/manager"
,
"slug"
:
"manager"
,
"slug"
:
"manager"
,
"description"
:
""
,
"description"
:
""
,
...
@@ -198,4 +198,82 @@
...
@@ -198,4 +198,82 @@
"sort"
:
25
,
"sort"
:
25
,
"key_name"
:
"media_create"
"key_name"
:
"media_create"
}]
}]
},{
"id"
:
3
,
"pid"
:
0
,
"name"
:
"媒资类别管理"
,
"icon"
:
""
,
"link"
:
"/media_category"
,
"slug"
:
"media_category"
,
"description"
:
""
,
"show"
:
1
,
"sort"
:
2
,
"key_name"
:
"media_category"
,
"son"
:
[{
"id"
:
31
,
"pid"
:
3
,
"name"
:
"媒资类别列表"
,
"icon"
:
""
,
"link"
:
"/media_category"
,
"slug"
:
"media_category.index"
,
"description"
:
""
,
"show"
:
1
,
"sort"
:
25
,
"key_name"
:
"media_list"
},{
"id"
:
31
,
"pid"
:
3
,
"name"
:
"媒资类别删除"
,
"icon"
:
""
,
"link"
:
""
,
"slug"
:
"media_category.destroy"
,
"description"
:
""
,
"show"
:
0
,
"sort"
:
25
,
"key_name"
:
"media_destroy"
},
{
"id"
:
33
,
"pid"
:
3
,
"name"
:
"媒资类别添加保存"
,
"icon"
:
""
,
"link"
:
""
,
"slug"
:
"media_category.store"
,
"description"
:
""
,
"show"
:
0
,
"sort"
:
25
,
"key_name"
:
"media_store"
},
{
"id"
:
34
,
"pid"
:
3
,
"name"
:
"媒资类别修改保存"
,
"icon"
:
""
,
"link"
:
""
,
"slug"
:
"media_category.update"
,
"description"
:
""
,
"show"
:
0
,
"sort"
:
25
,
"key_name"
:
"media_update"
},
{
"id"
:
35
,
"pid"
:
3
,
"name"
:
"媒资类别编辑"
,
"icon"
:
""
,
"link"
:
""
,
"slug"
:
"media_category.edit"
,
"description"
:
""
,
"show"
:
0
,
"sort"
:
25
,
"key_name"
:
"media_edit"
},
{
"id"
:
36
,
"pid"
:
3
,
"name"
:
"媒资类别添加"
,
"icon"
:
""
,
"link"
:
"/media_category/create"
,
"slug"
:
"media_category.create"
,
"description"
:
""
,
"show"
:
0
,
"sort"
:
25
,
"key_name"
:
"media_create"
}]
}]
}]
\ No newline at end of file
resources/views/admin/media/media_add.blade.php
View file @
38f5bec7
This diff is collapsed.
Click to expand it.
resources/views/admin/media/media_edit.blade.php
View file @
38f5bec7
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
<div
class=
"input-group "
>
<div
class=
"input-group "
>
<div
class=
"input-group-addon"
><i
class=
"icon iconfont icon-title"
>

</i></div>
<div
class=
"input-group-addon"
><i
class=
"icon iconfont icon-title"
>

</i></div>
<input
type=
"text"
class=
"form-control"
name=
"media_name"
id=
"media_name"
<input
type=
"text"
class=
"form-control"
name=
"media_name"
id=
"media_name"
placeholder=
"
姓名
"
value=
"{{$media['media_name']}}"
>
placeholder=
"
媒资名称
"
value=
"{{$media['media_name']}}"
>
</div>
</div>
</div>
</div>
...
@@ -61,9 +61,9 @@
...
@@ -61,9 +61,9 @@
@foreach($media_types as $media_type)
@foreach($media_types as $media_type)
@if($media_type['name'] == $media['media_type'])
@if($media_type['name'] == $media['media_type'])
<option
value=
"{{$media['media_type']}}"
selected
>
{{$media_type['name']}}
</option>
<option
value=
"{{$media['media_type
_id
']}}"
selected
>
{{$media_type['name']}}
</option>
@else
@else
<option
value=
"{{$media['media_type']}}"
>
{{$media_type['name']}}
</option>
<option
value=
"{{$media['media_type
_id
']}}"
>
{{$media_type['name']}}
</option>
@endif
@endif
@endforeach
@endforeach
...
...
resources/views/admin/media/media_list.blade.php
View file @
38f5bec7
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
<div
class=
"row ml20"
>
<div
class=
"row ml20"
>
<div
class=
"xblock"
>
<div
class=
"xblock"
>
<button
class=
"btn btn-primary"
onclick=
"x_admin_show('/web/me
mb
er/create')"
>
<button
class=
"btn btn-primary"
onclick=
"x_admin_show('/web/me
dia_manag
er/create')"
>
添加
添加
</button>
</button>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment