提测版本

app/Controller/IndexController.php

@@ -24,8 +24,4 @@ class IndexController extends AbstractController
             'message' => "Hello {$user}.",
         ];
     }
-    public function category()
-    {
-        
-    }
 }

app/JsonRpc/PublicRpcService.php

@@ -2,8 +2,8 @@
 namespace App\JsonRpc;
 
 use App\Model\Department;
-use App\Model\LetterOfComplaint;
 use App\Model\District;
+use App\Model\LetterOfComplaint;
 use App\Model\LetterType;
 use App\Model\LevelUser;
 use App\Model\UserLevel;
@@ -114,7 +114,6 @@ class PublicRpcService implements PublicRpcServiceInterface
      */
     public function getLetterOfComplaint(array $data = []): array
     {
-        var_dump("====");
         $where = [];
 
         if (isset($data['user_id']) && !empty($data['user_id'])) {
@@ -123,11 +122,15 @@ class PublicRpcService implements PublicRpcServiceInterface
         if (isset($data['nature']) && !empty($data['nature'])) {
             array_push($where, ['letter_of_complaint.nature', '=', $data['nature']]);
         }
-
-        if (isset($data['nature_level0']) && !empty($data['nature_level0'])) {
-            array_push($where, ['letter_of_complaint.nature_level0', '=', $data['nature_level0']]);
+        if (isset($data['type']) && !empty($data['type'])) {
+            array_push($where, ['letter_of_complaint.type', '=', $data['type']]);
+        }
+        if (isset($data['nature_level']) && !empty($data['nature_level'])) {
+            array_push($where, ['letter_of_complaint.nature_level', '=', $data['nature_level']]);
+        }
+        if (isset($data['type_level']) && !empty($data['type_level'])) {
+            array_push($where, ['letter_of_complaint.type_level', '=', $data['type_level']]);
         }
-
         if (isset($data['status']) && !empty($data['status'])) {
             array_push($where, ['letter_of_complaint.status', '=', $data['status']]);
         }
@@ -135,17 +138,16 @@ class PublicRpcService implements PublicRpcServiceInterface
         if (isset($data['pageSize'])) {
             $rep = LetterOfComplaint::where($where)
                 ->leftJoin("letter_type as type_a", "letter_of_complaint.nature", "type_a.id")
-                ->leftJoin("letter_type as type_c", "letter_of_complaint.nature_level0", "type_c.id")
-                ->leftJoin("letter_type as type_b", "letter_of_complaint.nature_level1", "type_b.id")
-                ->leftJoin("letter_type as type_e", "letter_of_complaint.nature_level3", "type_e.id")
+                ->leftJoin("letter_type as type_b", "letter_of_complaint.type", "type_b.id")
+                ->leftJoin("letter_type as type_c", "letter_of_complaint.nature_level", "type_c.id")
                 ->leftJoin("letter_type as type_d", "letter_of_complaint.status", "type_d.id")
-
+                ->leftJoin("letter_type as type_e", "letter_of_complaint.type_level", "type_e.id")
                 ->select("letter_of_complaint.*",
                     "type_a.type_name as nature_name",
-                    "type_b.type_name as nature_name1",
-                    "type_c.type_name as nature_name0",
+                    "type_b.type_name as type_name",
+                    "type_c.type_name as nature_level_name",
                     "type_d.type_name as status_name",
-                    "type_e.type_name as nature_name3")
+                    "type_e.type_name as type_level_name")
                 ->limit($data['pageSize'])->offset(($data['page'] - 1) * $data['pageSize'])->orderBy("letter_of_complaint.id", "desc")->get();
             $count = LetterOfComplaint::where($where)->count();
             if ($rep) {
@@ -171,17 +173,16 @@ class PublicRpcService implements PublicRpcServiceInterface
         } else {
             $result = LetterOfComplaint::where($where)
                 ->leftJoin("letter_type as type_a", "letter_of_complaint.nature", "type_a.id")
-                ->leftJoin("letter_type as type_c", "letter_of_complaint.nature_level0", "type_c.id")
-                ->leftJoin("letter_type as type_b", "letter_of_complaint.nature_level1", "type_b.id")
-                ->leftJoin("letter_type as type_e", "letter_of_complaint.nature_level3", "type_e.id")
+                ->leftJoin("letter_type as type_b", "letter_of_complaint.type", "type_b.id")
+                ->leftJoin("letter_type as type_c", "letter_of_complaint.nature_level", "type_c.id")
                 ->leftJoin("letter_type as type_d", "letter_of_complaint.status", "type_d.id")
-
+                ->leftJoin("letter_type as type_e", "letter_of_complaint.type_level", "type_e.id")
                 ->select("letter_of_complaint.*",
                     "type_a.type_name as nature_name",
-                    "type_b.type_name as nature_name1",
-                    "type_c.type_name as nature_name0",
+                    "type_b.type_name as type_name",
+                    "type_c.type_name as nature_level_name",
                     "type_d.type_name as status_name",
-                    "type_e.type_name as nature_name3")
+                    "type_e.type_name as type_level_name")
                 ->orderBy("letter_of_complaint.id", "desc")->get();
         }
         return $result ? Result::success($result) : Result::error("没有查到数据");
@@ -272,17 +273,16 @@ class PublicRpcService implements PublicRpcServiceInterface
         }
         $result = LetterOfComplaint::where($where)
             ->leftJoin("letter_type as type_a", "letter_of_complaint.nature", "type_a.id")
-            ->leftJoin("letter_type as type_c", "letter_of_complaint.nature_level0", "type_c.id")
-            ->leftJoin("letter_type as type_b", "letter_of_complaint.nature_level1", "type_b.id")
-            ->leftJoin("letter_type as type_e", "letter_of_complaint.nature_level3", "type_e.id")
+            ->leftJoin("letter_type as type_b", "letter_of_complaint.type", "type_b.id")
+            ->leftJoin("letter_type as type_c", "letter_of_complaint.nature_level", "type_c.id")
             ->leftJoin("letter_type as type_d", "letter_of_complaint.status", "type_d.id")
-
+            ->leftJoin("letter_type as type_e", "letter_of_complaint.type_level", "type_e.id")
             ->select("letter_of_complaint.*",
                 "type_a.type_name as nature_name",
-                "type_b.type_name as nature_name1",
-                "type_c.type_name as nature_name0",
+                "type_b.type_name as type_name",
+                "type_c.type_name as nature_level_name",
                 "type_d.type_name as status_name",
-                "type_e.type_name as nature_name3")
+                "type_e.type_name as type_level_name")
             ->first();
         return Result::success($result);
     }
