Merge branch '20250522_diywebfr'

app/Controller/PublicController.php

@@ -2140,7 +2140,28 @@ class PublicController extends AbstractController
         $result = $this->publicServiceClient->getComponentType($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
-
+    /**
+     * 组件管理-获取所有通栏
+     * @return array
+     */
+    public function getAllSector()
+    {
+        $requireData = $this->request->all();
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->getAllSector($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 自助建站-流程管理-获取所有组件
+     * @return array
+     */
+    public function getAllComponent()
+    {
+        $requireData = $this->request->all();
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->getAllComponent($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
 
 }
 

app/JsonRpc/PublicRpcService.php

@@ -463,4 +463,19 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * 自助建站-流程管理-获取所有组件
+     */
+    public function getAllSector(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * 组件管理-获取所有组件
+     */
+    public function getAllComponent(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    
 }

app/JsonRpc/PublicRpcServiceInterface.php

@@ -231,4 +231,9 @@ interface PublicRpcServiceInterface
     public function getAllSectorPlace(array $data);
     //组件管理-获取组件类型
     public function getComponentType(array $data);
+    //组件管理-获取所有通栏
+    public function getAllSector(array $data);
+    //自助建站-流程管理-获取所有组件
+    public function getAllComponent(array $data);
+
 }

config/api/public.php

@@ -80,8 +80,8 @@ Router::addGroup(
         Router::post('/getSectorInfo', [PublicController::class, 'getSectorInfo']);
         Router::post('/getAllTemplate', [PublicController::class, 'getAllTemplate']);
         Router::post('/getAllSize', [PublicController::class, 'getAllSize']);
-
-
+        Router::post('/getAllSector', [PublicController::class, 'getAllSector']);
+        Router::post('/getAllComponent', [PublicController::class, 'getAllComponent']);
         
         //获取组件
         Router::post('/addComponent', [PublicController::class, 'addComponent']);