feat(admin): 添加零号线用户列表功能

- 新增 ZeroUserListValidate 验证器用于列表请求参数验证
- 创建 ZeroUserListRequestEntity 请求实体和 ZeroUserListResponseEntity 响应实体
- 在 NewUser 控制器中添加 getZeroUserList 方法处理列表请求
- 更新 ZeroUserRepository 以支持列表查询
- 优化了验证和响应处理逻辑，提高了代码复用性和可维护性

app/common/dao/user/ZeroUserLineDao.php

@@ -14,4 +14,17 @@ class ZeroUserLineDao extends BaseDao
     {
         return ZeroUserLine::class;
     }
+
+    /**
+     * @param $where
+     * @param $page
+     * @param $limit
+     * @return mixed
+     * 获取列表
+     */
+    public function getList($where, $page, $limit)
+    {
+        $model = $this->getModel();
+        return $model::getDB()->where($where)->order('id','desc')->paginate(['page' => $page, 'list_rows' => $limit]);
+    }
 }

app/common/repositories/user/ZeroUserRepository.php

@@ -70,4 +70,45 @@ class ZeroUserRepository extends BaseRepository
             return false;
         }
     }
+
+    /**
+     * @param $param
+     * @return array
+     * 获取列表
+     */
+    public function getList($param)
+    {
+        $where = $this->getWhere($param);
+        $list = $this->dao->getList($where,$param->page,$param->limit);
+        return $list->toArray();
+    }
+
+    /**
+     * @param $param
+     * @return array
+     * 拼接搜索条件
+     */
+    private function getWhere($param): array
+    {
+        $where = [];
+        
+        // 状态条件 - 精确搜索
+        if (!is_null($param->status)) {
+            $where[] = ['status', '=', $param->status];
+        }
+        
+        // 团队昵称条件 - 模糊搜索
+        if (!is_null($param->teamName)) {
+            $where[] = ['team_name', 'like', '%' . $param->teamName . '%'];
+        }
+        
+        // 团队长uid条件 - 精确搜索
+        if (!is_null($param->account)) {
+            $userDao = new UserDao();
+            $userWhere[] = ['account','like','%' . $param->account . '%'];
+            $userData = $userDao->getWhere($userWhere,'uid');
+            $where[] = ['team_uid', '=', $userData->uid ?? 0];
+        }
+        return $where;
+    }
 }

app/controller/admin/BaseController.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace app\controller\admin;
+
+use app\utils\EnumUtil;
+use think\Request;
+use think\response\Json;
+
+class BaseController
+{
+    /**
+     * 请求实例
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * 构造函数
+     */
+    public function __construct()
+    {
+        $this->request = app('request');
+    }
+
+    /**
+     * 验证请求数据
+     *
+     * @param  mixed  $validate  验证器实例
+     * @param  string  $entityClass  实体类名
+     * @return Json|mixed 验证失败返回Json响应，成功返回实体对象
+     */
+    protected function validateRequest($validate, string $entityClass)
+    {
+        $validationResult = $validate->validate($this->request->param(), $entityClass);
+        if ($validationResult['status'] === 'error') {
+            return app('json')->fail($validationResult['message']);
+        }
+
+        return $validationResult['data'];
+    }
+
+    /**
+     * 验证枚举数据
+     *
+     * @param  array  $requestData
+     * @return Json|bool 验证失败返回Json响应，成功返回true
+     */
+    protected function validateEnumData(array $requestData)
+    {
+        $validationResult = EnumUtil::autoValidate(\app\common\enum\user\ZeroUserEnum::class, $requestData);
+        if (!$validationResult['valid']) {
+            return app('json')->fail(implode('; ', $validationResult['errors']));
+        }
+
+        return true;
+    }
+}

app/controller/admin/user/NewUser.php

@@ -3,17 +3,20 @@
 namespace app\controller\admin\user;
 
 use app\common\repositories\user\ZeroUserRepository;
+use app\controller\admin\BaseController;
+use app\entity\admin\request\user\ZeroUserListRequestEntity;
 use app\entity\admin\request\user\ZeroUserRequestEntity;
 use app\entity\admin\response\user\ZeroUserLineResponseEntity;
+use app\entity\admin\response\user\ZeroUserListResponseEntity;
 use app\validate\admin\user\AddZeroUserValidate;
-use app\utils\EnumUtil;
+use app\validate\admin\user\ZeroUserListValidate;
 use think\response\Json;
 
 /**
  * 零号线用户控制器
  * 负责零号线用户的添加和更新操作
  */
