refactor(zy): 重构查询接口并添加分页功能

- 重构了 Activity、Circle、Club、Game 和 Gym 控制器中的查询方法
- 添加了分页功能,支持指定页码和每页数量
- 优化了查询结果,返回包含总数的格式化数据
- 使用 alias 和 join 方法改进了查询效率
- 删除了 Base 控制器中的通用查询方法
This commit is contained in:
2025-05-11 17:58:45 +08:00
parent 1dc3d9c516
commit c2478c1aea
7 changed files with 75 additions and 48 deletions

View File

@@ -22,17 +22,17 @@ class Circle extends Base
$sub = CircleModel::alias('c')
->join([Likes::$tableName => 'l'], 'c.id = l.circle_id', 'LEFT')
->field("c.*,CONCAT('[',GROUP_CONCAT(JSON_OBJECT(
->field("c.*,JSON_ARRAYAGG(JSON_OBJECT(
'id', l.id,
'user_id', l.user_id,
'nickname', l.nickname,
'avatar', l.avatar,
'gender', l.gender
)), ']') AS likes")->group('c.id')->buildSql();
)) AS likes")->group('c.id')->buildSql();
$query = Comment::alias('m')
->join([$sub => 'c'], 'c.id = m.circle_id', 'RIGHT')
->field("c.*,
CONCAT('[',GROUP_CONCAT(JSON_OBJECT(
JSON_ARRAYAGG(JSON_OBJECT(
'id', m.id,
'pid', m.pid,
'puser_id', m.puser_id,
@@ -43,7 +43,7 @@ class Circle extends Base
'gender', m.gender,
'content', m.content,
'create_time', m.create_time
)), ']') AS comment")->group('c.id');
)) AS comment")->group('c.id');
if (isset($params['club_id'])) {
$query->where('c.club_id', $params['club_id']);
}
@@ -54,6 +54,11 @@ class Circle extends Base
$friend = Relation::where('user_id', $this->auth->id)->where('status', 'IN', explode(',', $params['friend']))->column('target_id');
$query->where('c.user_id', 'IN', $friend);
}
if (isset($params['page'])) {
$pageSize = intval($params['pageSize'] ?? 10);
$offeset = (intval($params['page']) - 1) * $pageSize;
$query->limit($offeset, $pageSize);
}
$res = $query->select();
foreach ($res as &$r) {
$r['likes'] = json_decode($r['likes'], true);
@@ -61,7 +66,7 @@ class Circle extends Base
$r['comment'] = buildTree(json_decode($r['comment'], true));
}
$this->success('Success', $res);
$this->success('Success', ['list' => $res, 'count' => $query->count()]);
}
public function view()