@@ -316,12 +316,10 @@ class PublicRpcService implements PublicRpcServiceInterface
         if (isset($data['type'])) {
             array_push($where, ['type', '=', $data['type']]);
         }
-        if (isset($data['pid']) && $data['pid']>0) {
-            array_push($where, ['pid', '=', $data['pid']]);
-        }
-        $result = LetterType::where($where)->orderBy('sort','asc')->get();
+        $result = LetterType::where($where)->get();
         return $result ? Result::success($result) : Result::error("没有查到数据");
     }
+
     /**
      * 更新举报类型
      * @param array $data

app/JsonRpc/WebsiteService.php

@@ -1,15 +1,8 @@
 <?php
-
 namespace App\JsonRpc;
-use App\Model\Ad;
-use App\Model\AdPlace;
-use App\Model\Department;
-use App\Model\District;
-use App\Model\Link;
 use App\Model\Article;
 use App\Model\Category;
 use App\Model\LetterOfComplaint;
-
 use App\Model\TemplateClass;
 use App\Model\Template;
 use App\Model\User;
@@ -21,10 +14,6 @@ use Hyperf\DbConnection\Db;
 use Hyperf\RpcServer\Annotation\RpcService;
 use App\Tools\Result;
 use App\Model\WebsiteCategory;
-use Carbon\Carbon;
-use Directory;
-use MathPHP\Exception\FunctionFailedToConvergeException;
-
 use function PHPUnit\Framework\isNull;
 
 #[RpcService(name: "WebsiteService", protocol: "jsonrpc-http", server: "jsonrpc-http")]
@@ -96,9 +85,9 @@ class WebsiteService implements WebsiteServiceInterface
     }
 
     /**
-     * @param int $id  
-     * @param array $data  
-     * @return array  
+     * @param int $id
+     * @param array $data
+     * @return array
      */
     public function updateWebsite(int $id,array $data): array
     {
@@ -126,7 +115,7 @@ class WebsiteService implements WebsiteServiceInterface
     }
 
     /**
-     * @param int $id  
+     * @param int $id
      * @return array
      */
     public function delWebsite(int $id): array
