|
@@ -270,12 +270,12 @@ class AnimeService
|
|
|
|
|
|
|
|
public function episodeInfo($data) {
|
|
public function episodeInfo($data) {
|
|
|
$anime_id = getProp($data, 'anime_id');
|
|
$anime_id = getProp($data, 'anime_id');
|
|
|
- $episode_number = getProp($data, 'episode_number');
|
|
|
|
|
- if (!$anime_id || !$episode_number) {
|
|
|
|
|
|
|
+ $episode_id = getProp($data, 'episode_id');
|
|
|
|
|
+ if (!$anime_id || !$episode_id) {
|
|
|
Utils::throwError('1002:请选择剧集');
|
|
Utils::throwError('1002:请选择剧集');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $episode = DB::table('mp_anime_episodes')->where('anime_id', $anime_id)->where('episode_number', $episode_number)->where('is_default', 1)->select('id as episode_id', 'anime_id', 'episode_number', 'title', 'intro', 'art_style', 'roles', 'scenes')->first();
|
|
|
|
|
|
|
+ $episode = DB::table('mp_anime_episodes')->where('anime_id', $anime_id)->where('episode_id', $episode_id)->where('is_default', 1)->select('id as episode_id', 'anime_id', 'episode_number', 'title', 'intro', 'art_style', 'roles', 'scenes')->first();
|
|
|
if (!$episode) Utils::throwError('20003: 该剧集不存在!');
|
|
if (!$episode) Utils::throwError('20003: 该剧集不存在!');
|
|
|
$episode = (array)$episode;
|
|
$episode = (array)$episode;
|
|
|
$episode['roles'] = json_decode($episode['roles'], true);
|
|
$episode['roles'] = json_decode($episode['roles'], true);
|
|
@@ -370,12 +370,12 @@ class AnimeService
|
|
|
|
|
|
|
|
public function episodeVersions($data) {
|
|
public function episodeVersions($data) {
|
|
|
$anime_id = getProp($data, 'anime_id');
|
|
$anime_id = getProp($data, 'anime_id');
|
|
|
- $episode_number = getProp($data, 'episode_number');
|
|
|
|
|
- if (!$anime_id || !$episode_number) {
|
|
|
|
|
|
|
+ $episode_id = getProp($data, 'episode_id');
|
|
|
|
|
+ if (!$anime_id || !$episode_id) {
|
|
|
Utils::throwError('1002:请选择剧集');
|
|
Utils::throwError('1002:请选择剧集');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $episodes = DB::table('mp_anime_episodes')->where('anime_id', $anime_id)->where('episode_number', $episode_number)->select('anime_id', 'episode_number', 'sequence', 'title', 'intro', 'art_style', 'roles', 'scenes')->get()->map(function($value) {
|
|
|
|
|
|
|
+ $episodes = DB::table('mp_anime_episodes')->where('anime_id', $anime_id)->where('episode_id', $episode_id)->select('anime_id', 'episode_number', 'sequence', 'title', 'intro', 'art_style', 'roles', 'scenes')->get()->map(function($value) {
|
|
|
return (array)$value;
|
|
return (array)$value;
|
|
|
})->toArray();
|
|
})->toArray();
|
|
|
if (!$episodes) Utils::throwError('20003: 该剧集不存在!');
|
|
if (!$episodes) Utils::throwError('20003: 该剧集不存在!');
|
|
@@ -462,20 +462,20 @@ class AnimeService
|
|
|
|
|
|
|
|
public function batchSetSegmentPics($data) {
|
|
public function batchSetSegmentPics($data) {
|
|
|
$anime_id = getProp($data, 'anime_id');
|
|
$anime_id = getProp($data, 'anime_id');
|
|
|
- $episode_number = getProp($data, 'episode_number');
|
|
|
|
|
|
|
+ $episode_id = getProp($data, 'episode_id');
|
|
|
$ratio = getProp($data, 'ratio');
|
|
$ratio = getProp($data, 'ratio');
|
|
|
if (!in_array($ratio, ['1:1', '4:3', '3:2', '16:9', '21:9'])) {
|
|
if (!in_array($ratio, ['1:1', '4:3', '3:2', '16:9', '21:9'])) {
|
|
|
Utils::throwError('1002:画面比例选择不正确,只支持1:1、4:3、3:2、16:9、21:9');
|
|
Utils::throwError('1002:画面比例选择不正确,只支持1:1、4:3、3:2、16:9、21:9');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (!$anime_id || !$episode_number) {
|
|
|
|
|
|
|
+ if (!$anime_id || !$episode_id) {
|
|
|
Utils::throwError('1002:请选择剧集');
|
|
Utils::throwError('1002:请选择剧集');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 获取剧集信息
|
|
// 获取剧集信息
|
|
|
$episode = DB::table('mp_anime_episodes')
|
|
$episode = DB::table('mp_anime_episodes')
|
|
|
->where('anime_id', $anime_id)
|
|
->where('anime_id', $anime_id)
|
|
|
- ->where('episode_number', $episode_number)
|
|
|
|
|
|
|
+ ->where('episode_id', $episode_id)
|
|
|
->where('is_default', 1)
|
|
->where('is_default', 1)
|
|
|
->select('id as episode_id', 'anime_id', 'episode_number')
|
|
->select('id as episode_id', 'anime_id', 'episode_number')
|
|
|
->first();
|
|
->first();
|
|
@@ -704,6 +704,7 @@ class AnimeService
|
|
|
$segment_id = getProp($data, 'segment_id');
|
|
$segment_id = getProp($data, 'segment_id');
|
|
|
$segment = DB::table('mp_episode_segments')->where('segment_id', $segment_id)->first();
|
|
$segment = DB::table('mp_episode_segments')->where('segment_id', $segment_id)->first();
|
|
|
$anime_id = getProp($segment, 'anime_id');
|
|
$anime_id = getProp($segment, 'anime_id');
|
|
|
|
|
+ $episode_id = getProp($segment, 'episode_id');
|
|
|
$episode_number = getProp($segment, 'episode_number');
|
|
$episode_number = getProp($segment, 'episode_number');
|
|
|
$segment_content = getProp($data, 'segment_content');
|
|
$segment_content = getProp($data, 'segment_content');
|
|
|
$ratio = getProp($data, 'ratio');
|
|
$ratio = getProp($data, 'ratio');
|
|
@@ -711,7 +712,7 @@ class AnimeService
|
|
|
Utils::throwError('1002:画面比例选择不正确,只支持1:1、4:3、3:2、16:9、21:9');
|
|
Utils::throwError('1002:画面比例选择不正确,只支持1:1、4:3、3:2、16:9、21:9');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (!$anime_id || !$episode_number) {
|
|
|
|
|
|
|
+ if (!$anime_id || !$episode_id) {
|
|
|
Utils::throwError('1002:请选择分镜');
|
|
Utils::throwError('1002:请选择分镜');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -884,6 +885,7 @@ class AnimeService
|
|
|
$prev_segment_id = getProp($data, 'prev_segment_id');
|
|
$prev_segment_id = getProp($data, 'prev_segment_id');
|
|
|
$segment = DB::table('mp_episode_segments')->where('segment_id', $prev_segment_id)->first();
|
|
$segment = DB::table('mp_episode_segments')->where('segment_id', $prev_segment_id)->first();
|
|
|
$anime_id = getProp($segment, 'anime_id');
|
|
$anime_id = getProp($segment, 'anime_id');
|
|
|
|
|
+ $episode_id = getProp($segment, 'episode_id');
|
|
|
$episode_number = getProp($segment, 'episode_number');
|
|
$episode_number = getProp($segment, 'episode_number');
|
|
|
$segment_number = getProp($segment, 'segment_number');
|
|
$segment_number = getProp($segment, 'segment_number');
|
|
|
$segment_content = getProp($data, 'segment_content');
|
|
$segment_content = getProp($data, 'segment_content');
|
|
@@ -894,7 +896,7 @@ class AnimeService
|
|
|
Utils::throwError('1002:画面比例选择不正确,只支持1:1、4:3、3:2、16:9、21:9');
|
|
Utils::throwError('1002:画面比例选择不正确,只支持1:1、4:3、3:2、16:9、21:9');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (!$anime_id || !$episode_number) {
|
|
|
|
|
|
|
+ if (!$anime_id || !$episode_id) {
|
|
|
Utils::throwError('1002:请选择分镜');
|
|
Utils::throwError('1002:请选择分镜');
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -978,7 +980,7 @@ class AnimeService
|
|
|
// 分镜剧本数组
|
|
// 分镜剧本数组
|
|
|
$insert_data = [
|
|
$insert_data = [
|
|
|
'anime_id' => $anime_id,
|
|
'anime_id' => $anime_id,
|
|
|
- 'episode_id' => getProp($segment, 'episode_id'),
|
|
|
|
|
|
|
+ 'episode_id' => $episode_id,
|
|
|
'episode_number' => $episode_number,
|
|
'episode_number' => $episode_number,
|
|
|
'act_number' => getProp($segment, 'act_number'),
|
|
'act_number' => getProp($segment, 'act_number'),
|
|
|
'act_title' => getProp($segment, 'act_title'),
|
|
'act_title' => getProp($segment, 'act_title'),
|
|
@@ -1061,7 +1063,7 @@ class AnimeService
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 先更新序号
|
|
// 先更新序号
|
|
|
- $boolen = DB::table('mp_episode_segments')->where('anime_id', $anime_id)->where('episode_number', $episode_number)->where('segment_number', '>', $segment_number)->increment('segment_number');
|
|
|
|
|
|
|
+ $boolen = DB::table('mp_episode_segments')->where('anime_id', $anime_id)->where('episode_id', $episode_id)->where('segment_number', '>', $segment_number)->increment('segment_number');
|
|
|
if (!$boolen) {
|
|
if (!$boolen) {
|
|
|
Utils::throwError('20003:更新序号失败');
|
|
Utils::throwError('20003:更新序号失败');
|
|
|
}
|
|
}
|
|
@@ -1095,6 +1097,7 @@ class AnimeService
|
|
|
$segment = DB::table('mp_episode_segments')->where('segment_id', $segment_id)->first();
|
|
$segment = DB::table('mp_episode_segments')->where('segment_id', $segment_id)->first();
|
|
|
if (!$segment) Utils::throwError('20003:请选择分镜');
|
|
if (!$segment) Utils::throwError('20003:请选择分镜');
|
|
|
$anime_id = getProp($segment, 'anime_id');
|
|
$anime_id = getProp($segment, 'anime_id');
|
|
|
|
|
+ $episode_id = getProp($segment, 'episode_id');
|
|
|
$episode_number = getProp($segment, 'episode_number');
|
|
$episode_number = getProp($segment, 'episode_number');
|
|
|
$segment_number = getProp($segment, 'segment_number');
|
|
$segment_number = getProp($segment, 'segment_number');
|
|
|
|
|
|
|
@@ -1109,7 +1112,7 @@ class AnimeService
|
|
|
$segment['created_at'] = $segment['updated_at'] = date('Y-m-d H:i:s');
|
|
$segment['created_at'] = $segment['updated_at'] = date('Y-m-d H:i:s');
|
|
|
|
|
|
|
|
// 更新其他分镜序号
|
|
// 更新其他分镜序号
|
|
|
- $boolen2 = DB::table('mp_episode_segments')->where('anime_id', $anime_id)->where('episode_number', $episode_number)->where('segment_number', '>', $segment_number)->increment('segment_number');
|
|
|
|
|
|
|
+ $boolen2 = DB::table('mp_episode_segments')->where('anime_id', $anime_id)->where('episode_id', $episode_id)->where('segment_number', '>', $segment_number)->increment('segment_number');
|
|
|
if (!$boolen2) {
|
|
if (!$boolen2) {
|
|
|
Utils::throwError('20003:更新其他分镜序号失败');
|
|
Utils::throwError('20003:更新其他分镜序号失败');
|
|
|
}
|
|
}
|
|
@@ -1143,6 +1146,7 @@ class AnimeService
|
|
|
if (!$target_segment) Utils::throwError('20003:目标分镜不存在');
|
|
if (!$target_segment) Utils::throwError('20003:目标分镜不存在');
|
|
|
|
|
|
|
|
$anime_id = getProp($source_segment, 'anime_id');
|
|
$anime_id = getProp($source_segment, 'anime_id');
|
|
|
|
|
+ $episode_id = getProp($source_segment, 'episode_id');
|
|
|
$episode_number = getProp($source_segment, 'episode_number');
|
|
$episode_number = getProp($source_segment, 'episode_number');
|
|
|
$source_segment_number = getProp($source_segment, 'segment_number');
|
|
$source_segment_number = getProp($source_segment, 'segment_number');
|
|
|
$target_segment_number = getProp($target_segment, 'segment_number');
|
|
$target_segment_number = getProp($target_segment, 'segment_number');
|
|
@@ -1168,7 +1172,7 @@ class AnimeService
|
|
|
// 1. 将源分镜和目标分镜之间的所有分镜序号减1
|
|
// 1. 将源分镜和目标分镜之间的所有分镜序号减1
|
|
|
DB::table('mp_episode_segments')
|
|
DB::table('mp_episode_segments')
|
|
|
->where('anime_id', $anime_id)
|
|
->where('anime_id', $anime_id)
|
|
|
- ->where('episode_number', $episode_number)
|
|
|
|
|
|
|
+ ->where('episode_id', $episode_id)
|
|
|
->where('segment_number', '>', $source_segment_number)
|
|
->where('segment_number', '>', $source_segment_number)
|
|
|
->where('segment_number', '<=', $target_segment_number)
|
|
->where('segment_number', '<=', $target_segment_number)
|
|
|
->decrement('segment_number');
|
|
->decrement('segment_number');
|
|
@@ -1181,7 +1185,7 @@ class AnimeService
|
|
|
// 1. 将目标分镜之后到源分镜之前的所有分镜序号加1
|
|
// 1. 将目标分镜之后到源分镜之前的所有分镜序号加1
|
|
|
DB::table('mp_episode_segments')
|
|
DB::table('mp_episode_segments')
|
|
|
->where('anime_id', $anime_id)
|
|
->where('anime_id', $anime_id)
|
|
|
- ->where('episode_number', $episode_number)
|
|
|
|
|
|
|
+ ->where('episode_id', $episode_id)
|
|
|
->where('segment_number', '>', $target_segment_number)
|
|
->where('segment_number', '>', $target_segment_number)
|
|
|
->where('segment_number', '<', $source_segment_number)
|
|
->where('segment_number', '<', $source_segment_number)
|
|
|
->increment('segment_number');
|
|
->increment('segment_number');
|
|
@@ -1216,6 +1220,7 @@ class AnimeService
|
|
|
$segment = DB::table('mp_episode_segments')->where('segment_id', $segment_id)->first();
|
|
$segment = DB::table('mp_episode_segments')->where('segment_id', $segment_id)->first();
|
|
|
if (!$segment) Utils::throwError('20003:请选择分镜');
|
|
if (!$segment) Utils::throwError('20003:请选择分镜');
|
|
|
$anime_id = getProp($segment, 'anime_id');
|
|
$anime_id = getProp($segment, 'anime_id');
|
|
|
|
|
+ $episode_id = getProp($segment, 'episode_id');
|
|
|
$episode_number = getProp($segment, 'episode_number');
|
|
$episode_number = getProp($segment, 'episode_number');
|
|
|
$segment_number = getProp($segment, 'segment_number');
|
|
$segment_number = getProp($segment, 'segment_number');
|
|
|
|
|
|
|
@@ -1229,7 +1234,7 @@ class AnimeService
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 更新其他分镜序号
|
|
// 更新其他分镜序号
|
|
|
- $boolen2 = DB::table('mp_episode_segments')->where('anime_id', $anime_id)->where('episode_number', $episode_number)->where('segment_number', '>', $segment_number)->decrement('segment_number');
|
|
|
|
|
|
|
+ $boolen2 = DB::table('mp_episode_segments')->where('anime_id', $anime_id)->where('episode_id', $episode_id)->where('segment_number', '>', $segment_number)->decrement('segment_number');
|
|
|
if (!$boolen2) {
|
|
if (!$boolen2) {
|
|
|
Utils::throwError('20003:更新其他分镜序号失败');
|
|
Utils::throwError('20003:更新其他分镜序号失败');
|
|
|
}
|
|
}
|