添加接口：c端获取调研选题；b端：获取调研选题详情、获取调研选题列表、删除调研选题

app/Controller/NewsController.php

@@ -1467,7 +1467,7 @@ class NewsController extends AbstractController
     public function getJobRecruitingArea()
     {
         $requireData = $this->request->all();
-        $result = $this->websiteServiceClient->selectWebsiteArea($requireData);
+        $result = $this->newsServiceClient->getJobRecruitingArea($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /*
@@ -2514,12 +2514,14 @@ class NewsController extends AbstractController
                 'column_id' => 'required|integer',
                 'title' => 'required',
                 'content' => 'required',
+                'name' => 'required',
             ],
             [
                 'column_id.required' => '网站属性id不能为空',
                 'column_id.integer' => '网站属性id必须为整数',
                 'title.required' => '留言标题不能为空',
                 'content.required' => '留言内容不能为空',
+                'name.required' => '姓名不能为空',
             ]
         );
         if ($validator->fails()) {
@@ -2544,6 +2546,7 @@ class NewsController extends AbstractController
                 'column_id' => 'required|integer',
                 'title' => 'required',
                 'content' => 'required',
+                'name' => 'required',
             ],
             [
                 'id.required' => '留言id不能为空',
@@ -2552,6 +2555,7 @@ class NewsController extends AbstractController
                 'column_id.integer' => '网站属性id必须为整数',
                 'title.required' => '留言标题不能为空',
                 'content.required' => '留言内容不能为空',
+                'name.required' => '姓名不能为空',
             ]
         );
         if ($validator->fails()) {
@@ -2705,6 +2709,7 @@ class NewsController extends AbstractController
      */
     public function getAllResearcher()
     {
+        $requireData = $this->request->all();
         $requireData['user_id'] = Context::get('UserId');
         $result = $this->newsServiceClient->getAllResearcher($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
@@ -2738,4 +2743,146 @@ class NewsController extends AbstractController
         $result = $this->newsServiceClient->addResearchTopic($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 政讯---调研选题-编辑
+     * @return array
+     */
+    public function upResearchTopic()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required|integer',
+                'title' => 'required',
+                'column_id' => 'required|integer',
+                'content' => 'required',
+            ],
+            [
+                'id.required' => '调研选题id不能为空',
+                'id.integer' => '调研选题id必须为整数',
+                'title.required' => '标题不能为空',
+                'column_id.required' => '网站属性id不能为空',
+                'column_id.integer' => '网站属性id必须为整数',
+                'content.required' => '内容不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get('UserId');
+        $result = $this->newsServiceClient->upResearchTopic($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 政讯---调研选题-删除
+     * @return array
+     */
+    public function delResearchTopic()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required|integer',
+            ],
+            [
+                'id.required' => '调研选题id不能为空',
+                'id.integer' => '调研选题id必须为整数',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get('UserId');
+        $result = $this->newsServiceClient->delResearchTopic($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 政讯---调研选题-获取列表
+     * @return array
+     */
+    public function getResearchTopicList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'is_master' => 'required|integer',
+                'page' => 'required|integer',
+                'page_size' => 'required|integer',
+            ],
+            [
+                'is_master.required' => '是否主选题不能为空',
+                'is_master.integer' => '是否主选题必须为整数',
+                'page.required' => '当前页不能为空',
+                'page.integer' => '当前页必须为整数',
+                'page_size.required' => '每页数量不能为空',
+                'page_size.integer' => '每页数量必须为整数',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get('UserId');
+        $requireData['website_id'] = Context::get('SiteId');
+        $result = $this->newsServiceClient->getResearchTopicList($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 政讯---调研选题-修改状态
+     * @return array
+     */
+    public function checkResearchTopic()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required|integer',
+                'status' => 'required|integer',
+            ],
+            [
+                'id.required' => '调研选题id不能为空',
+                'id.integer' => '调研选题id必须为整数',
+                'status.required' => '状态不能为空',
+                'status.integer' => '状态必须为整数',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get('UserId');
+        $result = $this->newsServiceClient->checkResearchTopic($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 政讯---调研选题-获取详情
+     * @return array
+     */
+    public function getResearchTopicInfo()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required|integer',
+            ],
+            [
+                'id.required' => '调研选题id不能为空',
+                'id.integer' => '调研选题id必须为整数',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get('UserId');
+        $result = $this->newsServiceClient->getResearchTopicInfo($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

app/Controller/WebController.php

@@ -1470,4 +1470,31 @@ class WebController extends AbstractController
         // return $result;
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * @return array
+     */
+    public function getWebsiteResearchTopic()
+    {
+        $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->getWebsiteResearchTopic($requireData);
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

app/JsonRpc/NewsService.php

@@ -755,4 +755,44 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function upResearchTopic(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function delResearchTopic(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getResearchTopicList(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function checkResearchTopic(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getResearchTopicInfo(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/NewsServiceInterface.php

@@ -396,4 +396,14 @@ interface NewsServiceInterface
   public function getAllResearcher(array $data);
   // 添加调研选题
   public function addResearchTopic(array $data);
+  // 更新调研选题
+  public function upResearchTopic(array $data);
+  // 删除调研选题
+  public function delResearchTopic(array $data);
+  // 获取调研选题列表
+  public function getResearchTopicList(array $data);
+  // 修改调研选题状态
+  public function checkResearchTopic(array $data);
+  // 获取调研选题详情
+  public function getResearchTopicInfo(array $data);
 }

app/JsonRpc/WebService.php

@@ -442,4 +442,12 @@ class WebService extends AbstractServiceClient implements WebServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteResearchTopic(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/WebServiceInterface.php

@@ -275,4 +275,9 @@ interface WebServiceInterface
    * @return mixed
    */
   public function getWebsiteProvinceCity(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteResearchTopic(array $data);
 }

config/api/news.php

@@ -176,10 +176,10 @@ Router::addGroup(
         Router::get('/getAllResearcher', [NewsController::class, 'getAllResearcher']);
         Router::post('/addResearchTopic', [NewsController::class, 'addResearchTopic']);
         Router::post('/upResearchTopic', [NewsController::class, 'upResearchTopic']);
-        Router::post('/delResearchTopic', [NewsController::class, 'delResearchTopic']);
+        Router::get('/delResearchTopic', [NewsController::class, 'delResearchTopic']);
         Router::post('/checkResearchTopic', [NewsController::class, 'checkResearchTopic']);
-        Router::post('/getResearchTopicList', [NewsController::class, 'getResearchTopicList']);
-        Router::post('/getResearchTopicInfo', [NewsController::class, 'getResearchTopicInfo']);
+        Router::get('/getResearchTopicList', [NewsController::class, 'getResearchTopicList']);
+        Router::get('/getResearchTopicInfo', [NewsController::class, 'getResearchTopicInfo']);
     },
     ['middleware' => [FooMiddleware::class, \App\Middleware\Auth\SensitiveMiddleware::class]]
 );

config/api/web.php

@@ -121,9 +121,12 @@ Router::addGroup(
                 // 自助建站-c端获取头部及底部所有网站信息
                 Router::get('/getWebsiteAllinfo', [WebController::class, 'getWebsiteAllinfo']);
                 
-
+                // 政讯项目-获取网站的网民留言
                 Router::get('/getWebsiteMessage', [WebController::class, 'getWebsiteMessage']);
+                // 政讯项目-获取省市
                 Router::get('/getWebsiteProvinceCity', [WebController::class, 'getWebsiteProvinceCity']);
+                // 政讯项目-搜索调研选题
+                Router::get('/getWebsiteResearchTopic', [WebController::class, 'getWebsiteResearchTopic']);
             },
     ['middleware' => [WebMiddleware::class]]
 );