rkljw 5 mesi fa
parent
commit
3925d77a94

+ 0 - 223
app/JsonRpc/NewsService.php

@@ -1,223 +0,0 @@
-<?php
-namespace App\JsonRpc;
-
-use App\Model\Article;
-use App\Model\ArticleData;
-use App\Model\Category;
-use Hyperf\DbConnection\Db;
-use Hyperf\RpcServer\Annotation\RpcService;
-use App\Tools\Result;
-
-#[RpcService(name: "NewsService", protocol: "jsonrpc-http", server: "jsonrpc-http")]
-class NewsService implements NewsServiceInterface
-{
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function getCategoryList(array $data): array
-    {
-        $where = [
-            ['name','like','%'.$data['keyWord'].'%'],
-            ['website_id','=',$data['website_id']],
-            ['pid','=',$data['pid']??0]
-        ];
-        $rep = Category::where($where)->limit($data['pageSize'])->orderBy("sort","asc")->offset(($data['page']-1)*$data['pageSize'])->get();
-        $count =  Category::where($where)->count();
-        $data = [
-            'rows'=>$rep->toArray(),
-            'count'=>$count
-        ];
-        if(empty($rep->toArray())){
-            return Result::error("没有栏目数据");
-        }
-        return Result::success($data);
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function categoryList(array $data): array
-    {
-       $result =  Category::where($data)->get();
-        if(empty($result)){
-            return Result::error("没有栏目数据");
-        }
-        return Result::success($result);
-    }
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function addCategory(array $data): array
-    {
-        $id = Category::insertGetId($data);
-        if(empty($id)){
-            return Result::error("添加失败");
-        }
-        return Result::success(['id'=>$id]);
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function delCategory(array $data): array
-    {
-        $categoryList = Category::where(['pid'=>$data['id']])->get();
-        var_dump("分类列表:",$data,$categoryList);
-        if($categoryList->toArray()){
-            return Result::error("分类下面有子分类不能删除");
-        }
-        $articleList = Article::where(['catid'=>$data['id']])->get();
-        var_dump("文章列表:",$articleList);
-        if($articleList->toArray()){
-            return Result::error("分类下面有资讯不能删除");
-        }
-        $result = Category::where($data)->delete();
-        if(!$result){
-            return Result::error("删除失败");
-        }
-        return Result::success($result);
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function updateCategory(array $data): array
-    {
-        $where = [
-            'id'=>$data['id']
-        ];
-        $result = Category::where($where)->update($data);
-        if($result){
-            return Result::success($result);
-        }else{
-            return Result::error("更新失败");
-        }
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function getArticleList(array $data): array
-    {
-        var_dump("资讯:",$data);
-        $where= [];
-        if(isset($data['keyWord'])){
-            $where[] =   ['article.title','like','%'.$data['keyWord'].'%'];
-            $where[] =   ['article.status','!=','5'];
-        }
-        $rep = Article::where($where)
-            ->leftJoin('category','article.catid','category.id')
-            ->leftJoin("article_data","article.id","article_data.article_id")
-            ->select("article.*","category.name","article_data.content")
-            ->orderBy("article.id","desc")
-            ->limit($data['pageSize'])
-            ->offset(($data['page']-1)*$data['pageSize'])->get();
-        $count =  Article::where($where)->count();
-        $data = [
-            'rows'=>$rep->toArray(),
-            'count'=>$count
-        ];
-        if(empty($rep)){
-            return Result::error("没有信息数据");
-        }
-        return Result::success($data);
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function addArticle(array $data): array
-    {
-        Db::beginTransaction();
-        try{
-
-        $data['cat_arr_id'] = isset($data['cat_arr_id'])?json_encode($data['cat_arr_id']):'';
-        $data['tag'] = isset($data['tag'])?json_encode($data['tag']):'';
-            $articleData = $data;
-            unset($articleData['content']);
-            $id = Article::insertGetId($articleData);
-            $articleDataContent = [
-                'article_id'=>$id,
-                'content'=>$data['content']
-            ];
-            ArticleData::insertGetId($articleDataContent);
-            Db::commit();
-        } catch(\Throwable $ex){
-            Db::rollBack();
-            var_dump($ex->getMessage());
-            return Result::error("创建失败",0);
-        }
-
-        return Result::success(['id'=>$id]);
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function delArticle(array $data): array
-    {
-        $result = Article::where($data)->update(['status'=>5]);
-        if(!$result){
-            return Result::error("删除失败");
-        }
-        return Result::success($result);
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function updateArticle(array $data): array
-    {
-        Db::beginTransaction();
-        try{
-            $data['cat_arr_id'] = isset($data['cat_arr_id'])?json_encode($data['cat_arr_id']):'';
-            $data['tag'] = isset($data['tag'])?json_encode($data['tag']):'';
-            $articleData = $data;
-            unset($articleData['content']);
-            unset($articleData['status_name']);
-            unset($articleData['name']);
-            unset($articleData['content']);
-            unset($articleData['pid_arr']);
-            unset($articleData['pid']);
-            $id = Article::where(['id'=>$data['id']])->update($articleData);
-            $articleDataContent = [
-                'content'=>$data['content']
-            ];
-            ArticleData::where(['article_id'=>$data['id']])->update($articleDataContent);
-        } catch(\Throwable $ex){
-            Db::rollBack();
-            var_dump($ex->getMessage());
-            return Result::error("更新失败",0);
-        }
-        return Result::success([]);
-
-    }
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    /**查询新闻 */
-    public function getArticleInfo(array $data): array
-    {
-        $where = [
-            'article.id'=>$data['id']
-        ];
-        $result = Article::where($where)->leftJoin("article_data","article.id","article_data.article_id")->first();
-        if($result){
-            return Result::success($result->toArray());
-        }else{
-            return Result::error("查询失败",0);
-        }
-    }
-}

+ 0 - 65
app/JsonRpc/NewsServiceInterface.php

@@ -1,65 +0,0 @@
-<?php
-namespace App\JsonRpc;
-interface NewsServiceInterface
-{
-    /**
-     * @param array $data
-     *  @return array
-    */
-    public function getCategoryList(array $data):array;
-    /**
-     * @param array $data
-     *  @return array
-     */
-    public function categoryList(array $data):array;
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function addCategory(array $data):array;
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function delCategory(array $data):array;
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function updateCategory(array $data):array;
-
-    /**
-     * @param string $keyword
-     * @param int $page
-     * @param int $pageSize
-     */
-    public function getArticleList(array $data):array;
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function addArticle(array $data):array;
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function delArticle(array $data):array;
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function updateArticle(array $data):array;
-
-    /**
-     * @param array $data
-     * @return array
-     */
-    public function getArticleInfo(array $data):array;
-
-}

+ 1 - 1
runtime/hyperf.pid

@@ -1 +1 @@
-90
+7867

+ 16 - 0
runtime/logs/hyperf.log

@@ -525,3 +525,19 @@
 [2024-10-28T00:47:39.538025+00:00] sql.INFO: [25.52] select * from `ad` where `pid` = '9' and `status` = '1' order by `id` asc [] []
 [2024-10-28T00:47:39.557914+00:00] sql.INFO: [31.73] select * from `department` where `name` like '%安全%' [] []
 [2024-10-28T00:47:39.582605+00:00] sql.INFO: [17.66] select count(*) as aggregate from `department` where `name` like '%安全%' [] []
+[2024-10-29T07:50:19.834336+00:00] sql.INFO: [74.19] select * from `website_column` [] []
+[2024-10-29T07:52:54.971215+00:00] sql.INFO: [175.49] select `letter_of_complaint`.*, `type_a`.`type_name` as `nature_name`, `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 `type_level_name` from `letter_of_complaint` left join `letter_type` as `type_a` on `letter_of_complaint`.`nature` = `type_a`.`id` left join `letter_type` as `type_b` on `letter_of_complaint`.`type` = `type_b`.`id` left join `letter_type` as `type_c` on `letter_of_complaint`.`nature_level` = `type_c`.`id` left join `letter_type` as `type_d` on `letter_of_complaint`.`status` = `type_d`.`id` left join `letter_type` as `type_e` on `letter_of_complaint`.`type_level` = `type_e`.`id` order by `letter_of_complaint`.`id` desc limit 10 offset 0 [] []
+[2024-10-29T07:52:55.825483+00:00] sql.INFO: [842.4] select count(*) as aggregate from `letter_of_complaint` [] []
+[2024-10-29T07:53:03.186749+00:00] sql.INFO: [17.95] select `letter_of_complaint`.*, `type_a`.`type_name` as `nature_name`, `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 `type_level_name` from `letter_of_complaint` left join `letter_type` as `type_a` on `letter_of_complaint`.`nature` = `type_a`.`id` left join `letter_type` as `type_b` on `letter_of_complaint`.`type` = `type_b`.`id` left join `letter_type` as `type_c` on `letter_of_complaint`.`nature_level` = `type_c`.`id` left join `letter_type` as `type_d` on `letter_of_complaint`.`status` = `type_d`.`id` left join `letter_type` as `type_e` on `letter_of_complaint`.`type_level` = `type_e`.`id` order by `letter_of_complaint`.`id` desc limit 10 offset 0 [] []
+[2024-10-29T07:53:03.199914+00:00] sql.INFO: [12.45] select count(*) as aggregate from `letter_of_complaint` [] []
+[2024-10-29T07:53:04.552895+00:00] sql.INFO: [55.19] select * from `website_column` [] []
+[2024-10-29T07:53:15.287922+00:00] sql.INFO: [520.2] select `letter_of_complaint`.*, `type_a`.`type_name` as `nature_name`, `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 `type_level_name` from `letter_of_complaint` left join `letter_type` as `type_a` on `letter_of_complaint`.`nature` = `type_a`.`id` left join `letter_type` as `type_b` on `letter_of_complaint`.`type` = `type_b`.`id` left join `letter_type` as `type_c` on `letter_of_complaint`.`nature_level` = `type_c`.`id` left join `letter_type` as `type_d` on `letter_of_complaint`.`status` = `type_d`.`id` left join `letter_type` as `type_e` on `letter_of_complaint`.`type_level` = `type_e`.`id` order by `letter_of_complaint`.`id` desc limit 10 offset 0 [] []
+[2024-10-29T07:53:15.302040+00:00] sql.INFO: [13.13] select count(*) as aggregate from `letter_of_complaint` [] []
+[2024-10-29T07:53:17.845063+00:00] sql.INFO: [14.15] select `website`.*, `website_column`.`column_name`, `district`.`name` as `city_name` from `website` left join `website_column` on `website`.`website_column_id` = `website_column`.`id` left join `district` on `district`.`id` = `website`.`city_id` limit 10 offset 0 [] []
+[2024-10-29T07:53:18.069453+00:00] sql.INFO: [222.87] select count(*) as aggregate from `website` [] []
+[2024-10-29T07:53:18.091635+00:00] sql.INFO: [265.13] select * from `district` where (`pid` = '0') order by `code` asc [] []
+[2024-10-29T07:53:18.092541+00:00] sql.INFO: [264.96] select * from `website_column` [] []
+[2024-10-29T07:53:35.627006+00:00] sql.INFO: [17.89] select `letter_of_complaint`.*, `type_a`.`type_name` as `nature_name`, `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 `type_level_name` from `letter_of_complaint` left join `letter_type` as `type_a` on `letter_of_complaint`.`nature` = `type_a`.`id` left join `letter_type` as `type_b` on `letter_of_complaint`.`type` = `type_b`.`id` left join `letter_type` as `type_c` on `letter_of_complaint`.`nature_level` = `type_c`.`id` left join `letter_type` as `type_d` on `letter_of_complaint`.`status` = `type_d`.`id` left join `letter_type` as `type_e` on `letter_of_complaint`.`type_level` = `type_e`.`id` order by `letter_of_complaint`.`id` desc limit 10 offset 0 [] []
+[2024-10-29T07:53:35.641668+00:00] sql.INFO: [13.42] select count(*) as aggregate from `letter_of_complaint` [] []
+[2024-10-29T07:54:25.589261+00:00] sql.INFO: [36.79] select `letter_of_complaint`.*, `type_a`.`type_name` as `nature_name`, `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 `type_level_name` from `letter_of_complaint` left join `letter_type` as `type_a` on `letter_of_complaint`.`nature` = `type_a`.`id` left join `letter_type` as `type_b` on `letter_of_complaint`.`type` = `type_b`.`id` left join `letter_type` as `type_c` on `letter_of_complaint`.`nature_level` = `type_c`.`id` left join `letter_type` as `type_d` on `letter_of_complaint`.`status` = `type_d`.`id` left join `letter_type` as `type_e` on `letter_of_complaint`.`type_level` = `type_e`.`id` order by `letter_of_complaint`.`id` desc limit 10 offset 0 [] []
+[2024-10-29T07:54:25.604197+00:00] sql.INFO: [13.74] select count(*) as aggregate from `letter_of_complaint` [] []

+ 0 - 5
vendor/composer/autoload_classmap.php

@@ -13,20 +13,15 @@ return array(
     'App\\Exception\\Handler\\JsonRpcExceptionHandler' => $baseDir . '/app/Exception/Handler/JsonRpcExceptionHandler.php',
     'App\\JsonRpc\\LinkService' => $baseDir . '/app/JsonRpc/LinkService.php',
     'App\\JsonRpc\\LinkServiceInterface' => $baseDir . '/app/JsonRpc/LinkServiceInterface.php',
-    'App\\JsonRpc\\NewsService' => $baseDir . '/app/JsonRpc/NewsService.php',
-    'App\\JsonRpc\\NewsServiceInterface' => $baseDir . '/app/JsonRpc/NewsServiceInterface.php',
     'App\\JsonRpc\\PublicRpcService' => $baseDir . '/app/JsonRpc/PublicRpcService.php',
     'App\\JsonRpc\\PublicRpcServiceInterface' => $baseDir . '/app/JsonRpc/PublicRpcServiceInterface.php',
     'App\\JsonRpc\\WebsiteService' => $baseDir . '/app/JsonRpc/WebsiteService.php',
     'App\\JsonRpc\\WebsiteServiceInterface' => $baseDir . '/app/JsonRpc/WebsiteServiceInterface.php',
     'App\\Listener\\DbQueryExecutedListener' => $baseDir . '/app/Listener/DbQueryExecutedListener.php',
     'App\\Listener\\ResumeExitCoordinatorListener' => $baseDir . '/app/Listener/ResumeExitCoordinatorListener.php',
-    'App\\Model\\Ad' => $baseDir . '/app/Model/Ad.php',
-    'App\\Model\\AdPlace' => $baseDir . '/app/Model/AdPlace.php',
     'App\\Model\\Article' => $baseDir . '/app/Model/Article.php',
     'App\\Model\\ArticleData' => $baseDir . '/app/Model/ArticleData.php',
     'App\\Model\\Category' => $baseDir . '/app/Model/Category.php',
-    'App\\Model\\Department' => $baseDir . '/app/Model/Department.php',
     'App\\Model\\District' => $baseDir . '/app/Model/District.php',
     'App\\Model\\LetterOfComplaint' => $baseDir . '/app/Model/LetterOfComplaint.php',
     'App\\Model\\LetterType' => $baseDir . '/app/Model/LetterType.php',

+ 0 - 5
vendor/composer/autoload_static.php

@@ -697,20 +697,15 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         'App\\Exception\\Handler\\JsonRpcExceptionHandler' => __DIR__ . '/../..' . '/app/Exception/Handler/JsonRpcExceptionHandler.php',
         'App\\JsonRpc\\LinkService' => __DIR__ . '/../..' . '/app/JsonRpc/LinkService.php',
         'App\\JsonRpc\\LinkServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/LinkServiceInterface.php',
-        'App\\JsonRpc\\NewsService' => __DIR__ . '/../..' . '/app/JsonRpc/NewsService.php',
-        'App\\JsonRpc\\NewsServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/NewsServiceInterface.php',
         'App\\JsonRpc\\PublicRpcService' => __DIR__ . '/../..' . '/app/JsonRpc/PublicRpcService.php',
         'App\\JsonRpc\\PublicRpcServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/PublicRpcServiceInterface.php',
         'App\\JsonRpc\\WebsiteService' => __DIR__ . '/../..' . '/app/JsonRpc/WebsiteService.php',
         'App\\JsonRpc\\WebsiteServiceInterface' => __DIR__ . '/../..' . '/app/JsonRpc/WebsiteServiceInterface.php',
         'App\\Listener\\DbQueryExecutedListener' => __DIR__ . '/../..' . '/app/Listener/DbQueryExecutedListener.php',
         'App\\Listener\\ResumeExitCoordinatorListener' => __DIR__ . '/../..' . '/app/Listener/ResumeExitCoordinatorListener.php',
-        'App\\Model\\Ad' => __DIR__ . '/../..' . '/app/Model/Ad.php',
-        'App\\Model\\AdPlace' => __DIR__ . '/../..' . '/app/Model/AdPlace.php',
         'App\\Model\\Article' => __DIR__ . '/../..' . '/app/Model/Article.php',
         'App\\Model\\ArticleData' => __DIR__ . '/../..' . '/app/Model/ArticleData.php',
         'App\\Model\\Category' => __DIR__ . '/../..' . '/app/Model/Category.php',
-        'App\\Model\\Department' => __DIR__ . '/../..' . '/app/Model/Department.php',
         'App\\Model\\District' => __DIR__ . '/../..' . '/app/Model/District.php',
         'App\\Model\\LetterOfComplaint' => __DIR__ . '/../..' . '/app/Model/LetterOfComplaint.php',
         'App\\Model\\LetterType' => __DIR__ . '/../..' . '/app/Model/LetterType.php',

+ 2 - 2
vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'hyperf/hyperf-skeleton',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '9272eb0d9f1d349196e0347d0de7258b37674dc9',
+        'reference' => '1fe33f07a9f0881e84bbed5dcdc1bed204735344',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -439,7 +439,7 @@
         'hyperf/hyperf-skeleton' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '9272eb0d9f1d349196e0347d0de7258b37674dc9',
+            'reference' => '1fe33f07a9f0881e84bbed5dcdc1bed204735344',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),