update 支持一对一查询

kvnZero · kvnZero · commit 75b51adf4ba7 · 2021-11-06T17:26:07.000+08:00
diff --git a/app/ApiJson/Method/HeadMethod.php b/app/ApiJson/Method/HeadMethod.php
@@ -2,8 +2,6 @@
 
 namespace App\ApiJson\Method;
 
-use App\Constants\ResponseCode;
-
 class HeadMethod extends AbstractMethod
 {
     protected function validateCondition(): bool
@@ -16,8 +14,6 @@ protected function process()
         $conditionEntity = $this->tableEntity->getConditionEntity();
         $conditionEntity->setQueryCondition($this->query);
         return [
-            'code' => ResponseCode::SUCCESS,
-            'msg' => ResponseCode::getMessage(ResponseCode::SUCCESS),
             'count' => $this->query->count()
         ];
     }
diff --git a/app/ApiJson/Method/PostMethod.php b/app/ApiJson/Method/PostMethod.php
@@ -2,7 +2,6 @@
 
 namespace App\ApiJson\Method;
 
-use App\ApiJson\Interface\QueryInterface;
 use Hyperf\Utils\Arr;
 
 class PostMethod extends AbstractMethod
@@ -15,9 +14,13 @@ protected function validateCondition(): bool
     protected function process()
     {
         $insertData = $this->tableEntity->getContent();
-        if (!$this->isQueryMany() || Arr::isAssoc($insertData)) {
+        $queryMany  = $this->isQueryMany();
+        if (!$queryMany && Arr::isAssoc($insertData)) {
             $insertData = [$insertData];
         }
+        if (!$queryMany) {
+            $insertData = [$insertData[0]];
+        }
         $insertIds = [];
         foreach ($insertData as $insertItem) {
             $insertIds[] = $this->query->insertGetId($insertItem); //因为需要返回ID 直接insert($insertData)不能得到本次插入的ID 未找到相关可用方法替代
diff --git a/app/ApiJson/Parse/Parse.php b/app/ApiJson/Parse/Parse.php
@@ -39,6 +39,7 @@ public function handle(bool $isQueryMany = false): array
     {
         $result = [];
         foreach ($this->json as $tableName => $condition) { //可以优化成协程行为（如果没有依赖赋值的前提下）
+            $tableMany = false;
             if (in_array($tableName, $this->filterKey())) {
                 $this->tagColumn[$tableName] = $condition;
                 continue;
@@ -52,14 +53,21 @@ public function handle(bool $isQueryMany = false): array
                 $result[$tableName] = $parse->handle(true); //提供行为
                 continue; //跳出不往下执行
             }
+            if (str_ends_with($tableName, '[]')) {
+                $isQueryMany = true;
+                $tableMany = true;
+            }
+//            if (!preg_match("/^[A-Za-z]+$/", $tableName) || !is_array($condition)) {
+//                continue; //不满足表名规范 跳出不往下执行
+//            }
             $this->tableEntities[$tableName] = new TableEntity($tableName, $this->json, $this->getGlobalArgs(), $result);
             foreach ($this->supMethod as $methodClass) {
                 /** @var AbstractMethod $method */
                 $method = new $methodClass($this->tableEntities[$tableName], $this->method);
                 $method->setQueryMany($isQueryMany);
                 $response = $method->handle();
                 if (!is_null($response)) {
-                    if ($isQueryMany) {
+                    if ($isQueryMany && $tableMany == false) {
                         $result = $response;
                     } else {
                         $result[$tableName] = $response;
