新增列表分页参数设置

app/Services/Book/BookService.php

@@ -24,6 +24,8 @@ class BookService
         $bid = getProp($data, 'bid');
         $book_name = getProp($data, 'book_name');
         $status = getProp($data, 'status');
+        $page = getProp($data, 'page', 1);
+        $per_page = getProp($data, 'pageSize', 15);
 
         $query = DB::table('books as b')->leftJoin('book_configs as bc', 'b.id', '=', 'bc.bid')
         ->where('b.size', '<', 30000)->where('b.status', 1)
@@ -42,7 +44,7 @@ class BookService
             $query->where('b.status', $status);
         }
 
-        $result = $query->orderBy('b.id')->paginate();
+        $result = $query->orderBy('b.id')->paginate($per_page);
 
         return $result;
     }
@@ -171,6 +173,8 @@ class BookService
     public function getChapterList($data) {
         $bid = getProp($data, 'bid');
         $version_id = getProp($data, 'version_id');
+        $page = getProp($data, 'page', 1);
+        $per_page = getProp($data, 'pageSize', 15);
         if (!$bid) Utils::throwError('20003:请选择书籍');
         if (!$version_id) Utils::throwError('20003:请选择版本');
         $generate_status = getProp($data, 'generate_status');
@@ -218,7 +222,7 @@ class BookService
             $query->where('generate_status', $generate_status);
         }
         
-        $list = $query->orderBy('sequence', 'asc')->paginate();
+        $list = $query->orderBy('sequence', 'asc')->paginate($per_page);
 
         return ['header' => $header, 'list' => $list];
 
@@ -239,12 +243,14 @@ class BookService
         $version_id = getProp($data, 'version_id');
         $version_name = getProp($data, 'version_name');
         $book_name = getProp($data, 'book_name');
+        $page = getProp($data, 'page', 1);
+        $per_page = getProp($data, 'pageSize', 15);
 
         $query = DB::table('mp_book_version as v')->leftJoin('book_configs as bc', 'v.bid', '=', 'bc.bid');
         if ($version_id) $query->where('v.id', $version_id);
         if ($version_name) $query->where('v.version_name', 'like', '%'.$version_name.'%');
         if ($book_name) $query->where('bc.book_name', 'like', '%'.$book_name.'%');
-        $list = $query->select('v.*', 'bc.book_name')->paginate();
+        $list = $query->select('v.*', 'bc.book_name')->paginate($per_page);
 
         return $list;
     }
@@ -254,12 +260,14 @@ class BookService
         $task_id = getProp($data, 'task_id');
         $task_name = getProp($data, 'task_name');
         $generate_status = getProp($data, 'generate_status');
+        $page = getProp($data, 'page', 1);
+        $per_page = getProp($data, 'pageSize', 15);
 
         $query = DB::table('mp_audio_tasks')->select('id', 'task_name', 'generate_status', 'bid', 'version_id', 'cid', 'created_at');
         if ($task_id) $query->where('id', $task_id);
         if ($task_name) $query->where('task_name', 'like', '%'.$task_name.'%');
         if ($generate_status) $query->where('generate_status',  $generate_status);
-        $list = $query->orderBy('id', 'desc')->paginate();
+        $list = $query->orderBy('id', 'desc')->paginate($per_page);
 
         return $list;
     }
@@ -277,11 +285,13 @@ class BookService
 
     public function audioEffectList($data) {
         $audio_effect_name = getProp($data, 'audio_effect_name');
+        $page = getProp($data, 'page', 1);
+        $per_page = getProp($data, 'pageSize', 15);
         
         $query = DB::table('mp_audio_effects')->where('is_enabled', 1);
         if ($audio_effect_name) $query->where('audio_effect_name', 'like', '%'.$audio_effect_name.'%');
 
-        return $query->paginate();
+        return $query->paginate($per_page);
     }
 
     public function audioEffects($data) {
@@ -369,11 +379,13 @@ class BookService
 
     public function bgmList($data) {
         $bgm_name = getProp($data, 'bgm_name');
+        $page = getProp($data, 'page', 1);
+        $per_page = getProp($data, 'pageSize', 15);
         
         $query = DB::table('mp_bgms')->where('is_enabled', 1);
         if ($bgm_name) $query->where('bgm_name', 'like', '%'.$bgm_name.'%');
 
-        return $query->paginate();
+        return $query->paginate($per_page);
     }
 
     public function bgms($data) {

app/Services/Timbre/TimbreService.php

@@ -74,6 +74,8 @@ class TimbreService
         $category_type = getProp($data, 'category_type', 1);
         $category_id = getProp($data, 'category_id');
         $category_name = getProp($data, 'category_name');
+        $page = getProp($data, 'page', 1);
+        $per_page = getProp($data, 'pageSize', 15);
         $pid = getProp($data, 'pid');
 
         $query = DB::table('mp_timbre_categories')->where('is_enable', 1)->select('*');
@@ -98,7 +100,7 @@ class TimbreService
             $query->where('category_name', 'like', "%{$category_name}%");
         }
 
-        return $query->orderBy('id')->paginate();
+        return $query->orderBy('id')->paginate($per_page);
     }
 
     public function getTimbreList($data) {
@@ -106,6 +108,8 @@ class TimbreService
         $language = getProp($data, 'language');
         $status = getProp($data, 'status');
         $dialect = getProp($data, 'dialect');
+        $page = getProp($data, 'page', 1);
+        $per_page = getProp($data, 'pageSize', 15);
 
         $query = DB::table('mp_timbres')->where('is_enabled', 1)->select('*');
 
@@ -121,7 +125,7 @@ class TimbreService
             $query->where('dialect', $dialect);
         }
 
-        $result = $query->orderBy('id')->paginate();
+        $result = $query->orderBy('id')->paginate($per_page);
 
         return $result;
     }
@@ -184,6 +188,8 @@ class TimbreService
     public function timbreGroupList($data) {
         $group_name = getProp($data, 'group_name');
         $label = getProp($data, 'label');
+        $page = getProp($data, 'page', 1);
+        $per_page = getProp($data, 'pageSize', 15);
 
         $query = DB::table('mp_timbre_groups')->select('*');
 
@@ -195,7 +201,7 @@ class TimbreService
             $query->where('label', 'like', $label);
         }
 
-        return $query->orderBy('id')->paginate();
+        return $query->orderBy('id')->paginate($per_page);
     }
 
     public function addTimbreGroup($data) {
@@ -259,6 +265,8 @@ class TimbreService
         $id = getProp($data, 'group_id');
         $group_name = getProp($data, 'group_name');
         $voice_type = getProp($data, 'voice_type');
+        $page = getProp($data, 'page', 1);
+        $per_page = getProp($data, 'pageSize', 15);
 
         $query = DB::table('mp_emotion_groups')->where('is_enabled', 1)->select('*');
 
@@ -274,7 +282,7 @@ class TimbreService
             $query->where('voice_type', $voice_type);
         }
 
-        return $query->orderBy('id')->paginate();
+        return $query->orderBy('id')->paginate($per_page);
     }
 
     public function addEmotionGroup($data) {