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

app/Controller/NewsController.php

@@ -2885,4 +2885,180 @@ class NewsController extends AbstractController
         $result = $this->newsServiceClient->getResearchTopicInfo($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+    
+    
+    /**
+     * 政讯--官网导航--添加
+     * @return array
+     */
+    public function addWebCateinfo()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'title' => 'required|string',
+                'type_id' => 'required|integer',
+                'content' => 'required|string',
+            ],
+            [
+                'title.required' => '标题不能为空',
+                'title.string' => '标题必须为字符串',
+                'type_id.required' => '类型id不能为空',
+                'type_id.integer' => '类型id必须为整数',
+                'content.required' => '内容不能为空',
+                'content.string' => '内容必须为字符串',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get('UserId');
+        $result = $this->newsServiceClient->addWebCateinfo($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 政讯--官网导航--更新
+     * @return array
+     */
+    public function upWebCateinfo()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required|integer',
+                'title' => 'required|string',
+                'type_id' => 'required|integer',
+                'content' => 'required|string',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'id.integer' => 'id必须为整数',
+                'title.required' => '标题不能为空',
+                'title.string' => '标题必须为字符串',
+                'type_id.required' => '类型id不能为空',
+                'type_id.integer' => '类型id必须为整数',
+                'content.required' => '内容不能为空',
+                'content.string' => '内容必须为字符串',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get('UserId');
+        $result = $this->newsServiceClient->upWebCateinfo($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 政讯--官网导航--获取列表
+     * @return array
+     */
+    public function getWebCateinfoList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' => 'required|integer',
+                'page_size' => 'required|integer',
+                'is_master' => 'required|integer',
+            ],
+            [
+                'page.required' => '页码不能为空',
+                'page.integer' => '页码必须为整数',
+                '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->getWebCateinfoList($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 政讯--官网导航--删除
+     * @return array
+     */
+    public function delWebCateinfo()
+    {
+        $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->delWebCateinfo($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 政讯--官网导航--详情
+     * @return array
+     */
+    public function getWebCateinfoDetail()
+    {
+        $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->getWebCateinfoDetail($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 政讯--官网导航--审核
+     * @return array
+     */
+    public function checkWebCateinfo()
+    {
+        $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->checkWebCateinfo($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

app/Controller/UserController.php

@@ -37,7 +37,7 @@ class UserController extends AbstractController
                 'type_id' => 'required', //用户类型
                 'password' => 'required|min:6', //密码
                 'confirm_password' => 'required',
-                'real_name' => 'required',
+                // 'real_name' => 'required',
                 'role_id' => 'required',
                 //                'mobile' =>'required'
             ],
@@ -49,7 +49,7 @@ class UserController extends AbstractController
                 //                'mobile.telephone_number' => '请填写一个有效的手机号',
                 'confirm_password.required' => "确认密码不能为空",
                 'type_id.required' => "用户类型不能为空",
-                'real_name.required' => "姓名不能为空",
+                // 'real_name.required' => "姓名不能为空",
                 'password.min' => "密码长度不能低于6位数",
                 'role_id.required' => "所属角色不能为空",
             ]
@@ -79,7 +79,7 @@ class UserController extends AbstractController
         $requireData['city_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id']) > 0 ? end($requireData['city_arr_id']) : 0;
         $requireData['city_arr_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id']) > 0 ? json_encode($requireData['city_arr_id']) : json_encode([]);
         $requireData['other'] = isset($requireData['other']) ? json_encode($requireData['other']) : '';
-        $requireData['birthday'] = isset($requireData['birthday']) ? date('Y-m-d', strtotime($requireData['birthday'])) : '';
+        $requireData['birthday'] = isset($requireData['birthday']) && !empty($requireData['birthday']) && $requireData['birthday'] != 'NAN' ? date('Y-m-d', strtotime($requireData['birthday'])) : null;
         $result =  $this->userServiceClient->createUser($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }

app/Controller/WebsiteController.php

@@ -2879,4 +2879,4 @@ class WebsiteController extends AbstractController
         $result = $this->websiteServiceClient->checkPath($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-}
+}

app/JsonRpc/NewsService.php

@@ -795,4 +795,52 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addWebCateinfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * 更新网站导航
+     * @param array $data
+     */
+    public function upWebCateinfo(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getWebCateinfoList(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function delWebCateinfo(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getWebCateinfoDetail(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function checkWebCateinfo(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/NewsServiceInterface.php

@@ -260,63 +260,6 @@ 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 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);
-
-
   /**
    * @param array $data
    * @return mixed
@@ -406,4 +349,18 @@ interface NewsServiceInterface
   public function checkResearchTopic(array $data);
   // 获取调研选题详情
   public function getResearchTopicInfo(array $data);
+
+  // 网站导航管理
+  // 获取网站导航列表
+  public function getWebCateinfoList(array $data);
+  // 添加网站导航
+  public function addWebCateinfo(array $data);
+  // 更新网站导航
+  public function upWebCateinfo(array $data);
+  // 删除网站导航
+  public function delWebCateinfo(array $data);
+  // 审核网站导航
+  public function checkWebCateinfo(array $data);
+  // 获取网站导航详情
+  public function getWebCateinfoDetail(array $data);
 }

config/api/news.php

@@ -180,6 +180,14 @@ Router::addGroup(
         Router::post('/checkResearchTopic', [NewsController::class, 'checkResearchTopic']);
         Router::get('/getResearchTopicList', [NewsController::class, 'getResearchTopicList']);
         Router::get('/getResearchTopicInfo', [NewsController::class, 'getResearchTopicInfo']);
+
+        // 政讯--官网导航--添加
+        Router::post('/addWebCateinfo', [NewsController::class, 'addWebCateinfo']);
+        Router::post('/upWebCateinfo', [NewsController::class, 'upWebCateinfo']);
+        Router::post('/delWebCateinfo', [NewsController::class, 'delWebCateinfo']);
+        Router::get('/getWebCateinfoList', [NewsController::class, 'getWebCateinfoList']);
+        Router::get('/getWebCateinfoDetail', [NewsController::class, 'getWebCateinfoDetail']);
+        Router::post('/checkWebCateinfo', [NewsController::class, 'checkWebCateinfo']);
     },
     ['middleware' => [FooMiddleware::class, \App\Middleware\Auth\SensitiveMiddleware::class]]
 );