Merge branch 'web_sannong_fr'

.env

@@ -17,15 +17,26 @@ DB_PREFIX=
 #REDIS_DB=0
 
 
-REDIS_HOST=192.168.1.201
+# REDIS_HOST=192.168.1.201
+# REDIS_AUTH=
+# REDIS_PORT=6379
+# REDIS_DB=0
+
+REDIS_HOST=192.168.1.123
 REDIS_AUTH=
-REDIS_PORT=6379
+REDIS_PORT=26739
+REDIS_PASSWORD=zxt_redis_dev
 REDIS_DB=0
 
-AMQP_HOST=103.105.201.2
-AMQP_PORT=5673
+AMQP_HOST=192.168.1.123
+AMQP_PORT=5672
 AMQP_USER=rabbitmq
-AMQP_PASSWORD=H8eDTAk6LY7EjJ8y
+AMQP_PASSWORD=zxt_mq_dev
+
+# AMQP_HOST=103.105.201.2
+# AMQP_PORT=5673
+# AMQP_USER=rabbitmq
+# AMQP_PASSWORD=H8eDTAk6LY7EjJ8y
 
 
 #小程序获取openid

app/Controller/WebController.php

@@ -100,24 +100,26 @@ class WebController extends AbstractController
     public function getWebsiteAdvertisement()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'adPlace' => 'required'
-            ],
-            [
-                'adPlace.required' => '广告位置编号不能为空'
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
+        $data = ['website_id'=>Context::get("SiteId")]; 
+        if($requireData['ad_tag']){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'ad_tag' => 'required'
+                ],
+                [
+                    'ad_tag.required' => '广告位置表示不能为空'
+                ]
+            );
+            if ($validator->fails()){
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $data['ad_tag'] = $requireData['ad_tag'];
         }
-        $data = [
-            'website_id'=>Context::get("SiteId"),
-            'ad_placeid'=>$requireData['adPlace']
-        ]; 
         
+        
+        // return Result::success($data);//测试
         $result = $this->websiteServiceClient->getWebsiteAdvertisement($data);
 
         if ($result['code'] != ErrorCode::SUCCESS) {
@@ -370,6 +372,7 @@ class WebController extends AbstractController
 
     /**
      * 获取文章列表
+     * @return array
      */
     public function getWebsiteArticleList()
     {
@@ -386,32 +389,34 @@ class WebController extends AbstractController
 
             ]
             );
-            $data['catid'] =  $requireData['catid']; 
+            $data['catid'] = $requireData['catid'];
         }
             
         $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'page' => 'required',
-                    'pageSize' => 'required'
-                ],
-                [
-                    'page.required' => '分页不能为空',
-                    'pageSize.required' => '显示条数不能为空'
-    
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-            // $data['catid'] =  $requireData['catid']; 
-            if(isset($requireData['keyword']) && !empty($requireData['keyword'])){
-                $data['keyword'] =  $requireData['keyword'];
-            }
-            $data['website_id'] = Context::get("SiteId");
-            $data['pageSize'] = $requireData['pageSize']; 
-            $data['page'] = $requireData['page']; 
+            $requireData,
+            [
+                'page' => 'required',
+                'pageSize' => 'required'
+            ],
+            [
+                'page.required' => '分页不能为空',
+                'pageSize.required' => '显示条数不能为空'
+
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        // $data['catid'] =  $requireData['catid']; 
+        if(isset($requireData['keyword']) && !empty($requireData['keyword'])){
+            $data['keyword'] =  $requireData['keyword'];
+        }
+
+        $data['website_id'] = Context::get("SiteId");
+        $data['pageSize'] = $requireData['pageSize']; 
+        $data['page'] = $requireData['page']; 
+        // return Result::success($data);
         $result = $this->newsServiceClient->getWebsiteArticleList($data);
         // var_dump($result);
         if ($result['code'] != ErrorCode::SUCCESS) {
@@ -446,7 +451,7 @@ class WebController extends AbstractController
             'website_id'=>Context::get("SiteId"),
             'id'=>$requireData['articleid'],
         ]; 
-        $result = $this->newsServiceClient->getArticleInfo($data);
+        $result = $this->newsServiceClient->selectWebsiteArticleInfo($data);
         // var_dump($result);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
@@ -555,7 +560,7 @@ class WebController extends AbstractController
         }
     }
     /**
-     * 搜索二级导航
+     * 搜索导航
      * @return array
      */
     public function selectWebsiteCategory()
