Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/NewsController.php

@@ -447,6 +447,34 @@ class NewsController extends AbstractController
         $result = $this->newsServiceClient->delArticle($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 获取资讯手动推荐列表
+     * @return array
+     */
+    public function getArticleCommend()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                '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);
+        }
+
+        $result = $this->newsServiceClient->getArticleCommend($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 
     /**
      * 获取资讯信息

app/Controller/WebsiteController.php

@@ -2801,6 +2801,35 @@ class WebsiteController extends AbstractController
         $result = $this->websiteServiceClient->updateWebsiteStatus($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 自助建站-修改网站应用状态
+     * @return array
+     */
+    public function upWebsiteStatus(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' =>'required|integer',
+                'status' =>'required|integer',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'website_id.integer' => '网站id必须是整数类型',
+                'status.required' => '状态不能为空',
+                'status.integer' => '状态必须是整数类型',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->upWebsiteStatus($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
+
+
+
     /**
      * 删除网站地址
      */

app/JsonRpc/NewsService.php

@@ -88,6 +88,11 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    public function getArticleCommend(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
 
     /**
      * @param array $data
@@ -507,7 +512,7 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
      * @param array $data
      * @return mixed
      */
-    public function getWebsiteJobSelect(array $data) 
+    public function getWebsiteJobSelect(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
@@ -852,5 +857,4 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
-
-}
+}

app/JsonRpc/NewsServiceInterface.php

@@ -43,6 +43,8 @@ interface NewsServiceInterface
    * @param array $data
    */
   public function addArticle(array $data);
+  public function getArticleCommend(array $data);
+
 
   /**
    * @param array $data
@@ -197,16 +199,16 @@ interface NewsServiceInterface
    * @return mixed
    */
   public function test(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteJobRecruiting(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function checkWebsiteRoute(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteJobRecruiting(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function checkWebsiteRoute(array $data);
 
   /**
    * @param array $data
@@ -370,93 +372,93 @@ interface NewsServiceInterface
    * @return mixed
    */
   public function getJobResumeList(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteJobSelect(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteJobSelect(array $data);
 
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteTsbb(array $data);
-    public function getWebsiteTsbbList(array $data);
-    public function getWebsiteTsbbDetail(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteTsbb(array $data);
+  public function getWebsiteTsbbList(array $data);
+  public function getWebsiteTsbbDetail(array $data);
 
-    public function getWebsiteCatidshop(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteLevelJob(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteCompany(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteCompanyInfo(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteCompanyList(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteProject(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteProjectInfo(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteProjectList(array $data);
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteCategoryJob(array $data);
+  public function getWebsiteCatidshop(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteLevelJob(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteCompany(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteCompanyInfo(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteCompanyList(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteProject(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteProjectInfo(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteProjectList(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteCategoryJob(array $data);
 
 
-    /**
-     * @param array $data
-     * @return mixed
-     */
-    public function getWebsiteNwHomeList(array $data);
-    // 企业管理
-    // 获取企业列表
-    public function getCompanyList(array $data);
-    // 添加企业
-    public function addCompany(array $data);
-    // 更新企业
-    public function upCompany(array $data);
-    // 删除企业
-    public function delCompany(array $data);
-    // 审核企业
-    public function checkCompany(array $data);
-    // 获取企业信息
-    public function getCompanyInfo(array $data);
+  /**
+   * @param array $data
+   * @return mixed
+   */
+  public function getWebsiteNwHomeList(array $data);
+  // 企业管理
+  // 获取企业列表
+  public function getCompanyList(array $data);
+  // 添加企业
+  public function addCompany(array $data);
+  // 更新企业
+  public function upCompany(array $data);
+  // 删除企业
+  public function delCompany(array $data);
+  // 审核企业
+  public function checkCompany(array $data);
+  // 获取企业信息
+  public function getCompanyInfo(array $data);
 
-    //  项目管理
-    // 获取项目列表
-    public function getProjectList(array $data);
-    // 添加项目
-    public function addProject(array $data);
-    // 更新项目
-    public function upProject(array $data);
-    // 删除项目
-    public function delProject(array $data);
-    // 审核项目
-    public function checkProject(array $data);
-    // 获取项目详情
-    public function getProjectInfo(array $data);
+  //  项目管理
+  // 获取项目列表
+  public function getProjectList(array $data);
+  // 添加项目
+  public function addProject(array $data);
+  // 更新项目
+  public function upProject(array $data);
+  // 删除项目
+  public function delProject(array $data);
+  // 审核项目
+  public function checkProject(array $data);
+  // 获取项目详情
+  public function getProjectInfo(array $data);
 }

app/JsonRpc/WebsiteService.php

@@ -837,8 +837,20 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    public function updateWebsiteStatus(array $data)
-    {
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upWebsiteStatus(array $data) 
+    { 
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function updateWebsiteStatus(array $data) 
+    { 
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -850,4 +862,6 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -527,7 +527,12 @@ interface WebsiteServiceInterface
      * @param array $data
      * @return mixed
      */
-    public function updateWebsiteStatus(array $data);
+    public function updateWebsiteStatus(array $data);  
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upWebsiteStatus(array $data);  
 
     /**
      * @param array $data

config/api/news.php

@@ -35,6 +35,9 @@ Router::addGroup(
         Router::post('/upArticleStatus', [NewsController::class, 'upArticleStatus']);
         //查看资讯
         Router::get('/getArticleInfo', [NewsController::class, 'getArticleInfo']);
+        //首页推荐
+        Router::get('/getArticleCommend', [NewsController::class, 'getArticleCommend']);
+
         // 前端-搜索资讯
         Router::get('/selectWebsiteCategory', [NewsController::class, 'selectWebsiteArticle']);
         //获取导航池信息

config/api/website.php

@@ -140,6 +140,9 @@ Router::addGroup(
         Router::get('/getSizeInfo', [WebsiteController::class, 'getSizeInfo']);
         // 获取网站名称简称
         Router::get('/getWebsiteAdkey', [WebsiteController::class, 'getWebsiteAdkey']);
+        // 自助建站-修改网站应用状态
+        Router::post('/upWebsiteStatus', [WebsiteController::class, 'upWebsiteStatus']);
+
         // --自助建站-----------fr----------------------end
 
         // --网站底部基础信息-----------fr----------------------start