소스 검색

修改获取新闻列表

15313670163 2 달 전
부모
커밋
ce628db976
6개의 변경된 파일86개의 추가작업 그리고 10개의 파일을 삭제
  1. 25 9
      .env
  2. 46 0
      app/JsonRpc/NewsService.php
  3. 6 0
      app/JsonRpc/NewsServiceInterface.php
  4. 0 0
      runtime/container/scan.cache
  5. 1 1
      runtime/hyperf.pid
  6. 8 0
      runtime/logs/hyperf.log

+ 25 - 9
.env

@@ -1,18 +1,34 @@
-APP_NAME=user_producer
+APP_NAME=news_producer
 APP_ENV=dev
-
-
+HOST = http://101.254.114.211:13306/
 DB_DRIVER=mysql
-DB_HOST=192.168.1.201
-DB_PORT=3307
+DB_HOST=101.254.114.211
+DB_PORT=13306
 DB_DATABASE=hyperf
 DB_USERNAME=root
-DB_PASSWORD=123456
+DB_PASSWORD=xKmapDpKCxMMSkbe
 DB_CHARSET=utf8mb4
 DB_COLLATION=utf8mb4_unicode_ci
 DB_PREFIX=
+# APP_ENV=dev
+
+# HOST = http://101.254.114.211:13306/
+# DB_DRIVER=mysql
+# DB_HOST=101.254.114.211
+# DB_PORT=13306
+# DB_DATABASE=hyperf
+# DB_USERNAME=root
+# DB_PASSWORD=xKmapDpKCxMMSkbe
+# DB_CHARSET=utf8mb4
+# DB_COLLATION=utf8mb4_unicode_ci
+# DB_PREFIX=
+
+# REDIS_HOST=localhost
+# REDIS_AUTH=(null)
+# REDIS_PORT=6379
+# REDIS_DB=0
 
-REDIS_HOST=localhost
-REDIS_AUTH=(null)
-REDIS_PORT=6379
+REDIS_HOST=101.254.114.211
+REDIS_AUTH=YPWWnFnNebc7427B
+REDIS_PORT=26739
 REDIS_DB=0

+ 46 - 0
app/JsonRpc/NewsService.php

@@ -369,4 +369,50 @@ class NewsService implements NewsServiceInterface
         return Result::success($result);  
         
     }
+
+
+
+
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteArticleList(array $data): array
+    {
+        $where= [];
+
+        if(isset($data['title'])  && $data['title']){
+            array_push($where,['article.title','like','%'.$data['title'].'%']);
+        }
+        if(isset($data['category_name'])  && $data['category_name']){
+            array_push($where,['category.name','like','%'.$data['category_name'].'%']);
+        }
+        if(isset($data['author'])  && $data['author']){
+             array_push($where,['article.author','=',$data['author']]);
+        }
+        if(isset($data['islink'])  && $data['islink']!==""){
+            array_push($where,['article.islink','=',$data['islink']]);
+        }
+        if(isset($data['status']) && $data['status']!==""){
+            array_push($where,['article.status','=',$data['status']]);
+        }
+        
+        $rep = Article::where($where)
+            ->whereNotIn('article.status',[404])
+            ->leftJoin('category','article.catid','category.id')
+            ->select("article.*","category.name as category_name")
+            ->orderBy("article.id","desc")
+            ->limit($data['pageSize'])
+            ->offset(($data['page']-1)*$data['pageSize'])->get();
+        $count =  Article::where($where)->whereNotIn('article.status',[404])
+            ->leftJoin('category','article.catid','category.id')->count();
+        $data = [
+            'rows'=>$rep->toArray(),
+            'count'=>$count
+        ];
+        if(empty($rep)){
+            return Result::error("没有信息数据");
+        }
+        return Result::success($data);
+    }
 }

+ 6 - 0
app/JsonRpc/NewsServiceInterface.php

@@ -85,4 +85,10 @@ interface NewsServiceInterface
      */
     public function getWebsiteModelArticles(array $data):array;
 
+     /**
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteArticleList(array $data):array;
+
 }

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
runtime/container/scan.cache


+ 1 - 1
runtime/hyperf.pid

@@ -1 +1 @@
-34641
+4000

+ 8 - 0
runtime/logs/hyperf.log

@@ -1912,3 +1912,11 @@
 [2024-11-09T09:10:45.348805+00:00] sql.INFO: [9.86] select `category`.*, `category`.`id` as `category_id` from `category` where (`pid` = '0') [] []
 [2024-11-09T09:36:43.493737+00:00] sql.INFO: [16.17] select `category`.*, `district`.`name` as `city_name`, `department`.`name` as `department_name` from `category` left join `district` on `category`.`city_id` = `district`.`id` left join `department` on `category`.`department_id` = `department`.`id` order by `category`.`sort` desc, `category`.`updated_at` desc limit 10 offset 0 [] []
 [2024-11-09T09:36:43.497870+00:00] sql.INFO: [1.94] select count(*) as aggregate from `category` [] []
+[2025-02-11T16:47:10.961642+08:00] sql.INFO: [63.93] select `article`.*, `category`.`name` as `category_name` from `article` left join `category` on `article`.`catid` = `category`.`id` where `article`.`status` not in ('404') order by `article`.`id` desc limit 5 offset 0 [] []
+[2025-02-11T16:47:11.004238+08:00] sql.INFO: [23.36] select count(*) as aggregate from `article` left join `category` on `article`.`catid` = `category`.`id` where `article`.`status` not in ('404') [] []
+[2025-02-11T16:47:26.394344+08:00] sql.INFO: [18.31] select `article`.*, `category`.`name` as `category_name` from `article` left join `category` on `article`.`catid` = `category`.`id` where `article`.`status` not in ('404') order by `article`.`id` desc limit 5 offset 0 [] []
+[2025-02-11T16:47:26.418330+08:00] sql.INFO: [22.19] select count(*) as aggregate from `article` left join `category` on `article`.`catid` = `category`.`id` where `article`.`status` not in ('404') [] []
+[2025-02-11T16:47:32.830819+08:00] sql.INFO: [17.98] select `article`.*, `category`.`name` as `category_name` from `article` left join `category` on `article`.`catid` = `category`.`id` where `article`.`status` not in ('404') order by `article`.`id` desc limit 1 offset 0 [] []
+[2025-02-11T16:47:32.854647+08:00] sql.INFO: [22.99] select count(*) as aggregate from `article` left join `category` on `article`.`catid` = `category`.`id` where `article`.`status` not in ('404') [] []
+[2025-02-11T16:47:43.836910+08:00] sql.INFO: [18.58] select `article`.*, `category`.`name` as `category_name` from `article` left join `category` on `article`.`catid` = `category`.`id` where `article`.`status` not in ('404') order by `article`.`id` desc limit 20 offset 0 [] []
+[2025-02-11T16:47:43.862506+08:00] sql.INFO: [20.7] select count(*) as aggregate from `article` left join `category` on `article`.`catid` = `category`.`id` where `article`.`status` not in ('404') [] []

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.