From f509aa3b573251965d0476b05ac769f227db0075 Mon Sep 17 00:00:00 2001 From: "zhangf@suq.cn" Date: Thu, 11 Dec 2025 11:42:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(service):=20=E6=B7=BB=E5=8A=A0=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=92=8C=E6=8E=92=E5=BA=8F=E5=8F=82=E6=95=B0=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在多个服务类中引入 RequestUtils 工具类 - 为 listData 方法增加分页和排序功能 - 修改数据库查询方法以支持分页和自定义排序 - 统一处理分页参数和排序规则的获取逻辑 --- app/service/AiCommandService.php | 5 ++++- app/service/ArticleCategoryService.php | 5 ++++- app/service/CreationArticleService.php | 5 ++++- app/service/CreationTaskService.php | 5 ++++- app/service/DistillationQuestionsService.php | 5 ++++- app/service/DistillationWordService.php | 5 ++++- app/service/EnterprisePortraitCategoryService.php | 5 ++++- app/service/EnterprisePortraitLibraryService.php | 5 ++++- app/service/KnowledgeLibraryService.php | 5 ++++- 9 files changed, 36 insertions(+), 9 deletions(-) diff --git a/app/service/AiCommandService.php b/app/service/AiCommandService.php index 2f44acb..65ffb2b 100644 --- a/app/service/AiCommandService.php +++ b/app/service/AiCommandService.php @@ -5,6 +5,7 @@ namespace app\service; use app\dao\AiCommandDao; use plugin\piadmin\app\base\BaseService; use plugin\piadmin\app\exception\ApiException; +use plugin\piadmin\app\utils\RequestUtils; use support\think\Db; class AiCommandService extends BaseService @@ -61,6 +62,8 @@ class AiCommandService extends BaseService */ public function listData(array $params): array { + [$page, $limit] = RequestUtils::getPageParameter(); + [$sortRule, $sortField] = RequestUtils::getSortParameter(); $query = [ 'delete_time' => 0 ]; @@ -76,7 +79,7 @@ class AiCommandService extends BaseService if (isNotBlank($params['end_time'])) { $query[] = ['create_time', '<=', strtotime($params['end_time'] . ' 23:59:59')]; } - $list = $this->dao->getList($query, 'id,name,type,create_time'); + $list = $this->dao->getList($query, 'id,name,type,create_time', $page, $limit, "$sortField $sortRule"); $count = $this->dao->getCount($query); return compact('list', 'count'); } diff --git a/app/service/ArticleCategoryService.php b/app/service/ArticleCategoryService.php index abe0b60..5a0b0ec 100644 --- a/app/service/ArticleCategoryService.php +++ b/app/service/ArticleCategoryService.php @@ -5,6 +5,7 @@ namespace app\service; use app\dao\ArticleCategoryDao; use plugin\piadmin\app\base\BaseService; use plugin\piadmin\app\exception\ApiException; +use plugin\piadmin\app\utils\RequestUtils; use support\think\Db; class ArticleCategoryService extends BaseService @@ -61,6 +62,8 @@ class ArticleCategoryService extends BaseService */ public function listData(array $params): array { + [$page, $limit] = RequestUtils::getPageParameter(); + [$sortRule, $sortField] = RequestUtils::getSortParameter(); $query = [ 'delete_time' => 0 ]; @@ -73,7 +76,7 @@ class ArticleCategoryService extends BaseService if (isNotBlank($params['end_time'])) { $query[] = ['create_time', '<=', strtotime($params['end_time'] . ' 23:59:59')]; } - $list = $this->dao->getList($query); + $list = $this->dao->getList($query, '*', $page, $limit, "$sortField $sortRule"); $count = $this->dao->getCount($query); return compact('list', 'count'); } diff --git a/app/service/CreationArticleService.php b/app/service/CreationArticleService.php index 2c8b3f5..70bec0e 100644 --- a/app/service/CreationArticleService.php +++ b/app/service/CreationArticleService.php @@ -7,6 +7,7 @@ use app\dao\CreationArticleDao; use app\dao\CreationTaskDao; use plugin\piadmin\app\base\BaseService; use plugin\piadmin\app\exception\ApiException; +use plugin\piadmin\app\utils\RequestUtils; use support\think\Db; class CreationArticleService extends BaseService @@ -67,6 +68,8 @@ class CreationArticleService extends BaseService */ public function listData(array $params): array { + [$page, $limit] = RequestUtils::getPageParameter(); + [$sortRule, $sortField] = RequestUtils::getSortParameter(); $query = [ 'delete_time' => 0 ]; @@ -93,7 +96,7 @@ class CreationArticleService extends BaseService if (isNotBlank($params['end_time'])) { $query[] = ['create_time', '<=', strtotime($params['end_time'] . ' 23:59:59')]; } - $list = $this->dao->getList($query, 'id,title,status,create_time,article_category_id', 0, 0, 'id DESC', ['category']); + $list = $this->dao->getList($query, 'id,title,status,create_time,article_category_id', $page, $limit, "$sortField $sortRule", ['category']); $count = $this->dao->getCount($query); return compact('list', 'count'); } diff --git a/app/service/CreationTaskService.php b/app/service/CreationTaskService.php index f9d1950..9048e99 100644 --- a/app/service/CreationTaskService.php +++ b/app/service/CreationTaskService.php @@ -7,6 +7,7 @@ use app\dao\CreationTaskDao; use app\dao\DistillationWordDao; use plugin\piadmin\app\base\BaseService; use plugin\piadmin\app\exception\ApiException; +use plugin\piadmin\app\utils\RequestUtils; use support\think\Db; use Webman\RedisQueue\Redis; @@ -85,6 +86,8 @@ class CreationTaskService extends BaseService */ public function listData(array $params): array { + [$page, $limit] = RequestUtils::getPageParameter(); + [$sortRule, $sortField] = RequestUtils::getSortParameter(); $query = [ 'delete_time' => 0 ]; @@ -104,7 +107,7 @@ class CreationTaskService extends BaseService if (isNotBlank($params['end_time'])) { $query[] = ['create_time', '<=', strtotime($params['end_time'] . ' 23:59:59')]; } - $list = $this->dao->getList($query, '*', 0, 0, 'id DESC', ['distillaction']); + $list = $this->dao->getList($query, '*', $page, $limit, "$sortField $sortRule", ['distillaction']); $count = $this->dao->getCount($query); return compact('list', 'count'); } diff --git a/app/service/DistillationQuestionsService.php b/app/service/DistillationQuestionsService.php index 352f590..b629068 100644 --- a/app/service/DistillationQuestionsService.php +++ b/app/service/DistillationQuestionsService.php @@ -6,6 +6,7 @@ use app\dao\DistillationQuestionsDao; use app\dao\DistillationWordDao; use plugin\piadmin\app\base\BaseService; use plugin\piadmin\app\exception\ApiException; +use plugin\piadmin\app\utils\RequestUtils; use support\think\Db; class DistillationQuestionsService extends BaseService @@ -71,6 +72,8 @@ class DistillationQuestionsService extends BaseService */ public function listData(array $params): array { + [$page, $limit] = RequestUtils::getPageParameter(); + [$sortRule, $sortField] = RequestUtils::getSortParameter(); $query = [ 'delete_time' => 0 ]; @@ -87,7 +90,7 @@ class DistillationQuestionsService extends BaseService if (isNotBlank($params['end_time'])) { $query[] = ['create_time', '<=', strtotime($params['end_time'] . ' 23:59:59')]; } - $list = $this->dao->getList($query, '*', 0, 0, 'id DESC', ['distillation']); + $list = $this->dao->getList($query, '*', $page, $limit, "$sortField $sortRule", ['distillation']); $count = $this->dao->getCount($query); return compact('list', 'count'); } diff --git a/app/service/DistillationWordService.php b/app/service/DistillationWordService.php index 0cfa193..a788ae7 100644 --- a/app/service/DistillationWordService.php +++ b/app/service/DistillationWordService.php @@ -8,6 +8,7 @@ use app\dao\DistillationTransWordDao; use app\dao\DistillationWordDao; use plugin\piadmin\app\base\BaseService; use plugin\piadmin\app\exception\ApiException; +use plugin\piadmin\app\utils\RequestUtils; use support\think\Db; class DistillationWordService extends BaseService @@ -108,6 +109,8 @@ class DistillationWordService extends BaseService */ public function listData(array $params): array { + [$page, $limit] = RequestUtils::getPageParameter(); + [$sortRule, $sortField] = RequestUtils::getSortParameter(); $query = [ 'delete_time' => 0 ]; @@ -126,7 +129,7 @@ class DistillationWordService extends BaseService if (isNotBlank($params['end_time'])) { $query[] = ['create_time', '<=', strtotime($params['end_time'] . ' 23:59:59')]; } - $list = $this->dao->getList($query, '*', 0, 0, 'id DESC', [], ['questions']); + $list = $this->dao->getList($query, '*', $page, $limit, "$sortField $sortRule", [], ['questions']); $count = $this->dao->getCount($query); return compact('list', 'count'); } diff --git a/app/service/EnterprisePortraitCategoryService.php b/app/service/EnterprisePortraitCategoryService.php index 81cd847..f992466 100644 --- a/app/service/EnterprisePortraitCategoryService.php +++ b/app/service/EnterprisePortraitCategoryService.php @@ -6,6 +6,7 @@ use app\dao\EnterprisePortraitCategoryDao; use app\dao\EnterprisePortraitLibraryDao; use plugin\piadmin\app\base\BaseService; use plugin\piadmin\app\exception\ApiException; +use plugin\piadmin\app\utils\RequestUtils; use support\think\Db; class EnterprisePortraitCategoryService extends BaseService @@ -64,6 +65,8 @@ class EnterprisePortraitCategoryService extends BaseService */ public function listData(array $params): array { + [$page, $limit] = RequestUtils::getPageParameter(); + [$sortRule, $sortField] = RequestUtils::getSortParameter(); $query = [ 'delete_time' => 0 ]; @@ -76,7 +79,7 @@ class EnterprisePortraitCategoryService extends BaseService if (isNotBlank($params['end_time'])) { $query[] = ['create_time', '<=', strtotime($params['end_time'] . ' 23:59:59')]; } - $list = $this->dao->getList($query, '*', 0, 0, 'id DESC', [], ['files']); + $list = $this->dao->getList($query, '*', $page, $limit, "$sortField $sortRule", [], ['files']); $count = $this->dao->getCount($query); return compact('list', 'count'); } diff --git a/app/service/EnterprisePortraitLibraryService.php b/app/service/EnterprisePortraitLibraryService.php index fb0327c..8a3a626 100644 --- a/app/service/EnterprisePortraitLibraryService.php +++ b/app/service/EnterprisePortraitLibraryService.php @@ -6,6 +6,7 @@ use app\dao\EnterprisePortraitCategoryDao; use app\dao\EnterprisePortraitLibraryDao; use plugin\piadmin\app\base\BaseService; use plugin\piadmin\app\exception\ApiException; +use plugin\piadmin\app\utils\RequestUtils; use support\think\Db; class EnterprisePortraitLibraryService extends BaseService @@ -45,6 +46,8 @@ class EnterprisePortraitLibraryService extends BaseService */ public function listData(array $params): array { + [$page, $limit] = RequestUtils::getPageParameter(); + [$sortRule, $sortField] = RequestUtils::getSortParameter(); $query = [ 'delete_time' => 0 ]; @@ -64,7 +67,7 @@ class EnterprisePortraitLibraryService extends BaseService if (isNotBlank($params['end_time'])) { $query[] = ['create_time', '<=', strtotime($params['end_time'] . ' 23:59:59')]; } - $list = $this->dao->getList($query, '*', 0, 0, 'id desc', ['category']); + $list = $this->dao->getList($query, '*', $page, $limit, "$sortField $sortRule", ['category']); $count = $this->dao->getCount($query); return compact('list', 'count'); } diff --git a/app/service/KnowledgeLibraryService.php b/app/service/KnowledgeLibraryService.php index 7581039..f4bd200 100644 --- a/app/service/KnowledgeLibraryService.php +++ b/app/service/KnowledgeLibraryService.php @@ -5,6 +5,7 @@ namespace app\service; use app\dao\KnowledgeLibraryDao; use plugin\piadmin\app\base\BaseService; use plugin\piadmin\app\exception\ApiException; +use plugin\piadmin\app\utils\RequestUtils; use support\think\Db; class KnowledgeLibraryService extends BaseService @@ -42,6 +43,8 @@ class KnowledgeLibraryService extends BaseService */ public function listData(array $params): array { + [$page, $limit] = RequestUtils::getPageParameter(); + [$sortRule, $sortField] = RequestUtils::getSortParameter(); $query = [ 'delete_time' => 0 ]; @@ -54,7 +57,7 @@ class KnowledgeLibraryService extends BaseService if (isNotBlank($params['end_time'])) { $query[] = ['create_time', '<=', strtotime($params['end_time'] . ' 23:59:59')]; } - $list = $this->dao->getList($query); + $list = $this->dao->getList($query, '*', $page, $limit, "$sortField $sortRule"); $count = $this->dao->getCount($query); return compact('list', 'count'); }