Merge branch 'web_sannong_fr'

app/Controller/NewsController.php

@@ -473,8 +473,54 @@ class NewsController extends AbstractController
         $result['data']['cat_arr_id'] =  $result['data']['cat_arr_id']?json_decode($result['data']['cat_arr_id']):[];
         return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-
     /**
+     * 获取调查问卷列表
+     * @return array
+     */
+    public function getSurveyList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page'=>'required',
+                'pageSize'=>'required',
+            ],
+            [
+                'page.required' => '第几页不能为空',
+                'pageSize.required' => '每页显示条数不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->newsServiceClient->getSurveyList($requireData);
+        return $result['code']==200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 获取调查问卷详情
+     * @return array
+     */
+    public function getSurveyInfo()
+    {
+        $requireData = $this->request->all(); 
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'sur_id'=>'required'
+            ], 
+            [
+               'sur_id.required' => 'sur_id不能为空', 
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage); 
+        }
+        $result = $this->newsServiceClient->getSurveyInfo($requireData);
+        return $result['code']==200? Result::success($result['data']) : Result::error($result['message']);
+    }    /**
      * 检测导航池名称是否存在
      * @return array
      */

app/Controller/WebController.php

@@ -47,26 +47,10 @@ class WebController extends AbstractController
      */
     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")
         ];
-        var_dump("网站id：",Context::get("SiteId"));
+        // var_dump("网站id：",Context::get("SiteId"));
         $result = $this->websiteServiceClient->getWebsiteCategory($data);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
@@ -587,7 +571,7 @@ class WebController extends AbstractController
         }
         $data = $requireData;
         $data['website_id'] = Context::get("SiteId");
-        $result = $this->websiteServiceClient->selectWebsiteCategory($data);
+        $result = $this->newsServiceClient->selectWebsiteArticle($data);
         if ($result['code']!= ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]); 
         }else{
@@ -748,11 +732,6 @@ class WebController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if(is_array($requireData['choice_id'])){
-            // return Result::error('选项名称必须为数组');
-            // $$requireData['choice_id'] = json_encode($requireData['choice_id']); 
-            // return Result::success($requireData['choice_id']);
-        }
         $data = [
             'website_id' => Context::get("SiteId"),
             'sur_id' => $requireData['sur_id'],
@@ -766,4 +745,5 @@ class WebController extends AbstractController
             return Result::success($result['data']);
         }
     }
+    
 }

app/JsonRpc/NewsService.php

@@ -239,4 +239,29 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSurveyList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSurveyInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function selectWebsiteArticle(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/NewsServiceInterface.php

@@ -102,6 +102,21 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function addWebsiteSurveyVote(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSurveyList(array $data);
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getSurveyInfo(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function selectWebsiteArticle(array $data);
 
     /**
      * @param array $data

config/api/news.php

@@ -32,10 +32,16 @@ Router::addGroup(
         Router::post('/upArticleStatus', [NewsController::class, 'upArticleStatus']);
         //查看资讯
         Router::get('/getArticleInfo', [NewsController::class, 'getArticleInfo']);
+        // 前端-搜索资讯
+        Router::get('/selectWebsiteCategory', [NewsController::class, 'selectWebsiteArticle']);
         //获取导航池信息
         Router::get('/getCategoryInfo', [NewsController::class, 'getCategoryInfo']);
          //前端-获取资讯列表
          Router::get('/getWebsiteArticleList', [NewsController::class, 'getWebsiteArticleList']);
+         //后端-获取调查问卷列表
+         Router::post('/getSurveyList', [NewsController::class, 'getSurveyList']);
+         //后端-获取调查问卷详情
+         Router::post('/getSurveyInfo', [NewsController::class, 'getSurveyInfo']);
         //检测导航池名称是否存在
         Router::post('/checkCategoryName', [NewsController::class, 'checkCategoryName']);