Feat/存储过程

README.md

@@ -32,18 +32,16 @@
 
 https://github.com/Tencent/APIJSON
 
-
 ### 开发进度
 
-1. ✅最基本CRUD 包括批量写入 批量更新 批量删除
+1. ✅最基本CRUD 包括批量写入 批量更新 批量删除 存储过程调用
 2. ✅支持@column @having @order @group @combine
 3. ✅支持运算符 {}, !{}, &{}, |{}, }{@, $, %, ~
 4. ✅支持多表查询、一对一查询、一对多查询、数组内多对多查询
 5. ✅支持数组内count/page
 6. ✅支持debug标签可返回语句执行
 
-待完成：<b>复杂查询</b>, 存储过程调用，远程函数，权限，标签
-
+待完成：<b>复杂查询</b>，Join查询，远程函数，权限，标签
 
 ### 如何使用 
 
@@ -52,7 +50,7 @@ APIJSON通用文档（增删改查说明）：https://github.com/Tencent/APIJSON
 
 拉取该项目, 配置mysql数据库, 配置文件路径：`config\autoload\databases.php`
 
-然后在项目目录执行：(需机器有：docker)
+然后在项目目录执行：(需宿主机有：docker)
 
 ```shell
 # 打包镜像
@@ -61,7 +59,7 @@ docker build -t hyperf-apijson:v1 .
 docker run -dit --name hyperf-apijson -p 9501:9501 hyperf-apijson:v1
 ```
 
-如果需要进行开发调试，使用Hyperf的Docker环境
+如果需要进行开发调试，使用Hyperf的Docker镜像 - <b>本项目可作为你的给Hyperf基础项目，可在该项目基础上进行业务开发，几乎没有互相冲突</b>
 
 ```shell
 docker run -dit --name hyperf-apijson -v {项目目录}:/opt/www -p 9501:9501 hyperf/hyperf:8.0-alpine-v3.12-swoole
@@ -70,6 +68,8 @@ docker run -dit --name hyperf-apijson -v {项目目录}:/opt/www -p 9501:9501 hy
 进入到docker环境执行 （如果composer下载不动 可以修改到阿里镜像源 Mac下建议本地开发）：
 ```shell
 cd /opt/www
+
 composer update
+
 php bin/hyperf.php start
 ```

app/ApiJson/Entity/ConditionEntity.php

@@ -17,6 +17,7 @@ class ConditionEntity
     protected array $group = [];
     protected array $order = [];
     protected array $having = [];
+    protected string $procedure = "";
 
     /**
      * @param array $condition 条件
@@ -155,6 +156,22 @@ public function getOrder(): array
         return $this->order;
     }
 
+    /**
+     * @param string $procedure
+     */
+    public function setProcedure(string $procedure): void
+    {
+        $this->procedure = $procedure;
+    }
+
+    /**
+     * @return string
+     */
+    public function getProcedure(): string
+    {
+        return $this->procedure;
+    }
+
     protected function log(array $condition)
     {
         $this->changeLog[] = [

app/ApiJson/Handle/FunctionProcedureHandle.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\ApiJson\Handle;
+
+class FunctionProcedureHandle extends AbstractHandle
+{
+    protected string $keyWord = '@procedure()';
+
+    public function buildModel()
+    {
+        if (!in_array($this->keyWord, array_keys($this->condition->getCondition()))) {
+            return;
+        }
+
+        foreach (array_filter($this->condition->getCondition(), function($key){
+            return $key == $this->keyWord;
+        }, ARRAY_FILTER_USE_KEY) as $key => $value)
+        {
+            $this->condition->setProcedure($value);
+            $this->unsetKey[] = $this->keyWord;
+        }
+    }
+}

app/ApiJson/Method/GetMethod.php

@@ -18,25 +18,32 @@ protected function validateCondition(): bool
 
     protected function process()
     {
-        $handle = new Handle($this->tableEntity->getConditionEntity(), $this->tableEntity);
-        $handle->build();
-
         $queryMany = $this->isQueryMany();
         if (!$queryMany) {
             $this->tableEntity->getConditionEntity()->setLimit(1);
         }
 
+        $handle = new Handle($this->tableEntity->getConditionEntity(), $this->tableEntity);
+        $handle->build();
+
         //该事件鼓励是做语句缓存或者事件触发 不赞成修改语句做法 修改语句应在更上层的QueryHandle事件
         $event = new QueryExecuteBefore($this->query->toSql(), $this->method);
         ApplicationContext::getContainer()->get(EventDispatcherInterface::class)->dispatch($event);
 
         if(is_null($event->result)) {
             $result = $this->query->all();
 
-            $queryEvent = new QueryResult($result);
+            $queryEvent = new QueryResult($result, $this->query->toSql());
             ApplicationContext::getContainer()->get(EventDispatcherInterface::class)->dispatch($queryEvent);
 
             $result = $queryEvent->result;
+
+            if (!empty($this->tableEntity->getConditionEntity()->getProcedure())) {
+                foreach ($result as $i => $item) {
+                    $result[$i]['procedure'] = $this->query->callProcedure($item);
+                }
+            }
+
         } else {
             $result = $event->result;
         }

app/ApiJson/Model/MysqlQuery.php

@@ -87,6 +87,50 @@ public function getBindings(): array
         return $this->db->getBindings();
     }
 
+    public function callProcedure(array $dataItem, bool $query = true): array
+    {
+        if (empty($this->conditionEntity->getProcedure())) {
+            return [];
+        }
+        $count = -1;
+        $list = []; //默认值
+
+        $procedure = $this->conditionEntity->getProcedure();
+        $rule = '/(?<functionName>.+)\((?<args>.+?)\)/';
+        preg_match($rule, $procedure, $match);
+        if (empty($match['functionName'])) {
+            return [];
+        }
+        $args = array_map('trim', explode(',', $match['args']));
+
+        $callArgs = [];
+        foreach ($args as $arg) {
+            if (in_array($arg, array_keys($dataItem))) {
+                $callArgs[] = $dataItem[$arg];
+            } else if ($arg == '@limit') {
+                $callArgs[] = $this->conditionEntity->getLimit();
+            } else if ($arg == '@offset') {
+                $callArgs[] = $this->conditionEntity->getOffset();
+            } else {
+                $callArgs[] = $arg;
+            }
+        }
+
+        $sql = sprintf("CALL %s(%s)", $match['functionName'], join(',', $callArgs));
+
+        if ($query) {
+            $list = Db::select($sql);
+        } else {
+            $count = Db::affectingStatement($sql);
+        }
+
+        return [
+            'count' => $count,
+            'update' => !$query,
+            'list' => $list,
+        ];
+    }
+
     protected function buildQuery(bool $query = true)
     {
         if ($this->build) return;

app/ApiJson/Parse/Handle.php

@@ -20,6 +20,7 @@
 use App\ApiJson\Handle\FunctionLimitHandle;
 use App\ApiJson\Handle\FunctionOffsetHandle;
 use App\ApiJson\Handle\FunctionOrderHandle;
+use App\ApiJson\Handle\FunctionProcedureHandle;
 use App\ApiJson\Handle\WhereBetweenHandle;
 use App\ApiJson\Handle\WhereExistsHandle;
 use App\ApiJson\Handle\WhereHandle;
@@ -54,6 +55,7 @@ class Handle
      * @var AbstractHandle[]
      */
     protected array $methodRules = [
+        FunctionProcedureHandle::class,
         FunctionColumnHandle::class,
         FunctionHavingHandle::class,
         FunctionOffsetHandle::class,

app/ApiJson/Parse/Parse.php

@@ -15,7 +15,8 @@ class Parse
 {
     protected array $tagColumn = [
         'tag' => null,
-        'debug' => false
+        'debug' => false,
+        'other' => []
     ];
 
     protected array $globalKey = [

app/Event/ApiJson/QueryResult.php

@@ -9,7 +9,7 @@
  */
 class QueryResult
 {
-    public function __construct(public array $result)
+    public function __construct(public array $result, public string $sql)
     {
     }
 }

app/Event/StatementComplete.php

@@ -19,6 +19,13 @@ class StatementComplete
      */
     public $connection;
 
+    /**
+     * The query result
+     *
+     * @var array|false
+     */
+    public $result;
+
     /**
      * The PDO statement.
      *
@@ -30,11 +37,13 @@ class StatementComplete
      * Create a new event instance.
      *
      * @param \Hyperf\Database\Connection $connection
+     * @param array|false $result
      * @param \PDOStatement $statement
      */
-    public function __construct($connection, $statement)
+    public function __construct($connection, $result, $statement)
     {
         $this->statement = $statement;
+        $this->result = $result;
         $this->connection = $connection;
     }
 }

app/Listener/QueryResultTryToJsonListener.php

@@ -3,11 +3,9 @@
 
 namespace App\Listener;
 
-use App\Constants\ConfigCode;
-use App\Event\ApiJson\QueryResult;
+use App\Event\StatementComplete;
 use Hyperf\Event\Annotation\Listener;
 use Hyperf\Event\Contract\ListenerInterface;
-use Hyperf\Utils\Context;
 
 /**
  * @Listener
@@ -17,18 +15,15 @@ class QueryResultTryToJsonListener implements ListenerInterface
     public function listen(): array
     {
         return [
-            QueryResult::class,
+            StatementComplete::class,
         ];
     }
 
     public function process(object $event)
     {
-        if (!$event instanceof QueryResult) return;
-
-        $statement = Context::get(ConfigCode::DB_QUERY_STATEMENT);
-        if (empty($statement)) {
-            return;
-        }
+        if (!$event instanceof StatementComplete) return;
+        if (empty($event->result)) return;
+        $statement = $event->statement;
 
         $columnCount = count(array_keys(current($event->result)));
         $columnMeta = [];

class_map/Hyperf/Database/Connection.php

@@ -286,11 +286,9 @@ public function select(string $query, array $bindings = [], bool $useReadPdo = t
 
             $statement->execute();
 
-            $response = $statement->fetchAll();
+            $result = $statement->fetchAll();
 
-            $this->complete($statement);
-
-            return $response;
+            return $this->complete($result, $statement);
         });
     }
 
@@ -318,9 +316,9 @@ public function cursor(string $query, array $bindings = [], bool $useReadPdo = t
             // Next, we'll execute the query against the database and return the statement
             // so we can return the cursor. The cursor will use a PHP generator to give
             // back one row at a time without using a bunch of memory to render them.
-            $statement->execute();
+            $result = $statement->execute();
 
-            $this->complete($statement);
+            $this->complete($result, $statement);
 
             return $statement;
         });
@@ -990,12 +988,15 @@ protected function prepared(PDOStatement $statement)
         return $statement;
     }
 
-    protected function complete(PDOStatement $statement)
+    protected function complete($result, PDOStatement $statement)
     {
-        $this->event(new StatementComplete(
+        $event = new StatementComplete(
             $this,
+            $result,
             $statement
-        ));
+        );
+        $this->event($event);
+        return $event->result;
     }
 
     /**