Merge branch 'master' of http://116.131.8.26:3000/FengR/zxt_gateway

app/Controller/NewsController.php

@@ -459,19 +459,19 @@ class NewsController extends AbstractController
             [
                 'page' => 'required',
                 'pageSize' => 'required',
-                'website_id' => 'required'
             ],
             [
                 'page.required' => 'page不能为空',
                 'pageSize.required' => 'limit不能为空',
-                'website_id.required' => 'website_id不能为空',
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-
+        $requireData['user_id'] = Context::get("UserId");
+        $requireData['website_id'] = $requireData['website_id'];
+        $requireData['web_id'] = Context::get("SiteId");
         $result = $this->newsServiceClient->getArticleCommend($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -3062,78 +3062,24 @@ class NewsController extends AbstractController
         $result = $this->newsServiceClient->checkWebCateinfo($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-    // 政讯--官网--在线留言
-    /**
-     * 政讯--官网--在线留言--添加
-     * @return array
-     */
-    public function addOnline()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'name' => 'required|string',
-                'title' => 'required|string',
-            ],
-            [
-                'name.required' => '主题不能为空',
-                'name.string' => '主题必须为字符串',
-                'title.required' => '主题号不能为空',
-                'title.string' => '主题号必须为字符串',
-            ]
-        );
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $requireData['user_id'] = Context::get('UserId');
-        $result = $this->newsServiceClient->addOnline($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 政讯--官网--在线留言--列表
+     /**
+     * 政讯--本网招聘--获取推荐招聘
      * @return array
      */
-    public function getOnlineList()
+    public function getAdviceSinglePages()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
                 'page' => 'required|integer',
-                'limit' => 'required|integer',
+                'page_size' => 'required|integer',
             ],
             [
                 'page.required' => '页码不能为空',
                 'page.integer' => '页码必须为整数',
-                'limit.required' => '每页数量不能为空',
-                'limit.integer' => '每页数量必须为整数',
-            ]
-        );
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $requireData['user_id'] = Context::get('UserId');
-        $result = $this->newsServiceClient->getOnlineList($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 政讯--官网--在线留言--详情
-     * @return array
-     */
-    public function getOnlineInfo()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'id' => 'required|integer',
-            ],
-            [
-                'id.required' => 'id不能为空',
-                'id.integer' => 'id必须为整数',
+                'page_size.required' => '每页数量不能为空',
+                'page_size.integer' => '每页数量必须为整数',
             ]
         );
         if ($validator->fails()) {
@@ -3141,27 +3087,30 @@ class NewsController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['user_id'] = Context::get('UserId');
-        $result = $this->newsServiceClient->getOnlineInfo($requireData);
+        $requireData['web_id'] = Context::get('SiteId');
+        $result = $this->newsServiceClient->getAdviceSinglePages($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 政讯--官网--在线留言--审核
+     * 政讯--本网招聘--新增
      * @return array
      */
-    public function checkOnline()
+    public function addSinglePage()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id' => 'required|integer',
-                'status' => 'required|integer',
+                'title' => 'required|string',
+                'cat_arr_id' => 'required',
+                'islink' => 'required|integer',
             ],
             [
-                'id.required' => 'id不能为空',
-                'id.integer' => 'id必须为整数',
-                'status.required' => '状态不能为空',
-                'status.integer' => '状态必须为整数',
+                'title.required' => '标题不能为空',
+                'title.string' => '标题必须为字符串',
+                'cat_arr_id.required' => '栏目不能为空',
+                'islink.required' => '是否外链不能为空',
+                'islink.integer' => '是否外链必须为整数',
             ]
         );
         if ($validator->fails()) {
@@ -3169,24 +3118,33 @@ class NewsController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['user_id'] = Context::get('UserId');
-        $result = $this->newsServiceClient->checkOnline($requireData);
+        $requireData['website_id'] = $requireData['website_id'] ?? Context::get('SiteId');
+        $result = $this->newsServiceClient->addSinglePage($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 政讯--官网--在线留言--删除
+     * 政讯--本网招聘--更新
      * @return array
      */
-    public function delOnline()
+    public function upSinglePage()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
                 'id' => 'required|integer',
+                'title' => 'required|string',
+                'cat_arr_id' => 'required',
+                'islink' => 'required|integer',
             ],
             [
                 'id.required' => 'id不能为空',
                 'id.integer' => 'id必须为整数',
+                'title.required' => '标题不能为空',
+                'title.string' => '标题必须为字符串',
+                'cat_arr_id.required' => '栏目不能为空',
+                'islink.required' => '是否外链不能为空',
+                'islink.integer' => '是否外链必须为整数',
             ]
         );
         if ($validator->fails()) {
@@ -3194,27 +3152,25 @@ class NewsController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['user_id'] = Context::get('UserId');
-        $result = $this->newsServiceClient->delOnline($requireData);
+        $requireData['website_id'] = $requireData['website_id'] ?? Context::get('SiteId');
+        $result = $this->newsServiceClient->upSinglePage($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-    ///upOnline
     /**
-     * 政讯--官网--在线留言--修改
+     * 政讯--本网招聘--删除
      * @return array
      */
-    public function upOnline()
+    public function delSinglePage()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
                 'id' => 'required|integer',
-
             ],
             [
                 'id.required' => 'id不能为空',
                 'id.integer' => 'id必须为整数',
-
             ]
         );
         if ($validator->fails()) {
@@ -3222,28 +3178,24 @@ class NewsController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['user_id'] = Context::get('UserId');
-        $result = $this->newsServiceClient->upOnline($requireData);
+        $result = $this->newsServiceClient->delSinglePage($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-    //upOnlineStatus
     /**
-     * 政讯--官网--在线留言--修改状态
+     * 政讯--本网招聘--获取单页详情
      * @return array
      */
-    public function upOnlineStatus()
+    public function checkSinglePage()
     {
         $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()) {
@@ -3251,174 +3203,65 @@ class NewsController extends AbstractController
             return Result::error($errorMessage);
         }
         $requireData['user_id'] = Context::get('UserId');
-        $result = $this->newsServiceClient->upOnlineStatus($requireData);
+        $requireData['website_id'] = $requireData['website_id'] ?? Context::get('SiteId');
+        $result = $this->newsServiceClient->checkSinglePage($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-    // 政讯--官网--法律咨询
     /**
-     * 政讯--官网--法律咨询--添加
+     * 政讯--本网招聘--获取单页列表
      * @return array
      */
-    public function addLaw()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'title' => 'required',
-                'content' => 'required',
-
-            ],
-            [
-                'title.required' => '标题不能为空',
-                'content.required' => '内容不能为空',
-            ]
-        );
-
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $requireData['user_id'] = Context::get('UserId');
-        $result = $this->newsServiceClient->addLaw($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 政讯--官网--法律咨询--列表
-     * @return array
-     */
-    public function getLawList()
+    public function getSinglePageList()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
                 'page' => 'required|integer',
-                'limit' => 'required|integer',
+                'page_size' => 'required|integer',
+                'is_master' => 'required|integer',
             ],
             [
                 'page.required' => '页码不能为空',
                 'page.integer' => '页码必须为整数',
-                'limit.required' => '每页条数不能为空',
-                'limit.integer' => '每页条数必须为整数',
-            ]
-        );
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $requireData['user_id'] = Context::get('UserId');
-        $result = $this->newsServiceClient->getLawList($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 政讯--官网--法律咨询--详情
-     * @return array
-     */
-    public function getLawInfo()
-    {
-        $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->getLawInfo($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 政讯--官网--法律咨询--删除
-     * @return array
-     */
-    public function delLaw()
-    {
-        $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->delLaw($requireData);
-        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
-    }
-    /**
-     * 政讯--官网--法律咨询--修改
-     * @return array
-     */
-    public function upLaw()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'id' => 'required|integer',
-                'title' => 'required',
-                'content' => 'required',
-
-            ],
-            [
-                'id.required' => 'id不能为空',
-                'id.integer' => 'id必须为整数',
-                'title.required' => '标题不能为空',
-                'content.required' => '内容不能为空',
+                'page_size.required' => '每页数量不能为空',
+                'page_size.integer' => '每页数量必须为整数',
+                'is_master.required' => '状态不能为空',
+                'is_master.integer' => '状态必须为整数',
             ]
         );
         if ($validator->fails()) {
-
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] = Context::get('UserId');
-        $result = $this->newsServiceClient->upLaw($requireData);
+        $requireData['user_id'] = Context::get('UserId');        
+        $requireData['website_id'] = Context::get('SiteId') ?? 0;
+        $result = $this->newsServiceClient->getSinglePageList($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 政讯--官网--法律咨询--修改状态
+     * 政讯--本网招聘--获取单页详情
      * @return array
      */
-    public function upLawStatus()
+    public function getSinglePageInfo()
     {
         $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->upLawStatus($requireData);
+        $result = $this->newsServiceClient->getSinglePageInfo($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 }

app/JsonRpc/NewsService.php

@@ -843,28 +843,29 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
     // 政讯--官网--在线留言
-    public function addOnline(array $data)
+    public function addOnline(array $data): array
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    public function upOnline(array $data)
+    public function upOnline(array $data): array
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    public function getOnlineList(array $data)
+    public function getOnlineList(array $data): array
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    public function delOnline(array $data)
+    public function delOnline(array $data): array
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    public function getOnlineInfo(array $data)
+    public function getOnlineInfo(array $data): array
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    public function checkOnline(array $data)
+    public function checkOnline(array $data): array
     {
         return $this->__request(__FUNCTION__, $data);
     }
@@ -904,4 +905,61 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getAdviceSinglePages(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function addSinglePage(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function upSinglePage(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function delSinglePage(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function checkSinglePage(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getSinglePageList(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getSinglePageInfo(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/NewsServiceInterface.php

@@ -363,9 +363,10 @@ interface NewsServiceInterface
   public function checkWebCateinfo(array $data);
   // 获取网站导航详情
   public function getWebCateinfoDetail(array $data);
+
   // 政讯--官网--在线留言
-  public function addOnline(array $data);
-  public function getOnlineList(array $data);
+  public function addOnline(array $data): array;
+  public function getOnlineList(array $data): array;
   public function delOnline(array $data);
   public function upOnline(array $data);
   public function getOnlineInfo(array $data);
@@ -380,4 +381,21 @@ interface NewsServiceInterface
   public function getLawInfo(array $data);
   public function upLawStatus(array $data);
   public function checkLaw(array $data);
+
+
+  // 单页管理
+  // 获取推荐单页列表
+  public function getAdviceSinglePages(array $data);
+  // 添加单页
+  public function addSinglePage(array $data);
+  // 更新单页
+  public function upSinglePage(array $data);
+  // 删除单页
+  public function delSinglePage(array $data);
+  // 审核单页
+  public function checkSinglePage(array $data);
+  // 获取单页列表
+  public function getSinglePageList(array $data);
+  // 获取单页详情
+  public function getSinglePageInfo(array $data);
 }

config/api/news.php

@@ -189,6 +189,7 @@ Router::addGroup(
         Router::get('/getWebCateinfoDetail', [NewsController::class, 'getWebCateinfoDetail']);
         Router::post('/checkWebCateinfo', [NewsController::class, 'checkWebCateinfo']);
 
+
         // 政讯--官网--在线留言
         Router::post('/addOnline', [NewsController::class, 'addOnline']);
         Router::post('/upOnline', [NewsController::class, 'upOnline']);
@@ -206,6 +207,16 @@ Router::addGroup(
         Router::post('/getLawInfo', [NewsController::class, 'getLawInfo']);
         Router::post('/upLawStatus', [NewsController::class, 'upLawStatus']);
         Router::post('/checkLaw', [NewsController::class, 'checkLaw']);
+
+
+        // 政讯--单页--本网招聘
+        Router::get('/getAdviceSinglePages', [NewsController::class, 'getAdviceSinglePages']);
+        Router::post('/addSinglePage', [NewsController::class, 'addSinglePage']);
+        Router::post('/upSinglePage', [NewsController::class, 'upSinglePage']);
+        Router::get('/delSinglePage', [NewsController::class, 'delSinglePage']);
+        Router::post('/checkSinglePage', [NewsController::class, 'checkSinglePage']);
+        Router::get('/getSinglePageList', [NewsController::class, 'getSinglePageList']);
+        Router::get('/getSinglePageInfo', [NewsController::class, 'getSinglePageInfo']);
     },
     ['middleware' => [FooMiddleware::class, \App\Middleware\Auth\SensitiveMiddleware::class]]
 );