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

app/Controller/NewsController.php

@@ -571,7 +571,7 @@ class NewsController extends AbstractController
         $userInfo = $this->userServiceClient->getUserInfo((int)$user_id);
         var_dump("用户信息：", $userInfo);
         $type_id = $userInfo['data']['type_id']; //'1:个人会员 2：政务会员 3：企业会员 4:调研员 10000：管理员 20000：游客（小程序）'
-        $requireData['type_id'] = $type_id;
+        $requireData['user_type_id'] = $type_id; //重名了
         $requireData['user_id'] = $user_id;
 
         if ($validator->fails()) {
@@ -922,6 +922,7 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        $requireData['user_id'] = Context::get("UserId");
         $result = $this->newsServiceClient->getNoticeInfo($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -1034,6 +1035,7 @@ class NewsController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        $requireData['user_id'] = Context::get("UserId");
         $result = $this->newsServiceClient->getComplaintInfo($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -1911,4 +1913,208 @@ class NewsController extends AbstractController
     }
 
     //20250422  书刊音像
+
+
+    // 20250623  项目管理
+    /**
+     * 项目列表
+     * @return array
+     */
+    public function getProjectList()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' => 'required|integer',
+                'pageSize' => 'required|integer',
+                'status' => 'required|integer',
+            ],
+            [
+                'page.required' => 'page不能为空',
+                'page.integer' => 'page必须是整数',
+                'pageSize.required' => 'page_size不能为空',
+                'pageSize.integer' => 'page_size必须是整数',
+                'status.required' => 'status不能为空',
+                'status.integer' => 'status必须是整数',
+            ]
+
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get('UserId');
+        $result = $this->newsServiceClient->getProjectList($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }    
+    /**
+     * 添加项目
+     * @return array
+     */
+    public function addProject(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_id' => 'required|integer',
+                'category_id' => 'required|integer',
+                'cat_arr_id' => 'required',
+                'title' => 'required',
+                'business_name' => 'required',
+                'content_person' => 'required',
+                'telephone' => 'required',
+                'city_id' => 'required',
+                'city_arr_id' => 'required',
+                'introduce' => 'required',
+                'franchise_details' => 'required',
+            ],
+            [
+                'website_id.required' => '网站id不能为空',
+                'website_id.integer' => '网站id必须是整数',
+                'category_id.required' => '栏目id不能为空',
+                'category_id.integer' => '栏目id必须是整数',
+                'cat_arr_id.required' => '栏目集合不能为空',
+                'title.required' => '标题不能为空',
+                'business_name.required' => '企业名称不能为空',
+                'content_person.required' => '联系人不能为空',
+                'telephone.required' => '联系电话不能为空',
+                'city_id.required' => '城市id不能为空',
+                'city_id.integer' => '城市id必须是整数',
+                'city_arr_id.required' => '城市不能为空',
+                'introduce.required' => '企业介绍不能为空',
+                'franchise_details.required' => '加盟详情不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get('UserId');
+        $result = $this->newsServiceClient->addProject($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 更新项目
+     * @return array
+     */
+    public function upProject(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required|integer',
+                'website_id' => 'required|integer',
+                'category_id' => 'required|integer',
+                'cat_arr_id' => 'required',
+                'title' => 'required',
+                'business_name' => 'required',
+                'content_person' => 'required',
+                'telephone' => 'required',
+                'city_id' => 'required',
+                'city_arr_id' => 'required',
+                'introduce' => 'required',
+                'franchise_details' => 'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+                'id.integer' => 'id必须是整数',
+                 'website_id.required' => '网站id不能为空',
+                'website_id.integer' => '网站id必须是整数',
+                'category_id.required' => '栏目id不能为空',
+                'category_id.integer' => '栏目id必须是整数',
+                'cat_arr_id.required' => '栏目集合不能为空',
+                'title.required' => '标题不能为空',
+                'business_name.required' => '企业名称不能为空',
+                'content_person.required' => '联系人不能为空',
+                'telephone.required' => '联系电话不能为空',
+                'city_id.required' => '城市id不能为空',
+                'city_id.integer' => '城市id必须是整数',
+                'city_arr_id.required' => '城市不能为空',
+                'introduce.required' => '企业介绍不能为空',
+                'franchise_details.required' => '加盟详情不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get('UserId');
+        $result = $this->newsServiceClient->upProject($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 删除项目
+     * @return array
+     */
+    public function delProject(){
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required',
+            ],
+            [
+                'id.required' => 'id不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get('UserId');
+        $result = $this->newsServiceClient->delProject($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 审核项目
+     * @return array
+     */
+    public function checkProject(){
+        $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->checkProject($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    } 
+    /**
+     * 获取项目详情
+     * @return array
+     */
+    public function getProjectInfo(){
+        $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);
+        }
+        $result = $this->newsServiceClient->getProjectInfo($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+
 }

app/JsonRpc/NewsService.php

@@ -795,4 +795,28 @@ class NewsService extends AbstractServiceClient implements NewsServiceInterface
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    public function getProjectList(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function addProject(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function checkProject(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function delProject(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function upProject(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    public function getProjectInfo(array $data): array
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/NewsServiceInterface.php

@@ -425,4 +425,18 @@ interface NewsServiceInterface
     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);
 }

config/api/news.php

@@ -132,6 +132,14 @@ Router::addGroup(
 
 
         // 20250306 招聘
+
+        // 20250623  项目管理
+        Router::post('/getProjectList', [NewsController::class, 'getProjectList']);
+        Router::post('/addProject', [NewsController::class, 'addProject']);
+        Router::post('/upProject', [NewsController::class, 'upProject']);
+        Router::post('/delProject', [NewsController::class, 'delProject']);
+        Router::post('/checkProject', [NewsController::class, 'checkProject']);
+        Router::post('/getProjectInfo', [NewsController::class, 'getProjectInfo']);
     },
     ['middleware' => [FooMiddleware::class, \App\Middleware\Auth\SensitiveMiddleware::class]]
 );