update 完善数组查询运算符 & 实现一对一关联

Author: kvnZero

app/ApiJson/Entity/ConditionEntity.php

@@ -16,9 +16,21 @@
 use App\ApiJson\Handle\WhereLikeHandle;
 use App\ApiJson\Handle\WhereRawHandle;
 use App\ApiJson\Handle\WhereRegexpHandle;
+use App\ApiJson\Method\AbstractMethod;
+use App\ApiJson\Replace\AbstractReplace;
+use App\ApiJson\Replace\QuoteReplace;
 
 class ConditionEntity
 {
+    /**
+     * 替换规则
+     * @var AbstractReplace[]
+     */
+    protected array $replaceRules = [
+        QuoteReplace::class,
+    ];
+
+
     /**
      * 匹配规则 根据从上自下优先先匹先出
      * @var AbstractHandle[]
@@ -41,17 +53,32 @@ class ConditionEntity
     /**
      * @param array $condition 条件
      */
-    public function __construct(protected array $condition)
+    public function __construct(protected array $condition, protected array $extendData = [])
     {
     }
 
+    protected function replaceHandle($key, $value): array
+    {
+        foreach ($this->replaceRules as $rule) {
+            /** @var AbstractReplace $replaceRule */
+            $replaceRule = new $rule($key, $value);
+            $response = $replaceRule->handle();
+            if (is_null($response)) break;
+            return $response;
+        }
+        return [$key, $value];
+    }
+
     /**
      * 整理语句
      */
     public function setQueryCondition(QueryInterface $query)
     {
         foreach ($this->condition as $key => $value) {
+            /** @var AbstractMethod $rule */
             foreach ($this->methodRules as $rule) {
+                [$key, $value] = $this->replaceHandle($key, $value); //解决引用问题
+
                 $methodRule = new $rule($query, $key, $value);
                 if ($methodRule->handle()) break;
             }

app/ApiJson/Entity/TableEntity.php

@@ -17,7 +17,7 @@ class TableEntity
      * @param string $tableName 表名
      * @param array $jsonContent json源数据
      */
-    public function __construct(protected string $tableName, protected array $jsonContent)
+    public function __construct(protected string $tableName, protected array $jsonContent, protected array $extendData = [])
     {
         $sanitizeTableName = str_replace(['[]'], '', $this->tableName);
         $this->realTableName = $sanitizeTableName;
@@ -54,7 +54,7 @@ protected function getContentByTableName(): array
 
     protected function parseConditionEntity()
     {
-        $entity = new ConditionEntity($this->content);
+        $entity = new ConditionEntity($this->content, $this->extendData);
         $this->conditionEntity = $entity;
     }
 }

app/ApiJson/Handle/FunctionLimitHandle.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\ApiJson\Handle;
+
+class FunctionLimitHandle extends AbstractHandle
+{
+    protected function validateCondition(): bool
+    {
+        return $this->key === '@limit';
+    }
+
+    protected function buildModel()
+    {
+        $this->query->limit((int)$this->value);
+    }
+}

app/ApiJson/Handle/FunctionOffsetHandle.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\ApiJson\Handle;
+
+class FunctionOffsetHandle extends AbstractHandle
+{
+    protected function validateCondition(): bool
+    {
+        return $this->key === '@offset';
+    }
+
+    protected function buildModel()
+    {
+        $this->query->offset((int)$this->value);
+    }
+}

app/ApiJson/Interface/QueryInterface.php

@@ -32,6 +32,8 @@ public function count($columns = '*'): int;
 
     public function limit(int $value): self;
 
+    public function offset(int $value): self;
+
     public function insertGetId(array $values, $sequence = null): int;
 
     public function update(array $values): bool;

app/ApiJson/Model/MysqlQuery.php

@@ -120,6 +120,12 @@ public function limit(int $value): self
         return $this;
     }
 
+    public function offset(int $value): self
+    {
+        $this->db->offset($value);
+        return $this;
+    }
+
     public function all(): array
     {
         return $this->db->get()->all();

app/ApiJson/Parse/Parse.php

@@ -37,18 +37,15 @@ public function handle(): array
             'code' => ResponseCode::SUCCESS,
             'msg' => ResponseCode::getMessage(ResponseCode::SUCCESS),
         ];
-        foreach ($this->json as $tableName => $condition) {
-            if (in_array($tableName, $this->filterKey())) {
-                $this->tagColumn[$tableName] = $condition; //特殊
-                break;
-            }
-            $this->tableEntities[$tableName] = new TableEntity($tableName, $this->json);
+        $this->jsonParse();
+        foreach ($this->json as $tableName => $condition) { //可以优化成协程行为（如果没有依赖赋值的前提下）
+            $this->tableEntities[$tableName] = new TableEntity($tableName, $this->json, $result);
             foreach ($this->supMethod as $methodClass) {
                 /** @var AbstractMethod $method */
                 $method = new $methodClass($this->tableEntities[$tableName], $this->method);
                 $response = $method->handle();
                 if (!is_null($response)) {
-                    $result[$tableName] = $response;
+                    $result[$condition['*'] ?? $tableName] = $response;
                     break;
                 }
             }
@@ -57,6 +54,32 @@ public function handle(): array
         return $result;
     }
 
+    /**
+     * 整理不同形式的json数据到统一格式再处理
+     */
+    protected function jsonParse()
+    {
+        foreach ($this->json as $tableName => $condition) { //可以优化成协程行为（如果没有依赖赋值的前提下）
+            if (in_array($tableName, $this->filterKey())) {
+                $this->tagColumn[$tableName] = $condition; //特殊
+                unset($this->json[$tableName]);
+                break;
+            }
+            if ($tableName == '[]') {
+                $count = (int)$condition['count'] ?? 10;
+                $page = (int)$condition['page'] ?? 1; //赋予默认值
+                $tableName = array_key_first($condition); //剩下的值为table
+                $condition = $condition[$tableName]; //替换条件
+                $condition = array_merge($condition, [
+                    '@limit' => $count, //查询长度
+                    '@offset' => $page * $count, //查询起始长度
+                    '*' => '[]' //赋予替换表明的标志
+                ]);
+                $this->json[$tableName . '[]'] = $condition;
+            }
+        }
+    }
+
     protected function filterKey(): array
     {
         return array_keys($this->tagColumn);

app/ApiJson/Replace/AbstractReplace.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\ApiJson\Replace;
+
+abstract class AbstractReplace
+{
+    public function __construct(protected string $key, protected $value, protected array $extendData)
+    {
+    }
+
+    public function handle(): ?array
+    {
+        if (!$this->validateCondition()) return null;
+        return $this->process();
+    }
+
+    abstract protected function validateCondition(): bool;
+
+    abstract protected function process();
+}

app/ApiJson/Replace/QuoteReplace.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\ApiJson\Replace;
+
+use App\ApiJson\Interface\QueryInterface;
+use Hyperf\Utils\Arr;
+
+class QuoteReplace extends AbstractReplace
+{
+    protected function validateCondition(): bool
+    {
+        return str_ends_with($this->key, '@');
+    }
+
+    protected function process()
+    {
+        $path = str_replace('/', '.', $this->value);
+        $this->value = data_get($this->extendData, $path);
+        $this->key = str_replace('@', '', $this->key);
+
+        return [$this->key, $this->value]; //必须
+    }
+}

config/routes.php

@@ -13,11 +13,11 @@
 
 Router::addRoute(['GET', 'POST', 'HEAD', 'PUT', 'DELETE'], '/', 'App\Controller\IndexController@index');
 
-Router::addRoute(['GET'], '/get/[{tag}]', 'App\Controller\IndexController@get');
-Router::addRoute(['POST'], '/head/[{tag}]', 'App\Controller\IndexController@head');
-Router::addRoute(['POST'], '/post/[{tag}]', 'App\Controller\IndexController@post');
-Router::addRoute(['POST', 'PUT'], '/put/[{tag}]', 'App\Controller\IndexController@put');
-Router::addRoute(['POST', 'DELETE'], '/delete/[{tag}]', 'App\Controller\IndexController@delete');
+Router::addRoute(['POST'], '/get[/{tag}]', 'App\Controller\IndexController@get');
+Router::addRoute(['POST'], '/head[/{tag}]', 'App\Controller\IndexController@head');
+Router::addRoute(['POST'], '/post[/{tag}]', 'App\Controller\IndexController@post');
+Router::addRoute(['POST'], '/put[/{tag}]', 'App\Controller\IndexController@put');
+Router::addRoute(['POST'], '/delete[/{tag}]', 'App\Controller\IndexController@delete');
 
 Router::get('/favicon.ico', function () {
     return '';