update 拆分模型层 方法层

kvnZero · kvnZero · commit 8564b24f16c6 · 2021-11-04T11:43:34.000+08:00
diff --git a/app/ApiJson/ApiJson.php b/app/ApiJson/ApiJson.php
@@ -15,7 +15,7 @@ public function __construct(protected RequestInterface $request, protected strin
 
     public function Query(): array
     {
-        $parse = new Parse($this->request->getBody()->getContents(), $this->method, $this->request->input('tag', ''));
+        $parse = new Parse(json_decode($this->request->getBody()->getContents(), true), $this->method, $this->request->input('tag', ''));
         return array_merge([
             'code' => ResponseCode::SUCCESS,
             'msg' => ResponseCode::getMessage(ResponseCode::SUCCESS)
diff --git a/app/ApiJson/Entity/ConditionEntity.php b/app/ApiJson/Entity/ConditionEntity.php
@@ -3,7 +3,7 @@
 namespace App\ApiJson\Entity;
 
 use App\ApiJson\Interface\QueryInterface;
-use App\ApiJson\Handle\AbstractMethodHandle;
+use App\ApiJson\Handle\AbstractHandle;
 use App\ApiJson\Handle\FunctionColumnHandle;
 use App\ApiJson\Handle\FunctionGroupHandle;
 use App\ApiJson\Handle\FunctionHavingHandle;
@@ -21,7 +21,7 @@ class ConditionEntity
 {
     /**
      * 匹配规则 根据从上自下优先先匹先出
-     * @var AbstractMethodHandle[]
+     * @var AbstractHandle[]
      */
     protected array $methodRules = [
         FunctionColumnHandle::class,
diff --git a/app/ApiJson/Entity/TableEntity.php b/app/ApiJson/Entity/TableEntity.php
@@ -2,8 +2,6 @@
 
 namespace App\ApiJson\Entity;
 
-use App\ApiJson\Interface\QueryInterface;
-
 class TableEntity
 {
     /** @var ConditionEntity $ConditionEntity */
@@ -12,71 +10,51 @@ class TableEntity
     /** @var string $realTableName 真实表名 */
     protected string $realTableName;
 
-    /** @var array $condition */
-    protected array $condition;
-
-    /** @var QueryInterface $query */
-    protected QueryInterface $query;
+    /** @var array $content 表名对应的数据 */
+    protected array $content;
 
     /**
      * @param string $tableName 表名
-     * @param array $jsonContent json数据
+     * @param array $jsonContent json源数据
      */
     public function __construct(protected string $tableName, protected array $jsonContent)
     {
-        $this->realTableName = $tableName;
-        $this->condition = $this->getConditionByContent();
-    }
-
-    public function getResult(): array
-    {
-        $this->buildQuery();
+        $sanitizeTableName = str_replace(['[]'], '', $this->tableName);
+        $this->realTableName = $sanitizeTableName;
+        $this->content = $this->getContentByTableName();
         $this->parseConditionEntity();
-        return $this->formatResult($this->query->all());
     }
 
-    public function getCount(): int
+    public function getTableName(): string
     {
-        $this->buildQuery();
-        $this->parseConditionEntity();
-        return $this->query->count();
+        return $this->tableName;
     }
 
-    public function insert()
+    public function getRealTableName(): string
     {
-
+        return $this->realTableName;
     }
 
-    public function update()
+    public function getContent(): array
     {
-
+        return $this->content;
     }
 
-    protected function formatResult(array $result): array
+    public function getConditionEntity(): ConditionEntity
     {
-        return $result;
+        return $this->conditionEntity;
     }
 
-    protected function buildQuery()
+    protected function getContentByTableName(): array
     {
-        $this->query = new (config(join('.', [
-            'dependencies', QueryInterface::class
-        ])))($this->realTableName);
+        $content = $this->jsonContent[$this->tableName];
+        if (isset($content[$this->realTableName])) $content = $content[$this->realTableName];
+        return $content;
     }
 
     protected function parseConditionEntity()
     {
-        $entity = new ConditionEntity($this->condition);
+        $entity = new ConditionEntity($this->content);
         $this->conditionEntity = $entity;
     }
-
-    protected function getConditionByContent(): array
-    {
-        $sanitizeTableName = str_replace(['[]'], '', $this->tableName);
-        if (isset($this->jsonContent[$sanitizeTableName])) {
-            $this->realTableName = $sanitizeTableName;
-            return $this->jsonContent[$sanitizeTableName];
-        }
-        return $this->jsonContent[$this->tableName];
-    }
 }
diff --git a/app/ApiJson/Handle/AbstractHandle.php b/app/ApiJson/Handle/AbstractHandle.php
@@ -4,7 +4,7 @@
 
 use App\ApiJson\Interface\QueryInterface;
 
-abstract class AbstractMethodHandle
+abstract class AbstractHandle
 {
     /** @var string 清洗后的查询key */
     protected string $sanitizeKey;
diff --git a/app/ApiJson/Handle/FunctionColumnHandle.php b/app/ApiJson/Handle/FunctionColumnHandle.php
@@ -2,7 +2,7 @@
 
 namespace App\ApiJson\Handle;
 
-class FunctionColumnHandle extends AbstractMethodHandle
+class FunctionColumnHandle extends AbstractHandle
 {
     protected function validateCondition(): bool
     {
diff --git a/app/ApiJson/Handle/FunctionGroupHandle.php b/app/ApiJson/Handle/FunctionGroupHandle.php
@@ -2,7 +2,7 @@
 
 namespace App\ApiJson\Handle;
 
-class FunctionGroupHandle extends AbstractMethodHandle
+class FunctionGroupHandle extends AbstractHandle
 {
     protected function validateCondition(): bool
     {
diff --git a/app/ApiJson/Handle/FunctionHavingHandle.php b/app/ApiJson/Handle/FunctionHavingHandle.php
@@ -2,7 +2,7 @@
 
 namespace App\ApiJson\Handle;
 
-class FunctionHavingHandle extends AbstractMethodHandle
+class FunctionHavingHandle extends AbstractHandle
 {
     protected function validateCondition(): bool
     {
diff --git a/app/ApiJson/Handle/FunctionOrderHandle.php b/app/ApiJson/Handle/FunctionOrderHandle.php
@@ -2,7 +2,7 @@
 
 namespace App\ApiJson\Handle;
 
-class FunctionOrderHandle extends AbstractMethodHandle
+class FunctionOrderHandle extends AbstractHandle
 {
     protected function validateCondition(): bool
     {
diff --git a/app/ApiJson/Handle/WhereBetweenHandle.php b/app/ApiJson/Handle/WhereBetweenHandle.php
@@ -2,7 +2,7 @@
 
 namespace App\ApiJson\Handle;
 
-class WhereBetweenHandle extends AbstractMethodHandle
+class WhereBetweenHandle extends AbstractHandle
 {
     protected function validateCondition(): bool
     {
diff --git a/app/ApiJson/Handle/WhereExistsHandle.php b/app/ApiJson/Handle/WhereExistsHandle.php
@@ -4,7 +4,7 @@
 
 use Hyperf\Database\Query\Builder;
 
-class WhereExistsHandle extends AbstractMethodHandle
+class WhereExistsHandle extends AbstractHandle
 {
     protected function validateCondition(): bool
     {
diff --git a/app/ApiJson/Handle/WhereHandle.php b/app/ApiJson/Handle/WhereHandle.php
@@ -2,7 +2,7 @@
 
 namespace App\ApiJson\Handle;
 
-class WhereHandle extends AbstractMethodHandle
+class WhereHandle extends AbstractHandle
 {
     protected function validateCondition(): bool
     {
diff --git a/app/ApiJson/Handle/WhereInHandle.php b/app/ApiJson/Handle/WhereInHandle.php
@@ -2,11 +2,11 @@
 
 namespace App\ApiJson\Handle;
 
-class WhereInHandle extends AbstractMethodHandle
+class WhereInHandle extends AbstractHandle
 {
     protected function validateCondition(): bool
     {
-        return str_ends_with($this->key, '{}') && is_array($this->validateCondition());
+        return str_ends_with($this->key, '{}') && is_array($this->value);
     }
 
     protected function buildModel()
diff --git a/app/ApiJson/Handle/WhereJsonContainsHandle.php b/app/ApiJson/Handle/WhereJsonContainsHandle.php
@@ -2,7 +2,7 @@
 
 namespace App\ApiJson\Handle;
 
-class WhereJsonContainsHandle extends AbstractMethodHandle
+class WhereJsonContainsHandle extends AbstractHandle
 {
     protected function validateCondition(): bool
     {
diff --git a/app/ApiJson/Handle/WhereLikeHandle.php b/app/ApiJson/Handle/WhereLikeHandle.php
@@ -2,7 +2,7 @@
 
 namespace App\ApiJson\Handle;
 
-class WhereLikeHandle extends AbstractMethodHandle
+class WhereLikeHandle extends AbstractHandle
 {
     protected function validateCondition(): bool
     {
diff --git a/app/ApiJson/Handle/WhereRawHandle.php b/app/ApiJson/Handle/WhereRawHandle.php
@@ -2,7 +2,7 @@
 
 namespace App\ApiJson\Handle;
 
-class WhereRawHandle extends AbstractMethodHandle
+class WhereRawHandle extends AbstractHandle
 {
     protected function validateCondition(): bool
     {
diff --git a/app/ApiJson/Handle/WhereRegexpHandle.php b/app/ApiJson/Handle/WhereRegexpHandle.php
@@ -2,7 +2,7 @@
 
 namespace App\ApiJson\Handle;
 
-class WhereRegexpHandle extends AbstractMethodHandle
+class WhereRegexpHandle extends AbstractHandle
 {
     protected function validateCondition(): bool
     {
diff --git a/app/ApiJson/Interface/QueryInterface.php b/app/ApiJson/Interface/QueryInterface.php
@@ -8,6 +8,10 @@ interface QueryInterface
 {
     public function __construct(string $tableName);
 
+    public function setPrimaryKey(string $primaryKey): void;
+
+    public function getPrimaryKey(): string;
+
     public function where(string $column, $operator = null, $value = null, string $boolean = 'and'): self;
 
     public function whereIn(string $column, array $values, string $boolean = 'and', $not = false): self;
@@ -32,6 +36,8 @@ public function insertGetId(array $values, $sequence = null): int;
 
     public function update(array $values): bool;
 
+    public function delete($id = null): bool;
+
     public function all();
 
     public function getDb();
diff --git a/app/ApiJson/Method/AbstractMethod.php b/app/ApiJson/Method/AbstractMethod.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\ApiJson\Method;
+
+use App\ApiJson\Entity\TableEntity;
+use App\ApiJson\Interface\QueryInterface;
+use App\Constants\ResponseCode;
+use Hyperf\Contract\ConfigInterface;
+use Hyperf\Utils\ApplicationContext;
+
+abstract class AbstractMethod
+{
+    /** @var QueryInterface $query */
+    protected QueryInterface $query;
+
+    public function __construct(protected TableEntity $tableEntity, protected string $method = 'GET')
+    {
+        $this->buildQuery();
+    }
+
+    public function handle(): ?array
+    {
+        if (!$this->validateCondition()) return null;
+        return $this->process();
+    }
+
+    protected function buildQuery()
+    {
+
+        $this->query = new (ApplicationContext::getContainer()->get(ConfigInterface::class)->get(QueryInterface::class))($this->tableEntity->getRealTableName());
+    }
+
+    protected function parseManyResponse(array $ids, bool $isQueryMany = false): array
+    {
+        $response = [
+            'code' => !empty($ids) ? ResponseCode::SUCCESS : ResponseCode::SERVER_ERROR,
+            'msg' => ResponseCode::getMessage(!empty($ids) ? ResponseCode::SUCCESS : ResponseCode::SERVER_ERROR),
+        ];
+        if ($isQueryMany) {
+            $response = array_merge($response, [
+                'id[]' => $ids,
+                'count' => count($ids)
+            ]);
+        } else {
+            $response['id'] = current($ids) ?: 0;
+        }
+        return $response;
+    }
+
+    protected function isQueryMany(): bool
+    {
+        return str_ends_with($this->tableEntity->getTableName(), '[]');
+    }
+
+    abstract protected function validateCondition(): bool;
+
+    abstract protected function process();
+}
diff --git a/app/ApiJson/Method/DeleteMethod.php b/app/ApiJson/Method/DeleteMethod.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\ApiJson\Method;
+
+use App\ApiJson\Interface\QueryInterface;
+use Hyperf\Utils\Arr;
+
+class DeleteMethod extends AbstractMethod
+{
+    protected function validateCondition(): bool
+    {
+        return $this->method == 'DELETE';
+    }
+
+    protected function process()
+    {
+        $ids = [];
+
+        $jsonData = $this->tableEntity->getContent();
+        $queryMany = $this->isQueryMany();
+        if (isset($jsonData['id'])) {
+            if (is_array($jsonData['id'])) {
+                $ids = $jsonData['id'];
+                $queryMany = true;
+            } else {
+                $ids = [$jsonData['id']];
+            }
+        } else if (isset($jsonData['id{}'])) {
+            $ids = $jsonData['id{}']; //得到本次需要删除的ID
+            $queryMany = true;
+        }
+        $deletedIds = [];
+        foreach ($ids as $id) {
+            $this->buildQuery();
+            $this->query->delete($id) && $deletedIds[] = $id; //这里主键应可配置
+        }
+        return $this->parseManyResponse($deletedIds, $queryMany);
+    }
+}
diff --git a/app/ApiJson/Method/GetMethod.php b/app/ApiJson/Method/GetMethod.php
diff --git a/app/ApiJson/Method/HeadMethod.php b/app/ApiJson/Method/HeadMethod.php
diff --git a/app/ApiJson/Method/PostMethod.php b/app/ApiJson/Method/PostMethod.php
diff --git a/app/ApiJson/Method/PutMethod.php b/app/ApiJson/Method/PutMethod.php
diff --git a/app/ApiJson/Model/MysqlQuery.php b/app/ApiJson/Model/MysqlQuery.php
diff --git a/app/ApiJson/Parse/Parse.php b/app/ApiJson/Parse/Parse.php
diff --git a/app/Listener/FetchModeListener.php b/app/Listener/FetchModeListener.php
diff --git a/config/config.php b/config/config.php

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function __construct(protected RequestInterface $request, protected strin`
`15`	`15`
`16`	`16`	`public function Query(): array`
`17`	`17`	`{`
`18`		`- $parse = new Parse($this->request->getBody()->getContents(), $this->method, $this->request->input('tag', ''));`
	`18`	`+ $parse = new Parse(json_decode($this->request->getBody()->getContents(), true), $this->method, $this->request->input('tag', ''));`
`19`	`19`	`return array_merge([`
`20`	`20`	`'code' => ResponseCode::SUCCESS,`
`21`	`21`	`'msg' => ResponseCode::getMessage(ResponseCode::SUCCESS)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use App\ApiJson\Interface\QueryInterface;`
`6`	`6`
`7`		`-abstract class AbstractMethodHandle`
	`7`	`+abstract class AbstractHandle`
`8`	`8`	`{`
`9`	`9`	`/** @var string 清洗后的查询key */`
`10`	`10`	`protected string $sanitizeKey;`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace App\ApiJson\Handle;`
`4`	`4`
`5`		`-class FunctionColumnHandle extends AbstractMethodHandle`
	`5`	`+class FunctionColumnHandle extends AbstractHandle`
`6`	`6`	`{`
`7`	`7`	`protected function validateCondition(): bool`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace App\ApiJson\Handle;`
`4`	`4`
`5`		`-class FunctionGroupHandle extends AbstractMethodHandle`
	`5`	`+class FunctionGroupHandle extends AbstractHandle`
`6`	`6`	`{`
`7`	`7`	`protected function validateCondition(): bool`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace App\ApiJson\Handle;`
`4`	`4`
`5`		`-class FunctionHavingHandle extends AbstractMethodHandle`
	`5`	`+class FunctionHavingHandle extends AbstractHandle`
`6`	`6`	`{`
`7`	`7`	`protected function validateCondition(): bool`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace App\ApiJson\Handle;`
`4`	`4`
`5`		`-class FunctionOrderHandle extends AbstractMethodHandle`
	`5`	`+class FunctionOrderHandle extends AbstractHandle`
`6`	`6`	`{`
`7`	`7`	`protected function validateCondition(): bool`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace App\ApiJson\Handle;`
`4`	`4`
`5`		`-class WhereBetweenHandle extends AbstractMethodHandle`
	`5`	`+class WhereBetweenHandle extends AbstractHandle`
`6`	`6`	`{`
`7`	`7`	`protected function validateCondition(): bool`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`use Hyperf\Database\Query\Builder;`
`6`	`6`
`7`		`-class WhereExistsHandle extends AbstractMethodHandle`
	`7`	`+class WhereExistsHandle extends AbstractHandle`
`8`	`8`	`{`
`9`	`9`	`protected function validateCondition(): bool`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace App\ApiJson\Handle;`
`4`	`4`
`5`		`-class WhereHandle extends AbstractMethodHandle`
	`5`	`+class WhereHandle extends AbstractHandle`
`6`	`6`	`{`
`7`	`7`	`protected function validateCondition(): bool`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`
`3`	`3`	`namespace App\ApiJson\Handle;`
`4`	`4`
`5`		`-class WhereInHandle extends AbstractMethodHandle`
	`5`	`+class WhereInHandle extends AbstractHandle`
`6`	`6`	`{`
`7`	`7`	`protected function validateCondition(): bool`
`8`	`8`	`{`
`9`		`- return str_ends_with($this->key, '{}') && is_array($this->validateCondition());`
	`9`	`+ return str_ends_with($this->key, '{}') && is_array($this->value);`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`protected function buildModel()`