Merge branch 'master' of http://116.131.8.26:3000/FengR/zxt_gateway

app/Controller/WebController.php

@@ -1436,6 +1436,7 @@ class WebController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
+     * 政讯-网民留言
      * @return array
      */
     public function getWebsiteMessage()
@@ -1463,6 +1464,7 @@ class WebController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
+     *  政讯-获取省市
      * @return array
      */
     public function getWebsiteProvinceCity()
@@ -1474,6 +1476,7 @@ class WebController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
+     * 政讯-调研选题
      * @return array
      */
     public function getWebsiteResearchTopic()
@@ -1501,6 +1504,7 @@ class WebController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
+
     public function getOnlineList()
     {
         $requireData = $this->request->all();
@@ -1549,4 +1553,70 @@ class WebController extends AbstractController
         $result = $this->webServiceClient->getLawList($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+
+
+    /**
+     * 政讯-申请加入
+     * @return array
+     */
+    public function getWebsiteApplyJoin()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'category_id' => 'required|integer',
+            ],
+            [
+                'category_id.required' => '栏目id不能为空',
+                'category_id.integer' => '栏目id必须为整数'
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['website_id'] =  Context::get("SiteId") ?? 0;
+        $result = $this->webServiceClient->getWebsiteApplyJoin($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 政讯-官网导航
+     * @return array
+     */
+    public function getWebsiteOfficialSite()
+    {
+        $requireData = $this->request->all();
+        $requireData['website_id'] =  Context::get("SiteId") ?? 0;
+        $result = $this->webServiceClient->getWebsiteOfficialSite($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 政讯-核心网站（政务网站、行业网站）
+     * @return array
+     */
+    public function getWebsiteTypeweb()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' => 'required|integer',
+                'page_size' => 'required|integer'
+            ],
+            [
+                'page.required' => '当前页不能为空',
+                'page.integer' => '当前页必须为整数',
+                'page_size.required' => '每页数量不能为空',
+                'page_size.integer' => '每页数量必须为整数',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['website_id'] =  Context::get("SiteId") ?? 0;
+        $result = $this->webServiceClient->getWebsiteTypeweb($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

app/JsonRpc/WebService.php

@@ -450,12 +450,36 @@ class WebService extends AbstractServiceClient implements WebServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+ 
 
     public function getLawList(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
     public function getOnlinelist(array $data)
+ 
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteApplyJoin(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteOfficialSite(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteTypeweb(array $data)
+ 
     {
         return $this->__request(__FUNCTION__, $data);
     }

app/JsonRpc/WebServiceInterface.php

@@ -280,6 +280,23 @@ interface WebServiceInterface
    * @return mixed
    */
   public function getWebsiteResearchTopic(array $data);
+
   public function getLawList(array $data);
   public function getOnlinelist(array $data);
+
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteApplyJoin(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteOfficialSite(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteTypeweb(array $data);
 }

config/api/web.php

@@ -106,6 +106,7 @@ Router::addGroup(
         //农网导航
         Router::get('/getWebsiteNwHomeList', [WebController::class, 'getWebsiteNwHomeList']);
 
+ 
         // c端  
         // 企业模块
         Router::get('/getWebsiteCompany', [WebController::class, 'getWebsiteCompany']);