Merge remote-tracking branch 'origin/20241023_lj_zhinengbumen' into dev

app/Controller/PublicController.php

@@ -1,18 +1,19 @@
 <?php
-declare(strict_types=1);
+declare (strict_types = 1);
 namespace App\Controller;
 
 use App\JsonRpc\PublicRpcServiceInterface;
-use Hyperf\Di\Annotation\Inject;
-use App\Tools\Result;
 use App\Tools\CommonService;
-use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use App\Tools\PublicData;
+use App\Tools\Result;
+use function Hyperf\Support\env;
+use Hyperf\Context\Context;
+use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\HttpServer\Contract\ResponseInterface;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface;
 use ZipArchive;
-use function Hyperf\Support\env;
-use Hyperf\Context\Context;
+
 /**
  * Class PublicController
  * @package App\Controller
@@ -35,9 +36,9 @@ class PublicController extends AbstractController
      */
     public function getDistrictList()
     {
-        $pid = $this->request->input("pid",0);
+        $pid = $this->request->input("pid", 0);
         $data = [
-            'pid'=>$pid
+            'pid' => $pid,
         ];
         $result = $this->publicServiceClient->getDistrictList($data);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
@@ -62,16 +63,16 @@ class PublicController extends AbstractController
     {
         $urlN = new CommonService();
         $file = $this->request->file('file');
-        $fileName = $this->request->input("fileName",'');
+        $fileName = $this->request->input("fileName", '');
         try {
             if ($file == null) {
-               return  Result::error("未找到上传文件");
+                return Result::error("未找到上传文件");
             }
-            $data = CommonService::uploadFile($file, ['png','jpg','png','jpeg','gif','xls', 'xlsx', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'ppt', 'zip', 'pptx', 'mp4', 'flv'], 'image');
+            $data = CommonService::uploadFile($file, ['png', 'jpg', 'png', 'jpeg', 'gif', 'xls', 'xlsx', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'ppt', 'zip', 'pptx', 'mp4', 'flv'], 'image');
 
             $data['imgUrl'] = $urlN->imgUrl($data['src']);
             $data['oldFileName'] = $fileName;
-            return  Result::success($data, '上传成功');
+            return Result::success($data, '上传成功');
         } catch (\Exception $e) {
             return Result::error($e->getMessage());
 
@@ -93,7 +94,7 @@ class PublicController extends AbstractController
                 'name.required' => '等级名不能为空',
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
@@ -110,13 +111,13 @@ class PublicController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id' => 'required'
+                'id' => 'required',
             ],
             [
-                'id.required' => 'ID不能为空'
+                'id.required' => 'ID不能为空',
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
@@ -134,14 +135,14 @@ class PublicController extends AbstractController
             $requireData,
             [
                 'name' => 'required',
-                'id' => 'required'
+                'id' => 'required',
             ],
             [
                 'id.required' => 'ID不能为空',
-                'name.required' => '名称不能为空'
+                'name.required' => '名称不能为空',
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
@@ -172,12 +173,12 @@ class PublicController extends AbstractController
             [
                 'title' => 'required',
                 'nature' => 'required',
-                'nature_level'=> 'required',
-                'type'=> 'required',
-                'name'=> 'required',
-                'mobile'=> 'required',
-                'describe'=> 'required',
-                'type_level'=> 'required',
+                'nature_level' => 'required',
+                'type' => 'required',
+                'name' => 'required',
+                'mobile' => 'required',
+                'describe' => 'required',
+                'type_level' => 'required',
             ],
             [
                 'title.required' => '标题不能为空',
@@ -190,15 +191,15 @@ class PublicController extends AbstractController
                 'type_level.required' => '类型进度不能为空',
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
         $requireData = $this->request->all();
-        $requireData['user_id'] =Context::get("UserId");
-        if($requireData['id']){
+        $requireData['user_id'] = Context::get("UserId");
+        if ($requireData['id']) {
             $result = $this->publicServiceClient->userUpLetterOfComplaint($requireData);
-        }else{
+        } else {
             $result = $this->publicServiceClient->addLetterOfComplaint($requireData);
         }
 
@@ -221,13 +222,13 @@ class PublicController extends AbstractController
                 'id.required' => 'id不能为空',
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
         var_dump($requireData);
-        if(isset($requireData['is_admin']) && !empty($requireData['is_admin'])){
-            $requireData['admin_id'] =Context::get("UserId");
+        if (isset($requireData['is_admin']) && !empty($requireData['is_admin'])) {
+            $requireData['admin_id'] = Context::get("UserId");
         }
         $result = $this->publicServiceClient->upLetterOfComplaint($requireData);
         return $result ? Result::success([]) : Result::error($result['message']);
@@ -241,9 +242,9 @@ class PublicController extends AbstractController
 
         $requireData = $this->request->all();
         $requireData['user_id'] = Context::get("UserId");
-        var_dump("用户id：",Context::get("UserId"));
-        if(isset($requireData['is_admin']) && !empty($requireData['is_admin'])){
-            unset( $requireData['user_id']);
+        var_dump("用户id：", Context::get("UserId"));
+        if (isset($requireData['is_admin']) && !empty($requireData['is_admin'])) {
+            unset($requireData['user_id']);
         }
         $result = $this->publicServiceClient->getLetterOfComplaint($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
@@ -256,16 +257,16 @@ class PublicController extends AbstractController
     public function getLetterOfComplaintInfo()
     {
         $requireData = $this->request->all();
-        $requireData['user_id'] =Context::get("UserId");
-        if(isset($requireData['is_admin']) && !empty($requireData['is_admin'])){
-            unset( $requireData['user_id']);
+        $requireData['user_id'] = Context::get("UserId");
+        if (isset($requireData['is_admin']) && !empty($requireData['is_admin'])) {
+            unset($requireData['user_id']);
         }
         $result = $this->publicServiceClient->getLetterOfComplaintInfo($requireData);
-        if($result){
-            $result['data']['judgment'] = $result['data']['judgment']?json_decode($result['data']['judgment']):'';
-            $result['data']['audio_and_video'] =  $result['data']['audio_and_video']?json_decode($result['data']['audio_and_video']):'';
-            $result['data']['contract'] =  $result['data']['contract']?json_decode($result['data']['contract']):'';
-            $result['data']['qualifications'] =  $result['data']['qualifications']?json_decode($result['data']['qualifications']):'';
+        if ($result) {
+            $result['data']['judgment'] = $result['data']['judgment'] ? json_decode($result['data']['judgment']) : '';
+            $result['data']['audio_and_video'] = $result['data']['audio_and_video'] ? json_decode($result['data']['audio_and_video']) : '';
+            $result['data']['contract'] = $result['data']['contract'] ? json_decode($result['data']['contract']) : '';
+            $result['data']['qualifications'] = $result['data']['qualifications'] ? json_decode($result['data']['qualifications']) : '';
         }
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -277,9 +278,9 @@ class PublicController extends AbstractController
     public function delLetterOfComplaint()
     {
         $requireData = $this->request->all();
-        $requireData['user_id'] =Context::get("UserId");
-        if(isset($requireData['is_admin']) && !empty($requireData['is_admin'])){
-            unset( $requireData['user_id']);
+        $requireData['user_id'] = Context::get("UserId");
+        if (isset($requireData['is_admin']) && !empty($requireData['is_admin'])) {
+            unset($requireData['user_id']);
         }
         $result = $this->publicServiceClient->delLetterOfComplaint($requireData);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
@@ -310,42 +311,41 @@ class PublicController extends AbstractController
                 'files.required' => '文件不能为空',
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['fileName'] = $requireData['fileName']??'政讯通';
+        $requireData['fileName'] = $requireData['fileName'] ?? '政讯通';
         //打包文件
         $zip = new ZipArchive();
         $fileType = 'zip';
         $date = date('Ymd');
-        $filePath =  $fileType . DIRECTORY_SEPARATOR . $date ;
+        $filePath = $fileType . DIRECTORY_SEPARATOR . $date;
         $allDir = 'public' . DIRECTORY_SEPARATOR . $filePath;
         if (!is_dir($allDir)) {
             if (!mkdir($allDir, 0755, true)) {
                 return Result::error('创建文件夹失败');
             }
         }
-        $fileName = $requireData['fileName'].time().mt_rand(1, 1000000) . '.zip';
-        $zipFileName = $allDir.DIRECTORY_SEPARATOR.$requireData['fileName'].time().mt_rand(1, 1000000) . '.zip';
+        $fileName = $requireData['fileName'] . time() . mt_rand(1, 1000000) . '.zip';
+        $zipFileName = $allDir . DIRECTORY_SEPARATOR . $requireData['fileName'] . time() . mt_rand(1, 1000000) . '.zip';
 //        $zipFileName = 'public/zip/files.zip';
 
-
-        if ($zip->open($zipFileName, ZipArchive::CREATE) === TRUE) {
+        if ($zip->open($zipFileName, ZipArchive::CREATE) === true) {
             // 将要下载的文件逐个添加到zip文件中
 //            $string = trim($requireData['files'], "[]'"); // 去掉最外层的方括号和单引号（注意：这里假设了单引号，如果是双引号则替换为 "）
 //            $string = str_replace("'", '', $string); // 去掉所有剩余的单引号（如果原字符串中使用的是双引号，则替换为双引号）
 //            $filePaths = explode(',', $string);
             foreach ($requireData['files'] as $filePathu) {
-                $attachmentItem = 'public/'.$filePathu;
+                $attachmentItem = 'public/' . $filePathu;
                 $zip->addFile($attachmentItem, pathinfo($attachmentItem, PATHINFO_BASENAME));
             }
             // 关闭zip文件
             $zip->close();
             // 将zip文件提供给用户进行下载
 //            readfile($zipFileName);
-            $fileUrlName =  explode("public", $zipFileName);
-            return Result::success(['fileUrl'=>env('HOST').$fileUrlName[1]]);
+            $fileUrlName = explode("public", $zipFileName);
+            return Result::success(['fileUrl' => env('HOST') . $fileUrlName[1]]);
         } else {
             return Result::error('无法创建zip文件');
         }
@@ -367,13 +367,13 @@ class PublicController extends AbstractController
                 'id.required' => 'id不能为空',
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] =Context::get("UserId");
+        $requireData['user_id'] = Context::get("UserId");
         $result = $this->publicServiceClient->checkMeasure($requireData);
-        return $result['code']==200 ? Result::success() : Result::error("已经处理了");
+        return $result['code'] == 200 ? Result::success() : Result::error("已经处理了");
     }
 
     /**
@@ -392,17 +392,195 @@ class PublicController extends AbstractController
                 'pid.required' => 'id不能为空',
             ]
         );
-        if ($validator->fails()){
+        if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
 
         $result = $this->publicServiceClient->getDepartment($requireData);
-        return $result['code']==200 ? Result::success($result['data']) : Result::error("查询失败");
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
     }
 
+    /**
+     * 获取职能部门
+     * @return array
+     */
+    public function getZhinengbumenList()
+    {
 
+        // 获取请求参数
+        $requireData = $this->request->all();
 
+        // 参数验证
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'page' => 'integer|min:1',
+                'pagesize' => 'integer|min:1',
+                'search' => 'string|nullable',
+            ],
+            [
+                'page.integer' => 'page 必须是整数',
+                'page.min' => 'page 必须大于等于 1',
+                'pagesize.integer' => 'pagesize 必须是整数',
+                'pagesize.min' => 'pagesize 必须大于等于 1',
+                'search.string' => 'search 必须是字符串',
+            ]
+        );
+
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+
+        // 添加用户 ID
+        $requireData['user_id'] = Context::get("UserId");
+
+        // 调用服务客户端方法获取分页数据
+        $result = $this->publicServiceClient->getZhinengbumenList($requireData);
 
+        // 处理结果
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
+    }
+
+    /**
+     * 添加职能部门
+     * @return array
+     */
+    public function addZhinengbumen()
+    {
+        // 获取请求参数
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'name' => 'required|string|regex:/^[\x{4e00}-\x{9fa5}]+$/u',
+                'pid' => 'required|integer',
+            ],
+            [
+                'name.required' => 'name 不能为空',
+                'name.string' => 'name 必须是字符串',
+                'name.regex' => 'name 必须是汉字',
+                'pid.required' => 'pid 不能为空',
+                'pid.integer' => 'pid 必须是整数',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        // $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->addZhinengbumen($requireData);
+        return $result['code'] == 200 ? Result::success() : Result::error("添加失败");
+    }
+    /**
+     * 删除职能部门
+     * @return array
+     */
+    public function delZhinengbumen()
+    {
+        $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->publicServiceClient->delZhinengbumen($requireData);
+        return $result['code'] == 200 ? Result::success() : Result::error("删除失败");
+    }
+    /**
+     * 职能部门详情
+     * @return array
+     */
+    public function getZhinengbumen()
+    {
+        $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->publicServiceClient->getZhinengbumen($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
+    }
+    /**
+     * 获取职能部门某pid的所有子级，默认0级
+     * @return array
+     */
+    public function getPidZhinengbumen()
+    {
+        // 获取请求参数
+        $requireData = $this->request->all();
+
+        // 参数验证
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'pid' => 'integer|min:0',
+            ],
+            [
+                'pid.integer' => 'pid 必须是整数',
+                'pid.min' => 'pid 必须大于等于 0',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->getPidZhinengbumen($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error("查询失败");
+    }
+    /**
+     * 修改职能部门名称
+     * @return array
+     */
+    public function modZhinengbumen()
+    {
+        $requireData = $this->request->all();
+
+        // 参数验证
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id' => 'required|integer',
+                'name' => 'required|string|regex:/^[\x{4e00}-\x{9fa5}]+$/u',
+            ],
+            [
+                'id.required' => 'id 不能为空',
+                'id.integer' => 'id 必须是整数',
+                'name.required' => 'name 不能为空',
+                'name.string' => 'name 必须是字符串',
+                'name.regex' => 'name 必须是汉字',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $requireData['user_id'] = Context::get("UserId");
+        $result = $this->publicServiceClient->upZhinengbumen($requireData);
+        return $result['code'] == 200 ? Result::success() : Result::error("修改失败");
+    }
+}

app/Controller/WebController.php

@@ -1,18 +1,15 @@
 <?php
-declare(strict_types=1);
+declare (strict_types = 1);
 namespace App\Controller;
 
+use App\Constants\ErrorCode;
 use App\JsonRpc\NewsServiceInterface;
 use App\JsonRpc\WebsiteServiceInterface;
-use App\Tools\PublicData;
-use Hyperf\Di\Annotation\Inject;
 use App\Tools\Result;
-use Hyperf\Validation\Contract\ValidatorFactoryInterface;
-use App\Constants\ErrorCode;
-use App\Controller\PublicController;
 use Hyperf\Context\Context;
-use Hyperf\HttpServer\Contract\RequestInterface;
-use Hyperf\HttpServer\Contract\ResponseInterface;
+use Hyperf\Di\Annotation\Inject;
+use Hyperf\Validation\Contract\ValidatorFactoryInterface;
+
 /**
  * Class WebController
  * @package App\Controller
@@ -34,435 +31,24 @@ class WebController extends AbstractController
     #[Inject]
     private $websiteServiceClient;
 
-    private $PublicController;
-
-    public function __construct(PublicController $PublicController)
-    {
-        $this->PublicController = $PublicController;
-    }
     /**
      * 获取栏目导航
      * @return array
      */
     public function getWebsiteCategory()
     {
+
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'pageSize' => 'required'
-            ],
-            [
-                'pageSize.required' => '显示条数不能为空'
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
         $data = [
-            'website_id'=>Context::get("SiteId"),
-            'pageSize'=>$requireData['pageSize']
+            'website_id' => Context::get("SiteId"),
+            'pageSize' => $requireData['pageSize'],
         ];
         // var_dump("网站id：",Context::get("SiteId"));
         $result = $this->websiteServiceClient->getWebsiteCategory($data);
         if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
-    }
-    /**
-     * 获取各省名称
-     */
-    public function getWebsiteDistrit()
-    {
-        $data= [
-            'pid' => 0,
-            'website_id'=>Context::get("SiteId")
-        ];
-        $result=$this->PublicController->getDistrictList($data);
-        
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        // var_dump($result['data']);
-        return Result::success($result['data']);
-        
-    }
-     /**
-     * 获取广告1
-     * @return array
-     */
-    public function getWebsiteAdvertisement()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'adPlace' => 'required'
-            ],
-            [
-                'adPlace.required' => '广告位置编号不能为空'
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = [
-            'website_id'=>Context::get("SiteId"),
-            'ad_placeid'=>$requireData['adPlace']
-        ]; 
-        
-        $result = $this->websiteServiceClient->getWebsiteAdvertisement($data);
-
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
-    }
-    /**
-     * 搜索并获取职能部门
-     */
-    public function selectWebsiteDepartment(){
-        $requireData = $this->request->all();
-        $data = [
-            
-            'website_id'=>Context::get("SiteId")
-        ]; 
-       
-        if(!empty($requireData)){
-            $data = [
-                'keyword'=>$requireData['keyword'],
-                'website_id'=>Context::get("SiteId")
-            ]; 
-        }
-   
-        $result = $this->websiteServiceClient->selectWebsiteDepartment($data);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
-    }
-    /**
-     *各省市查询 
-     */
-    public function selectWebsiteArea()
-    {
-        $requireData = $this->request->all();
-       
-        $data=[];
-        if(!empty($requireData)){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'province' => 'required'
-                ],
-                [
-                    'province.required' => '请先选择省份'
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-            $data=[
-                'province' => $requireData['province']
-            ];
-            if(isset($requireData['city'])){
-                
-                $data=[
-                    'city' => $requireData['city'],
-                    'province' => $requireData['province']
-                    
-                ];
-                
-                if(isset($requireData['region'])){
-                    $data=[
-                        'province' => $requireData['province'],
-                        'city' => $requireData['city'],
-                        'region' => $requireData['region']
-                    ];
-                }
-            }
-        }
-        $result = $this->websiteServiceClient->selectWebsiteArea($data);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
-    }
-    /**
-     * 获取新闻
-     */
-    public function getWebsiteArticlett()
-    {
-       
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'level' => 'required',
-                'pageSize' => 'required',
-            ],
-            [
-                'level.required' => '新闻类型不能为空',
-                'pageSize.required' => '显示条数不能为空',
-
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        if(isset($requireData['placeid']) && !empty($requireData['placeid'])){
-            $data =[
-            'website_id'=>Context::get("SiteId"),
-            'level'=>$requireData['level'],
-            'pageSize'=>$requireData['pageSize'],
-            'placeid' => $requireData['placeid']
-            ];
-            
-        }else{
-            $data = [
-                'website_id'=>Context::get("SiteId"),
-                'level'=>$requireData['level'],
-                'pageSize'=>$requireData['pageSize']
-            ]; 
-        }
-        $result = $this->newsServiceClient->getWebsiteArticlett($data);
-        // var_dump($result);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
-        
-    }
-     /**
-     * 获取模块新闻
-     */
-    public function getWebsiteModelArticles()
-    {
-        $requireData = $this->request->all();     
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'catid' => 'required',
-                'level' => 'required',
-                'pagesize' => 'required'
-            ],
-            [
-                'catid.required' => '栏目id不能为空',
-                'level.required' => '新闻类型不能为空',
-                'pagesize.required' => '新闻条数不能为空'
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-
-        if(isset($requireData['placeid']) && !empty($requireData['placeid'])){
-            $data =[
-                'website_id'=>Context::get("SiteId"),
-                'catid' => $requireData['catid'],
-                'level' => $requireData['level'],
-                'pagesize' => $requireData['pagesize'],
-                'placeid' => $requireData['placeid']
-            ];
-        }else{
-            $data = [
-                'website_id'=>Context::get("SiteId"),
-                'catid' => $requireData['catid'],
-                'level' => $requireData['level'],
-                'pagesize' => $requireData['pagesize']
-            ];   
-        }      
-        $result = $this->newsServiceClient->getWebsiteModelArticles($data);
-        // var_dump($result);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
-    }
-    /**
-     * 获取模块栏目
-     */
-    public function getWebsiteModelCategory()
-    {
-        $requireData = $this->request->all();     
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'placeid' => 'required',
-                'pid' => 'required',
-                'num' => 'required'
-            ],
-            [
-                'placeid.required' => '栏目位置不能为空',
-                'pid' => '栏目类型不能为空',
-                'num' => '父级栏目数量'
-            ]
-        );
-        
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = [
-            'website_id'=>Context::get("SiteId"),
-            'placeid' => $requireData['placeid'],
-            'pid' => $requireData['pid'],
-            'num' => $requireData['num']
-        ];    
-        $result=$this->websiteServiceClient->getWebsiteModelCategory($data);
-        
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        // var_dump($result['data']);
-        return Result::success($result['data']);
-        
-    }
-     /**
-     * 获取友情链接
-     * @return array
-     */
-    public function selectWebsiteLinks()
-    {
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'type' => 'required',
-                'num' => 'required'
-            ],
-            [
-                'type.required' => '友情链接类型不能为空',
-                'num.required' => '友情链接数量不能为空'
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = [
-            'website_id'=>Context::get("SiteId"),
-            'type'=>$requireData['type'],
-            'num' =>$requireData['num']
-        ];
-        $result = $this->websiteServiceClient->selectWebsiteLinks($data);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        return Result::success($result['data']);
-    }
-    /**
-     * 获取文章列表
-     */
-    public function getWebsiteArticlesList()
-    {
-       
-        $requireData = $this->request->all();
-        if(isset($requireData['catid'])){
-            $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'catid' => 'required'
-            ],
-            [
-                'catid.required' => '栏目id不能为空'
-
-            ]
-            );
-            $data['catid'] =  $requireData['catid']; 
-        }elseif(isset($requireData['keyword'])){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'keyword' => 'required'
-                ],
-                [
-                    'keyword.required' => '搜索词不能为空'
-    
-                ]
-            );
-            $data['keyword'] =  $requireData['keyword']; 
-        }else{
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'catid' => 'required',
-                    'keyword' => 'required'
-                ],
-                [
-                    'catid.required' => '栏目id不能为空',
-                    'keyword.required' => '搜索词不能为空'
-    
-                ]
-            );
-            $data['catid'] =  $requireData['catid']; 
-            $data['keyword'] =  $requireData['keyword']; 
-        }
-        $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'page' => 'required',
-                    'pageSize' => 'required'
-                ],
-                [
-                    'page.required' => '分页不能为空',
-                    'pageSize.required' => '显示条数不能为空'
-    
-                ]
-            );
-            if ($validator->fails()){
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-            $data['website_id'] = Context::get("SiteId");
-            $data['pageSize'] = $requireData['pageSize']; 
-            $data['page'] = $requireData['page']; 
-        $result = $this->newsServiceClient->getArticleList($data);
-        // var_dump($result);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
-        }
-        // $result = $data; 
-        return Result::success($result['data']);
-        
-    }
-     /**
-     * 获取文章详情
-     */
-    public function selectWebsiteArticleInfo()
-    {
-       
-        $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'articleid' => 'required'
-            ],
-            [
-                'articleid.required' => '新闻id不能为空'
-            ]
-        );
-        if ($validator->fails()){
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
-        }
-        $data = [
-            'website_id'=>Context::get("SiteId"),
-            'id'=>$requireData['articleid'],
-        ]; 
-        $result = $this->newsServiceClient->getArticleInfo($data);
-        // var_dump($result);
-        if ($result['code'] != ErrorCode::SUCCESS) {
-            return Result::error($result['message'],0,[]);
+            return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
-        
     }
 
