删除之前不用的获取通栏版式的接口；替换为组件版式和通栏版式通用的接口

app/Controller/PublicController.php

@@ -1752,37 +1752,6 @@ class PublicController extends AbstractController
         $result = $this->publicServiceClient->getWebsiteTemplate($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
-    /**
-     * 获取通栏位置模版
-     * @return array
-     * 
-    */
-    public function getSectorPlace()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'sector_num' => 'integer',
-                'type' => 'integer',
-                'sector_num' => 'required_without:type|integer',
-                'type' => 'required_without:sector_num|integer',
-            ],
-            [
-                'sector_num.integer' => '通栏数量必须为整数',
-                'type.integer' => '通栏类型必须为整数',
-                'sector_num.required_without' => '通栏数量或通栏类型必须存在一个',
-                'type.required_without' => '通栏数量或通栏类型必须存在一个',
-            ]
-        );
-         if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-         }
-        $requireData['user_id'] = Context::get("UserId");
-        $result = $this->publicServiceClient->getSectorPlace($requireData);
-        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
-    }
     /**
      * 通栏版式管理-通栏版式列表
      * @return array
@@ -2127,5 +2096,30 @@ class PublicController extends AbstractController
         $result = $this->publicServiceClient->getSectorPlaceSort($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 通栏版式管理-获取所有的通栏版式
+     * @return array
+     */
+    public function getAllSectorPlace()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'type_id' => 'required|integer',
+            ],
+            [
+                'type_id.required' => '版式类型不能为空',
+                'type_id.integer' => '版式类型必须为整数',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->getAllSectorPlace($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
 }
 

app/JsonRpc/PublicRpcService.php

@@ -407,13 +407,6 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    /**
-     * 自助建站-通栏管理-获取通栏位置
-     */
-    public function getSectorPlace(array $data): array
-    {
-        return $this->__request(__FUNCTION__, $data);
-    }
     /**
      * 自助建站-通栏版式管理-获取通栏版式列表
      */
@@ -456,4 +449,11 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * 通栏版式
+     */
+    public function getAllSectorPlace(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -212,8 +212,6 @@ interface PublicRpcServiceInterface
     public function getAllTemplate(array $data);
     // 通栏管理-获取所有尺寸
     public function getAllSize(array $data);
-    // 通栏管理-获取通栏位置
-    public function getSectorPlace(array $data);
 
 
     
@@ -229,4 +227,6 @@ interface PublicRpcServiceInterface
     public function getSectorPlaceInfo(array $data);
     // 通栏版式管理-通栏版式位置
     public function getSectorPlaceSort(array $data);
+    // 通栏版式管理-通栏版式组件
+    public function getAllSectorPlace(array $data);
 }

config/api/public.php

@@ -80,7 +80,6 @@ Router::addGroup(
         Router::post('/getSectorInfo', [PublicController::class, 'getSectorInfo']);
         Router::post('/getAllTemplate', [PublicController::class, 'getAllTemplate']);
         Router::post('/getAllSize', [PublicController::class, 'getAllSize']);
-        Router::post('/getSectorPlace', [PublicController::class, 'getSectorPlace']);
 
 
         
@@ -130,7 +129,8 @@ Router::addGroup(
         // 获取企业信息
         Router::get('/getCompanyInfo', [PublicController::class, 'getCompanyInfo']);
 
-
+        //获取所有的通栏版式
+        Router::post('/getAllSectorPlace', [PublicController::class, 'getAllSectorPlace']);
     },
     ['middleware' => [FooMiddleware::class]]
 );