-class NewUser
+class NewUser extends BaseController
 {
     /**
      * 用户仓库实例
@@ -28,6 +31,7 @@ class NewUser
      */
     public function __construct(ZeroUserRepository $repository)
     {
+        parent::__construct();
         $this->repository = $repository;
     }
 
@@ -39,29 +43,22 @@ class NewUser
      */
     public function addZeroUser(AddZeroUserValidate $validate): Json
     {
-        // 执行验证
-        $validationResult = $validate->validate();
-        // 验证失败，返回错误信息
-        if ($validationResult['status'] === 'error') {
-            return app('json')->fail($validationResult['message']);
+        // 执行验证并获取实体
+        $validationResult = $this->validateRequest($validate, ZeroUserRequestEntity::class);
+        if ($validationResult instanceof Json) {
+            return $validationResult;
         }
 
-        /** @var ZeroUserRequestEntity $entity 请求实体 */
-        $entity = $validationResult['data'];
-
-        // 自动验证枚举参数
-        $requestData = $entity->toUnderlineArray();
-        
-        // 使用智能枚举验证器自动验证，直接传递枚举类名
-        $validationResult = EnumUtil::autoValidate(\app\common\enum\user\ZeroUserEnum::class, $requestData);
-        if (!$validationResult['valid']) {
-            return app('json')->fail(implode('; ', $validationResult['errors']));
+        // 验证枚举数据
+        $enumValidationResult = $this->validateEnumData($validationResult->toUnderlineArray());
+        if ($enumValidationResult instanceof Json) {
+            return $enumValidationResult;
         }
         try {
             // 执行插入或更新操作
             $result = $this->repository->insertOrUpdate(
-                $entity->getId(),
-                $requestData
+                $validationResult->getId(),
+                $validationResult->toUnderlineArray()
             );
             // 根据操作结果返回相应的响应
             if ($result) {
@@ -73,20 +70,44 @@ class NewUser
             }
         } catch (\Exception $e) {
             // 记录详细异常日志
-            $errorMessage = '零号线用户操作异常: ' . $e->getMessage() .
-                           ' File: ' . $e->getFile() .
-                           ' Line: ' . $e->getLine();
+            $errorMessage = '零号线用户操作异常: '.$e->getMessage().
+                ' File: '.$e->getFile().
+                ' Line: '.$e->getLine();
             \think\facade\Log::error($errorMessage);
 
             // 根据环境返回不同的错误信息
             $isDev = app()->isDebug();
             if ($isDev) {
                 // 开发环境返回详细错误信息
-                return app('json')->fail('操作失败: ' . $e->getMessage());
+                return app('json')->fail('操作失败: '.$e->getMessage());
             } else {
                 // 生产环境返回友好提示
                 return app('json')->fail('系统繁忙，请稍后重试');
             }
         }
     }
+
+    /**
+     * 0号线用户列表
+     * @param  ZeroUserListValidate  $validate
+     * @return Json
+     */
+    public function getZeroUserList(ZeroUserListValidate $validate): Json
+    {
+        // 执行验证并获取实体
+        $validationResult = $this->validateRequest($validate, ZeroUserListRequestEntity::class);
+        if ($validationResult instanceof Json) {
+            return $validationResult;
+        }
+
+        // 验证枚举数据
+        $enumValidationResult = $this->validateEnumData($validationResult->toUnderlineArray());
+        if ($enumValidationResult instanceof Json) {
+            return $enumValidationResult;
+        }
+
+        // 获取列表
+        $list = $this->repository->getList($validationResult);
+        return ZeroUserListResponseEntity::response($list);
+    }
 }

app/entity/admin/request/user/ZeroUserListRequestEntity.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace app\entity\admin\request\user;
+
+use app\entity\request\RequestCommonEntity;
+
+/**
+ * 0号线用户列表请求参数
+ */
+class ZeroUserListRequestEntity extends RequestCommonEntity
+{
+
+    // 状态
+    public $status;
+
+    // 团队昵称
+    public $teamName;
+
+    // 团队长uid
+    public $account;
+
+    // 分页
+    public $page = 1;
+
+    // 每页数量
+    public $limit = 20;
+
+    // 获取状态
+    public function getStatus()
+    {
+        return $this->status;
+    }
+
+    // 设置状态
+    public function setStatus($status)
+    {
+        $this->status = $status;
+        return $this;
+    }
+
+    // 获取团队昵称
+    public function getTeamName(): string
+    {
+        return $this->teamName ?? '';
+    }
+
+    // 设置团队昵称
+    public function setTeamName($teamName): ZeroUserListRequestEntity
+    {
+        $this->teamName = $teamName;
+        return $this;
+    }
+
+    // 获取团队长uid
+    public function getAccountUid()
+    {
+        return $this->account;
+    }
+
+    // 设置团队长uid
+    public function setAccount($account): ZeroUserListRequestEntity
+    {
+        $this->account = $account;
+        return $this;
+    }
+
+    public function getPage()
+    {
+        return $this->page;
+    }
+
+    public function setPage($page): ZeroUserListRequestEntity
+    {
+        $this->page = $page;
+        return $this;
+    }
+
+    public function getLimit()
+    {
+        return $this->limit;
+    }
+
+    public function setLimit($limit): ZeroUserListRequestEntity
+    {
+        $this->limit = $limit;
+        return $this;
+    }
+}

app/entity/admin/response/AdminCommonResponseEntity.php

@@ -147,6 +147,33 @@ class AdminCommonResponseEntity extends CommonEntity
     }
 
     /**
+     * 创建分页数据响应
+     * @param  array  $list  数据列表
+     * @param  int  $total  总记录数
+     * @param  int  $page  当前页码
+     * @param  int  $limit  每页数量
+     * @param  string  $message  成功消息
+     * @param  int  $code  状态码
+     * @return AdminCommonResponseEntity
+     */
+    public static function paginate(array $list, int $total, int $page, int $limit, string $message = '获取成功', int $code = 200): AdminCommonResponseEntity
+    {
+        $paginationData = [
+            'list' => $list,
+            'total' => $total,
+            'page' => $page,
+            'limit' => $limit,
+            'total_page' => ceil($total / $limit)
+        ];
+
+        return (new self())
+            ->setCode($code)
+            ->setMessage($message)
+            ->setData($paginationData)
+            ->setTimestamp(time());
+    }
+
+    /**
      * 转换为数组格式
      * @return array
      */

app/entity/admin/response/user/ZeroUserListResponseEntity.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace app\entity\admin\response\user;
+
+use app\entity\admin\response\AdminCommonResponseEntity;
+use think\response\Json;
+
+/**
+ * 零号线用户响应实体
+ * 继承自 AdminCommonResponseEntity，用于零号线用户相关操作的响应
+ * 此接口只需要返回成功或失败状态
+ */
+class ZeroUserListResponseEntity extends AdminCommonResponseEntity
+{
+    /**
+     * 创建零号线用户操作成功响应
+     * @param  null  $data
+     * @param  string  $message
+     * @param  int  $code
+     * @return AdminCommonResponseEntity
+     */
+    public static function success(string $message = '获取列表成功', int $code = 200, $data = null): AdminCommonResponseEntity {
+        return parent::success($message);
+    }
+
+    /**
+     * 创建零号线用户操作失败响应
+     * @param  string  $message
+     * @param  int  $code
+     * @param  null  $data
+     * @return AdminCommonResponseEntity
+     */
+    public static function error(string $message = '获取列表失败', int $code = 400, $data = null): AdminCommonResponseEntity {
+        return parent::error($message, $code);
+    }
+
+    /**
+     * @param  bool  $isPage
+     * @param $data
+     */
+    public static function response(array $data, bool $isPage=true) : Json
+    {
+        // if (empty($data['data'])) {
+        //     return app('json')->fail(self::error()->toResponseArray());
+        // }
+
+        // 返回列表实体
+        $list = parent::paginate($data['data'],$data['total'],$data['current_page'],$data['per_page']);
+        return app('json')->success($list->toResponseArray());
+    }
+
+}

app/validate/CommonValidate.php

@@ -21,4 +21,31 @@ class CommonValidate extends Validate
         json_decode($value);
         return (json_last_error() == JSON_ERROR_NONE);
     }