@@ -564,13 +569,10 @@ class WebController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'pid' =>'required|integer',
                 'cityid' => 'nullable|numeric',
                 'department_id' => 'nullable|numeric',
             ], 
             [
-                'pid.required' => 'id不能为空',
-                'pid.integer' => 'id必须为整数',
                 'cityid.numeric' => '城市id必须为数字',
                 'department_id.numeric' => '部门id必须为数字' 
             ]
@@ -590,7 +592,7 @@ class WebController extends AbstractController
 
     }
     /**
-     * 搜索二级导航
+     * 搜索栏目的seo信息
      * @return array
      */
     public function getWebsiteCategoryHead()
@@ -651,4 +653,113 @@ class WebController extends AbstractController
          }
 
     }
+    /**
+     * 获取网站调查问卷
+     */
+    public function getWebsiteSurvey()
+    {
+        $requireData = $this->request->all();
+        if(isset($requireData['art_id'])){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'art_id' =>'required|integer'
+                ],
+                [
+                    'art_id.required' => 'id不能为空',
+                    'art_id.integer' => 'id必须为整数'
+                ]
+            ); 
+            if ($validator->fails()){
+                $errorMessage = $validator->errors()->first();
+                return Result::error($errorMessage);
+            }
+            $data['art_id'] = $requireData['art_id'];
+        }
+        $data['website_id'] =  Context::get("SiteId");
+        // return Result::success($data);
+        $result = $this->newsServiceClient->getWebsiteSurvey($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }else{
+            return Result::success($result['data']);
+        }
+
+    }
+    /*
+     * 添加网站调查问卷选项
+     * 
+     * */
+    public function addWebsiteSurveyOption()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'sur_id' =>'required',
+                'choice_name' =>'required|string|max:30',
+            ],
+            [
+                'sur_id.required' => '问卷id不能为空',
+                'choice_name.required' => '选项名称不能为空',
+                'choice_name.string' => '选项名称必须为字符串',
+                'choice_name.max' => '选项名称不能超过30个字符',
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $data = [
+            'website_id' => Context::get("SiteId"),
+            'sur_id' => $requireData['sur_id'],
+            'choice_name' => $requireData['choice_name'],
+        ];
+        $result = $this->newsServiceClient->addWebsiteSurveyOption($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }else{
+            return Result::success($result['data']);
+        }
+    }
+    /*
+     * 调查问卷-投票
+     * 
+     * */
+    public function addWebsiteSurveyVote()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'sur_id' =>'required',
+                'choice_id' =>'required',
+            ],
+            [
+                'sur_id.required' => '问卷id不能为空',
+                'choice_id.required' => '选项名称不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $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'],
+            'choice_id' => $requireData['choice_id']
+        ];
+        // return Result::success($data);
+        $result = $this->newsServiceClient->addWebsiteSurveyVote($data);
+        if ($result['code']!= ErrorCode::SUCCESS) {
+            return Result::error($result['message'],0,[]);
+        }else{
+            return Result::success($result['data']);
+        }
+    }
 }

app/JsonRpc/NewsService.php

@@ -151,5 +151,36 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
-
+     /**
+     * @param array $data
+     * @return array
+     */
+    public function selectWebsiteArticleInfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteSurvey(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWebsiteSurveyOption(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWebsiteSurveyVote(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/NewsServiceInterface.php

@@ -76,5 +76,24 @@ interface NewsServiceInterface
      * @return mixed
      */
     public function getWebsiteArticleList(array $data);
-
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function selectWebsiteArticleInfo(array $data);
+     /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteSurvey(array $data);
+      /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWebsiteSurveyOption(array $data);
+      /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWebsiteSurveyVote(array $data);
 }

app/JsonRpc/WebsiteService.php

@@ -552,4 +552,5 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -379,4 +379,5 @@ interface WebsiteServiceInterface
      * @return mixed
      */
     public function getOneWebsiteCategory(array $data);
+     
 }

config/api/web.php

@@ -33,7 +33,12 @@ Router::addGroup(
                 Router::get('/getWebsiteCategoryHead', [WebController::class, 'getWebsiteCategoryHead']);
                 //获取某个栏目
                 Router::get('/getOneWebsiteCategory', [WebController::class, 'getOneWebsiteCategory']);
-                
+                //获取调查问卷
+                Router::get('/getWebsiteSurvey', [WebController::class, 'getWebsiteSurvey']);
+                // 添加调查问卷选项
+                Router::get('/addWebsiteSurveyOption', [WebController::class, 'addWebsiteSurveyOption']);
+                // 调查问卷-投票
+                Router::get('/addWebsiteSurveyVote', [WebController::class, 'addWebsiteSurveyVote']);
             },
     ['middleware' => [WebMiddleware::class]]
 );