接口参数支持table指定表字段解析

HGthecode · May 8, 2023 · c8056cd · c8056cd
1 parent 5bab05f
commit c8056cd
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/src/annotation/AddField.php b/src/annotation/AddField.php
@@ -58,6 +58,7 @@ class AddField extends ParamBase
      * @param string $desc 字段名称
      * @param bool $require 是否必须
      * @param string $ref 引用注解/模型
+     * @param string $table 引用数据表
      * @param string $md Md文本内容
      * @param string $field 指定Ref引入的字段
      * @param string $withoutField 排除Ref引入的字段
@@ -70,6 +71,7 @@ public function __construct(
         string $desc = '',
         bool $require = false,
         $ref = "",
+        $table = "",
         string $md = "",
         $field = "",
         $withoutField = "",

diff --git a/src/annotation/Param.php b/src/annotation/Param.php
@@ -25,6 +25,7 @@ class Param extends ParamBase
      * @param bool $require 是否必须
      * @param string|int|bool $default 默认值
      * @param string|array $ref 引用注解/模型
+     * @param string $table 引用数据表
      * @param string|array $field 指定Ref引入的字段
      * @param string|array $withoutField 排除Ref引入的字段
      * @param string $desc 字段名称
@@ -41,6 +42,7 @@ public function __construct(
         bool $require = false,
         $default = "",
         $ref = "",
+        $table = "",
         $field = "",
         $withoutField = "",
         string $desc = '',

diff --git a/src/annotation/Query.php b/src/annotation/Query.php
@@ -26,6 +26,7 @@ final class Query extends ParamBase
      * @param bool $require 是否必须
      * @param string|int|bool $default 默认值
      * @param string|array $ref 引用注解/模型
+     * @param string $table 引用数据表
      * @param string|array $field 指定Ref引入的字段
      * @param string|array $withoutField 排除Ref引入的字段
      * @param string $desc 字段名称
@@ -42,6 +43,7 @@ public function __construct(
         bool $require = false,
         $default = "",
         $ref = "",
+        $table = "",
         $field = "",
         $withoutField = "",
         string $desc = '',

diff --git a/src/annotation/Returned.php b/src/annotation/Returned.php
@@ -26,6 +26,7 @@ class Returned extends ParamBase
      * @param bool $require 是否必须
      * @param string|int|bool $default 默认值
      * @param string|array $ref 引用注解/模型
+     * @param string $table 引用数据表
      * @param string|array $field 指定Ref引入的字段
      * @param string|array $withoutField 排除Ref引入的字段
      * @param string $desc 字段名称
@@ -42,6 +43,7 @@ public function __construct(
         bool $require = false,
         $default = "",
         $ref = "",
+        $table = "",
         $field = "",
         $withoutField = "",
         string $desc = '',

diff --git a/src/parses/ParseApiDetail.php b/src/parses/ParseApiDetail.php
@@ -417,7 +417,10 @@ protected function handleAnnotationsParamItem($param,$field){
             }else{
                 return false;
             }
-        }else{
+        }else if(!empty($param['table'])){
+            $tableParams = (new ParseModel($this->config))->getTableDocument($param['table'],[]);
+            $data = $this->handleRefData($param,$tableParams,$field);
+        } else{
             $data = $param;
         }
         if (!empty($data['desc'])){

diff --git a/src/parses/ParseModel.php b/src/parses/ParseModel.php
@@ -29,7 +29,12 @@ public function parseModelTable($model,$classReflect,$methodName=""){
         try {
             // 获取所有模型属性
             $propertys = $classReflect->getDefaultProperties();
-            $table =$this->getTableDocument($model, $propertys);
+            $tableName = $model->getTable();
+            $configTablePrefix = !empty($config['database']) && !empty($config['database']['prefix'])?$config['database']['prefix']:"";
+            if (!empty($configTablePrefix) && strpos($tableName, $configTablePrefix) === false){
+                $tableName = $configTablePrefix.$model->getTable();
+            }
+            $table =$this->getTableDocument($tableName, $propertys);
             if (empty($methodName)){
                 return $table;
             }
@@ -101,22 +106,17 @@ public static function getModelClass($namespaceName)
 
     /**
      * 获取模型注解数据
-     * @param $model
+     * @param $tableName
      * @param $propertys
      * @return array
      */
-    protected function getTableDocument($model,array $propertys):array
+    public function getTableDocument($tableName,array $propertys):array
     {
         $config = $this->config;
         $fieldComment = [];
         if (empty($config['database_query_function'])){
             throw new ErrorException("not datatable_query_function config");
         }
-        $tableName = $model->getTable();
-        $configTablePrefix = !empty($config['database']) && !empty($config['database']['prefix'])?$config['database']['prefix']:"";
-        if (!empty($configTablePrefix) && strpos($tableName, $configTablePrefix) === false){
-            $tableName = $configTablePrefix.$model->getTable();
-        }
         $tableColumns = $config['database_query_function']("SHOW FULL COLUMNS FROM " . $tableName);
         foreach ($tableColumns as $columns) {
             $columns = Helper::objectToArray($columns);