-}
+}

app/JsonRpc/PublicRpcService.php

@@ -39,7 +39,8 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array
      */
-    public function addUserLevel(array $data){
+    public function addUserLevel(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -48,7 +49,8 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array
      */
-    public function delUserLevel(array $data){
+    public function delUserLevel(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -57,7 +59,8 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array
      */
-    public function updateUserLevel(array $data){
+    public function updateUserLevel(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -65,7 +68,8 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array|mixed
      */
-    public function getLetterOfComplaint(array $data){
+    public function getLetterOfComplaint(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -73,7 +77,8 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array|mixed
      */
-    public function addLetterOfComplaint(array $data){
+    public function addLetterOfComplaint(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -81,7 +86,8 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array|mixed
      */
-    public function upLetterOfComplaint(array $data){
+    public function upLetterOfComplaint(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -89,14 +95,25 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array|mixed
      */
-    public function userUpLetterOfComplaint(array $data){
+    public function userUpLetterOfComplaint(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getLetterOfComplaintInfo(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
+
     /**
      * @param array $data
      * @return array|mixed
      */
-    public function getLetterOfComplaintInfo(array $data){
+    public function delLetterOfComplaint(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -104,7 +121,8 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array|mixed
      */
-    public function delLetterOfComplaint(array $data){
+    public function getLetterType(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -112,7 +130,8 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array|mixed
      */
-    public function getLetterType(array $data){
+    public function upLetterType(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -120,7 +139,8 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array|mixed
      */
-    public function upLetterType(array $data){
+    public function addLetterType(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -128,7 +148,8 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array|mixed
      */
-    public function addLetterType(array $data){
+    public function delLetterType(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -136,7 +157,8 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array|mixed
      */
-    public function delLetterType(array $data){
+    public function checkMeasure(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -144,7 +166,8 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array|mixed
      */
-    public function checkMeasure(array $data){
+    public function getDepartment(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
 
@@ -152,7 +175,40 @@ class PublicRpcService extends AbstractServiceClient implements PublicRpcService
      * @param array $data
      * @return array|mixed
      */
-    public function getDepartment(array $data){
+    public function getZhinengbumenList(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function addZhinengbumen(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getZhinengbumen(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function getPidZhinengbumen(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function delZhinengbumen(array $data)
+    {
         return $this->__request(__FUNCTION__, $data);
     }
-}
+}

app/JsonRpc/PublicRpcServiceInterface.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace App\JsonRpc;
+
 interface PublicRpcServiceInterface
 {
     /**
@@ -98,4 +99,34 @@ interface PublicRpcServiceInterface
      */
     public function getDepartment(array $data);
 
-}
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getZhinengbumenList(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function addZhinengbumen(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getZhinengbumen(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getPidZhinengbumen(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function delZhinengbumen(array $data);
+
+}

config/api/public.php

@@ -1,9 +1,10 @@
 <?php
 
-declare(strict_types=1);
+declare (strict_types = 1);
 use App\Controller\PublicController;
-use Hyperf\HttpServer\Router\Router;
 use App\Middleware\Auth\FooMiddleware;
+use Hyperf\HttpServer\Router\Router;
+
 Router::addRoute(['GET', 'POST'], '/verifyCode', 'App\Controller\IndexController@verifyCode');
 
 Router::addGroup(
@@ -17,13 +18,19 @@ Router::addGroup(
         Router::get('/getCityList', [PublicController::class, 'getCityList']);
         //添加投诉举报
         Router::post('/addComplaint', [PublicController::class, 'addComplaint']);
+
         //修改投诉举报
-        Router::addRoute(['GET', 'POST'],'/upComplaint', [PublicController::class, 'upComplaint']);
+        Router::addRoute(['GET', 'POST'], '/upComplaint', [PublicController::class, 'upComplaint']);
         //投诉举报列表
-        Router::addRoute(['GET', 'POST'],'/getComplaint', [PublicController::class, 'getComplaint']);
+        Router::addRoute(['GET', 'POST'], '/getComplaint', [PublicController::class, 'getComplaint']);
         //查看投诉举报信息
-        Router::addRoute(['GET', 'POST'],'/getLetterOfComplaintInfo', [PublicController::class, 'getLetterOfComplaintInfo']);
+        Router::addRoute(['GET', 'POST'], '/getLetterOfComplaintInfo', [PublicController::class, 'getLetterOfComplaintInfo']);
         //删除投诉举报信息
+
+        Router::post('/upComplaint', [PublicController::class, 'upComplaint']);
+        Router::addRoute(['GET', 'POST'], '/getComplaint', [PublicController::class, 'getComplaint']);
+        Router::addRoute(['GET', 'POST'], '/getLetterOfComplaintInfo', [PublicController::class, 'getLetterOfComplaintInfo']);
+
         Router::post('/delLetterOfComplaint', [PublicController::class, 'delLetterOfComplaint']);
         //获取类型
         Router::get('/getLetterType', [PublicController::class, 'getLetterType']);
@@ -34,6 +41,13 @@ Router::addGroup(
         //获取职能部门
         Router::get('/getDepartment', [PublicController::class, 'getDepartment']);
 
+        Router::post('/getZhinengbumenList', [PublicController::class, 'getZhinengbumenList']);
+        Router::post('/addZhinengbumen', [PublicController::class, 'addZhinengbumen']);
+        Router::post('/delZhinengbumen', [PublicController::class, 'delZhinengbumen']);
+        Router::post('/getZhinengbumen', [PublicController::class, 'getZhinengbumen']);
+        Router::post('/modZhinengbumen', [PublicController::class, 'modZhinengbumen']);
+        Router::post('/getPidZhinengbumen', [PublicController::class, 'getPidZhinengbumen']);
+
     },
     ['middleware' => [FooMiddleware::class]]
 );