Browse Source

feat(service): 添加分页和排序参数支持

- 在多个服务类中引入 RequestUtils 工具类
- 为 listData 方法增加分页和排序功能
- 修改数据库查询方法以支持分页和自定义排序
- 统一处理分页参数和排序规则的获取逻辑
master
zhangf@suq.cn 6 days ago
parent
commit
f509aa3b57
  1. 5
      app/service/AiCommandService.php
  2. 5
      app/service/ArticleCategoryService.php
  3. 5
      app/service/CreationArticleService.php
  4. 5
      app/service/CreationTaskService.php
  5. 5
      app/service/DistillationQuestionsService.php
  6. 5
      app/service/DistillationWordService.php
  7. 5
      app/service/EnterprisePortraitCategoryService.php
  8. 5
      app/service/EnterprisePortraitLibraryService.php
  9. 5
      app/service/KnowledgeLibraryService.php

5
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');
}

5
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');
}

5
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');
}

5
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');
}

5
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');
}

5
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');
}

5
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');
}

5
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');
}

5
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');
}

Loading…
Cancel
Save