@@ -460,18 +449,17 @@ class WebsiteService implements WebsiteServiceInterface
     }
 
     /**
-     * 查询网站下面的导航   
+     * 查询网站下面的导航
      * @param array $data
      * @return array
      */
     public function getWebsiteCategory(array $data): array
     {
-       
         $where = [
             'website_id'=>$data['website_id'],
             'pid'=>0
         ];
-        $result = WebsiteCategory::where($where)->limit($data['pageSize'])->orderBy('sort','asc')->get();
+        $result = WebsiteCategory::where($where)->orderBy('sort','asc')->get();
         if(empty($result)){
             return Result::error("查询站点栏目失败",0);
         }else{
@@ -479,192 +467,6 @@ class WebsiteService implements WebsiteServiceInterface
         }
     }
 
-     /**
-     * 查询网站的广告  
-     * @param array $data
-     * @return array
-     */
-    public function getWebsiteAdvertisement(array $data): array
-    {
-        $where = [
-            'website_id' => $data['website_id'],
-            'id' => $data['ad_placeid']
-        ];
-        $ad_place = AdPlace::where($where)->orderBy('id','asc')->limit(1)->get();
-        
-            
-        $today = Carbon::now();
-       
-        if(empty($ad_place)){
-            return Result::error("error",0);
-        }else{
-            foreach($ad_place as $val){
-                $adplaceid = $val;
-            }
-            $ad=Ad::where('pid',$adplaceid['id'])->where('status',1)->orderBy('id','asc')->get();
-            if(empty($ad)){
-                $result=$adplaceid;
-                return Result::success($result); 
-            }else{                   
-                foreach($ad as $i)
-                {
-                    $starttime=Carbon::parse($i['fromtime']);
-                    $endtime=Carbon::parse($i['totime']);
-                    $time=$today->between($starttime,$endtime);
-                    if($time)
-                    {
-                        $result=$i;
-                    }
-                }
-                if(empty($result)){
-                    $result=$ad;
-                    return Result::success($result); 
-                }else{
-                    return Result::success($result); 
-                }
-            }
-                
-        } 
-    }
-
-     /**
-     * 
-     * @param array $data
-     * @return array
-     */   
-    /**网站行政职能搜索 */
-    public function selectWebsiteDepartment(array $data): array
-    {
-
-        $depart = Department::where('pid',0)->orderBy('id','asc')->limit(10)->get();
-        if(isset($data['keyword']) && !empty($data['keyword'])){
-            $departments= Department::where('name', 'like', '%' . $data['keyword'] . '%')->get();
-            if(empty($departments)){
-                $result['message']="未查询到与此相关职能部门";
-            }else{
-                $count = Department::where('name','like',"%{$data['keyword']}%")->count();
-                $m = [
-                    'department'=>$depart,
-                    'type'=>$departments,
-                    'count'=>$count
-                ]; 
-            }
-            
-            $result['sele'] = $m;
-            return Result::success($result['sele']); 
-            
-        }
-        $result=$depart;
-        return Result::success($result['data']); 
-    }
-
-    /**
-     * 
-     * @param array $data
-     * @return array
-     */
-    /**
-     * 搜索地区   
-     */
-    public function selectWebsiteArea(array $data): array
-    {
-       
-        $provinces=District::where('pid',0)->where('status',1)->get();
-       
-        if(isset($data['province'])){
-            $province=District::where('pid',0)->where('status',1)->where('id',$data['province'])->orderBy('id')->get();
-            $province=$province->toArray();
-            if(!empty($province)){
-                $citys=District::where('pid',$data['province'])->where('status',1)->orderBy('id')->get();
-                if(!empty($citys) && isset($data['city']) && !empty($data['city'])){
-                    // $province = $province->toArray();
-                    $province_id=[];
-                    foreach($province as $val){
-                        array_push($province_id,$val['id']);
-                    }
-                    // var_dump($province_id);
-                    $city=District::whereIn('pid',$province_id)->where('status',1)->where('id',$data['city'])->orderBy('id')->get();
-                    if(!empty($city)){
-                        $city_id=[];
-                        foreach($city as $val){
-                            array_push($city_id,$val['id']);
-                        }
-                        $regions=District::whereIn('pid',$city_id)->where('status',1)->orderBy('id')->get();
-                       
-                            $result=[
-                                'province' => $province,
-                                'city' => $city,
-                                'region' => $regions
-                            ];
-                    }else{
-                        return Result::error("未查询到此城市",0); 
-                    }
-                }else{
-                    $result=[
-                        'province' => $province,
-                        'city' => $citys,
-                        'region' => null
-                    ];
-                }
-            }else{
-                return Result::error("未查询到此省份",0);
-            }
-        }else{
-            // $keys = array('data');
-           $result =  $provinces;
-        }
-        return Result::success($result);  
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    //获取栏目  
-    public function getWebsiteModelCategory(array $data): array
-    {
-        $website_id=[
-            'website_id' => $data['website_id']
-        ];
-        $placeid=$data['placeid']-1;
-        $pid=[
-            'pid' => $data['pid'],
-        ];
-        $num = $data['num'];
-        
-        $result=WebsiteCategory::where($website_id)->where($pid)->orderBy('sort')->offset($placeid)->limit($num)->get();
-        $result = $result->toArray();
-        if(!empty($result)){
-            return Result::success($result); 
-        }else{
-            return Result::error("本网站暂无栏目",0);
-        }
-
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    //获取友情链接   
-    public function selectWebsiteLinks(array $data): array
-    {
-        $where = [
-            'website_id' => $data['website_id'],
-            'status' => 1,
-            'type' => $data['type']
-        ];
-        $num=$data['num'];
-        $result=Link::where($where)->orderBy('id')->limit($num)->get();
-        if(!empty($result)){
-            return Result::success($result); 
-        }else{
-            return Result::error("本网站暂无此类型友情链接",0);
-        }
-
-    }
-
-
     /**
      * 网站首页数据统计， 管理员
      * @return void

app/JsonRpc/WebsiteServiceInterface.php

@@ -68,10 +68,4 @@ interface WebsiteServiceInterface
     public function upWebsiteCategoryones(array $data): array;
     public function getWebsiteAllCategory(array $data): array;
 
-
-    public function getWebsiteAdvertisement(array $data): array;
-    public function selectWebsiteDepartment(array $data): array;
-    public function selectWebsiteArea(array $data): array;
-    public function getWebsiteModelCategory(array $data): array;
-    public function selectWebsiteLinks(array $data): array;
 }

app/Model/Department.php

@@ -1,6 +1,6 @@
 <?php
 
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace App\Model;
 

app/Tools/Result.php

@@ -23,4 +23,5 @@ class Result
             'data' => $data,
         ];
     }
+    
 }