web

app/Controller/NewsController.php

@@ -213,7 +213,26 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-
+        $requireData['website_id'] = Context::get("SiteId");
+        var_dump("资讯：",$requireData);
+        $result = $this->newsServiceClient->getArticleList($requireData);
+        //1通过，2待审核，3待发 4,拒绝 5删除
+        $statusList = [
+            '1'=>'通过',
+            '2'=>'待审核',
+            '3'=>'待发',
+            '4'=>'拒绝',
+            '5'=>'删除',
+        ];
+        if($result['data']){
+            foreach ($result['data']['rows'] as $k=>$v) {
+                $result['data']['rows'][$k]['cat_arr_id'] = $v['cat_arr_id']?json_decode($v['cat_arr_id']):[0];
+                $result['data']['rows'][$k]['tag'] = $v['tag']?json_decode($v['tag']):[];
+                $result['data']['rows'][$k]['status_name'] = $statusList[$v['status']];
+                $result['data']['rows'][$k]['level'] = (string)$v['level'];
+                $result['data']['rows'][$k]['islink'] = isset($v['islink']) && $v['islink']>0?true:false;
+            }
+        }
         $result = $this->newsServiceClient->getArticleList($requireData);
 
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);

app/Controller/WebController.php

@@ -32,14 +32,36 @@ class WebController extends AbstractController
      */
     #[Inject]
     private $websiteServiceClient;
- 
+
+
+    private $PublicController;
+    public function __construct(PublicController $PublicController)
+    {
+        $this->PublicController = $PublicController;
+    }
+
     /**
      * 获取栏目导航
      * @return array
      */
     public function getWebsiteCategory()
     {
- 
+
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'pageSize' => 'required'
+            ],
+            [
+                'pageSize.required' => '显示条数不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+
         $data = [
             'website_id'=>Context::get("SiteId")
         ];

app/JsonRpc/NewsService.php

@@ -114,6 +114,8 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+
     /**
      * 更新资讯状态
      * @param array $data

app/JsonRpc/NewsServiceInterface.php

@@ -66,5 +66,10 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function upArticleStatus(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteModelArticles(array $data);
 
 }

app/JsonRpc/WebsiteService.php

@@ -398,4 +398,8 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+<<<<<<< HEAD
+=======
+
+>>>>>>> web_sannong_fr
 }