+    /**
+     * 通用验证方法
+     * 使用父类验证规则进行数据验证
+     *
+     * @param array $data 要验证的数据
+     * @param string|null $entityClass 数据实体类名，如果不传则返回原始数据
+     * @return array
+     */
+    public function validate(array $data, ?string $entityClass = null): array
+    {
+        if (!$this->check($data)) {
+            return [
+                'status' => 'error',
+                'message' => $this->getError()
+            ];
+        }
+        
+        $resultData = $data;
+        if ($entityClass && class_exists($entityClass)) {
+            $resultData = $entityClass::newInstance($data);
+        }
+        
+        return [
+            'status' => 'success',
+            'data' => $resultData
+        ];
+    }
 }

app/validate/admin/user/AddZeroUserValidate.php

@@ -33,25 +33,4 @@ class AddZeroUserValidate extends CommonValidate
         'team_uid.integer' => '请输入团队长uid',
         'is_remove.require' => '请选择是否移除团队',
     ];
-
-    /**
-     * 验证添加零用户请求
-     * 使用父类通用验证方法进行数据验证
-     *
-     * @return array
-     */
-    public function validate(): array
-    {
-        $data = $this->request->param();
-        if (!$this->check($data)) {
-            return [
-                'status' => 'error',
-                'message' => $this->getError()
-            ];
-        }
-        return [
-            'status' => 'success',
-            'data' => ZeroUserRequestEntity::newInstance($data)
-        ];
-    }
 }

app/validate/admin/user/ZeroUserListValidate.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace app\validate\admin\user;
+
+use app\entity\admin\request\user\ZeroUserRequestEntity;
+use app\validate\CommonValidate;
+
+class ZeroUserListValidate extends CommonValidate
+{
+    protected $failException = true;
+
+    protected $rule = [
+        'status|状态' => 'integer',
+        'team_name|团队昵称' => 'max:20',
+        'account|账号' => 'max:20',
+        'page|页码' => 'integer|min:1',
+        'limit|每页数量' => 'integer|min:1|max:100',
+    ];
+
+    protected $message = [
+        'status.integer' => '非法状态',
+        'team_uid.integer' => '非法团队长uid',
+    ];
+}