Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/WebController.php

@@ -809,4 +809,39 @@ class WebController extends AbstractController
         $result = $this->websiteServiceClient->getWebsiteHead($data);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
+    /*
+     * 获取网站底部信息
+     *
+     * */
+    public function getWebsiteAllArticle()
+    {
+        $requireData = $this->request->all();
+        $requireData['website_id'] =  Context::get("SiteId");
+        $result = $this->newsServiceClient->getWebsiteAllArticle($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+    /*
+     * 乡村网-获取特殊新闻模块
+     *
+     * */
+    public function getWebsiteArticles()
+    {
+        $requireData = $this->request->all();
+        $requireData['website_id'] =  Context::get("SiteId");
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' =>'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+            ] 
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->newsServiceClient->getWebsiteArticles($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
 }

app/JsonRpc/NewsService.php

@@ -275,6 +275,22 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteAllArticle(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteArticles(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 
     //20250324  通知，公告，消息
     public function getNoticeList(array $data)

app/JsonRpc/NewsServiceInterface.php

@@ -122,6 +122,16 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function getWebsiteCatidArticle(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteAllArticle(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteArticles(array $data);
 
     /**
      * @param array $data

config/api/web.php

@@ -48,6 +48,10 @@ Router::addGroup(
                 Router::get('/getWebsiteFootAll', [WebController::class, 'getWebsiteFootAll']);
                 // 获取顶部信息
                 Router::get('/getWebsiteHead', [WebController::class, 'getWebsiteHead']);
+                // 获取网站全部模块新闻
+                Router::get('/getWebsiteAllArticle', [WebController::class, 'getWebsiteAllArticle']);
+                // 乡村网-获取特殊新闻
+                Router::get('/getWebsiteArticles', [WebController::class, 'getWebsiteArticles']);
             },
     ['middleware' => [WebMiddleware::class]]
 );