Sfoglia il codice sorgente

修改搭建网站模板获取网页类型

15313670163 3 mesi fa
parent
commit
65ac0801cc
4 ha cambiato i file con 102 aggiunte e 34 eliminazioni
  1. 36 33
      app/JsonRpc/WebsiteService.php
  2. 0 0
      runtime/container/scan.cache
  3. 1 1
      runtime/hyperf.pid
  4. 65 0
      runtime/logs/hyperf.log

+ 36 - 33
app/JsonRpc/WebsiteService.php

@@ -1227,50 +1227,53 @@ class WebsiteService implements WebsiteServiceInterface
         if(empty($website)){
             $message = "请输入正确的网站id!";
         }else{
-
             $page_type = WebsiteTemplateInfo::where('website_id',$data['website_id'])->select('page_type')->first();
-            $where = json_decode($page_type['page_type'], true);
-            
-            // $where = $data["page_type"];
-            if(isset($data['template_class_id'])){
-                $template_class = TemplateClass::where('id',$data['template_class_id'])->first();
-                if(empty($template_class)){
-                    $message = "请输入正确的模板风格id!";
+            if(empty($page_type)){
+                $message = "此网站还未添加基础信息!";
+            }else{
+                $where = json_decode($page_type['page_type'], true);
+                 // $where = $data["page_type"];
+                if(isset($data['template_class_id'])){
+                    $template_class = TemplateClass::where('id',$data['template_class_id'])->first();
+                    if(empty($template_class)){
+                        $message = "请输入正确的模板风格id!";
+                    }else{
+                        // 获取指定风格下的模板
+                        $rep = Template::where('template_class_id', $data['template_class_id'])
+                            ->where(function ($query) use ($where) {
+                                foreach ($where as $value) {
+                                    $query->whereJsonContains('template_img', ['value' => $value]);
+                                }
+                            })
+                            ->leftJoin('template_class','template_class.id','template.template_class_id')
+                            ->select('template.*','template_class.name')
+                            ->limit($data['pageSize'])
+                            ->offset(($data['page'] - 1) * $data['pageSize'])
+                            ->orderBy("template.updated_at", "desc")
+                            ->get();
+                    }
                 }else{
-                    // 获取指定风格下的模板
-                    $rep = Template::where('template_class_id', $data['template_class_id'])
-                        ->where(function ($query) use ($where) {
+                    //获取所有模板
+                    $rep = Template::where(function ($query) use ($where) {
                             foreach ($where as $value) {
                                 $query->whereJsonContains('template_img', ['value' => $value]);
                             }
                         })
-                        ->leftJoin('template_class','template_class.id','template.template_class_id')
-                        ->select('template.*','template_class.name')
-                        ->limit($data['pageSize'])
                         ->offset(($data['page'] - 1) * $data['pageSize'])
+                        ->limit($data['pageSize'])
                         ->orderBy("template.updated_at", "desc")
                         ->get();
                 }
-            }else{
-                //获取所有模板
-                $rep = Template::where(function ($query) use ($where) {
-                        foreach ($where as $value) {
-                            $query->whereJsonContains('template_img', ['value' => $value]);
-                        }
-                    })
-                    ->offset(($data['page'] - 1) * $data['pageSize'])
-                    ->limit($data['pageSize'])
-                    ->orderBy("template.updated_at", "desc")
-                    ->get();
-            }
-            if($rep->count()==0){
-                $message = "没有查找到相关数据!";
-            }else{
-                $result = [
-                    "rows" => $rep->toArray(),
-                    "count" => $rep->count()
-                ];
+                if(empty($rep) || $rep->count()==0){
+                    $message = "没有查找到相关数据!";
+                }else{
+                    $result = [
+                        "rows" => $rep->toArray(),
+                        "count" => $rep->count()
+                    ];
+                }
             }
+           
         }
         if(!empty($message)){
             return Result::error($message,0);

File diff suppressed because it is too large
+ 0 - 0
runtime/container/scan.cache


+ 1 - 1
runtime/hyperf.pid

@@ -1 +1 @@
-32151
+39430

+ 65 - 0
runtime/logs/hyperf.log

@@ -185,3 +185,68 @@
 [2024-12-24T15:33:57.071194+08:00] sql.INFO: [233.75] select * from `footer_content` where (`fcat_id` = '12' and `con_title` like '%1%') order by `updated_at` desc limit 10 offset 0 [] []
 [2024-12-24T15:34:01.663699+08:00] sql.INFO: [16.52] select `type` from `footer_category` where `id` = '12' limit 1 [] []
 [2024-12-24T15:34:01.679888+08:00] sql.INFO: [15.25] select * from `footer_content` where (`fcat_id` = '12' and `list_title` like '%我%') order by `updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T15:38:16.073628+08:00] sql.INFO: [52.25] select * from `website` where `website`.`id` = '2' limit 1 [] []
+[2024-12-24T15:38:16.092565+08:00] sql.INFO: [13.43] select `page_type` from `website_template_info` where `website_id` = '2' limit 1 [] []
+[2024-12-24T15:38:16.113859+08:00] sql.INFO: [16.4] select * from `template_class` where `id` = '100' limit 1 [] []
+[2024-12-24T15:38:17.895792+08:00] sql.INFO: [13.92] select * from `website` where `website`.`id` = '2' limit 1 [] []
+[2024-12-24T15:38:17.909822+08:00] sql.INFO: [12.91] select `page_type` from `website_template_info` where `website_id` = '2' limit 1 [] []
+[2024-12-24T15:38:17.925364+08:00] sql.INFO: [14.61] select * from `template_class` where `id` = '100' limit 1 [] []
+[2024-12-24T15:38:19.466332+08:00] sql.INFO: [230.11] select * from `website` where `website`.`id` = '2' limit 1 [] []
+[2024-12-24T15:38:19.696376+08:00] sql.INFO: [228.63] select `page_type` from `website_template_info` where `website_id` = '2' limit 1 [] []
+[2024-12-24T15:38:19.710733+08:00] sql.INFO: [13.13] select * from `template_class` where `id` = '100' limit 1 [] []
+[2024-12-24T15:42:02.565716+08:00] sql.INFO: [74.03] select * from `website` where `website`.`id` = '2' limit 1 [] []
+[2024-12-24T15:42:02.607350+08:00] sql.INFO: [17.17] select `page_type` from `website_template_info` where `website_id` = '2' limit 1 [] []
+[2024-12-24T15:42:02.631585+08:00] sql.INFO: [17.82] select * from `template_class` where `id` = '100' limit 1 [] []
+[2024-12-24T15:44:37.461335+08:00] sql.INFO: [269.3] select * from `website` where `website`.`id` = '2' limit 1 [] []
+[2024-12-24T15:44:37.475661+08:00] sql.INFO: [12.85] select `page_type` from `website_template_info` where `website_id` = '2' limit 1 [] []
+[2024-12-24T15:44:37.492568+08:00] sql.INFO: [15.93] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T15:44:37.523430+08:00] sql.INFO: [16.73] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"1"}') and json_contains(`template_img`, '{"value":"2"}') and json_contains(`template_img`, '{"value":"3"}') and json_contains(`template_img`, '{"value":"4"}') and json_contains(`template_img`, '{"value":"5"}') and json_contains(`template_img`, '{"value":"6"}') and json_contains(`template_img`, '{"value":"7"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T15:45:02.252451+08:00] sql.INFO: [484.03] select * from `website` where `website`.`id` = '2' limit 1 [] []
+[2024-12-24T15:45:02.284623+08:00] sql.INFO: [14.64] select `page_type` from `website_template_info` where `website_id` = '2' limit 1 [] []
+[2024-12-24T15:45:02.301651+08:00] sql.INFO: [12.69] select * from `template_class` where `id` = '1' limit 1 [] []
+[2024-12-24T15:45:02.747561+08:00] sql.INFO: [436.67] select `template`.*, `template_class`.`name` from `template` left join `template_class` on `template_class`.`id` = `template`.`template_class_id` where `template_class_id` = '1' and (json_contains(`template_img`, '{"value":"1"}') and json_contains(`template_img`, '{"value":"2"}') and json_contains(`template_img`, '{"value":"3"}') and json_contains(`template_img`, '{"value":"4"}') and json_contains(`template_img`, '{"value":"5"}') and json_contains(`template_img`, '{"value":"6"}') and json_contains(`template_img`, '{"value":"7"}')) order by `template`.`updated_at` desc limit 10 offset 0 [] []
+[2024-12-24T15:45:08.352911+08:00] sql.INFO: [15.97] select * from `website` where `website`.`id` = '2' limit 1 [] []
+[2024-12-24T15:45:08.366971+08:00] sql.INFO: [13.26] select `page_type` from `website_template_info` where `website_id` = '2' limit 1 [] []
+[2024-12-24T15:45:08.381453+08:00] sql.INFO: [13.45] select * from `template_class` where `id` = '100' limit 1 [] []
+[2024-12-24T15:45:09.569338+08:00] sql.INFO: [17.18] select * from `website` where `website`.`id` = '2' limit 1 [] []
+[2024-12-24T15:45:09.583248+08:00] sql.INFO: [13.04] select `page_type` from `website_template_info` where `website_id` = '2' limit 1 [] []
+[2024-12-24T15:45:09.811141+08:00] sql.INFO: [226.82] select * from `template_class` where `id` = '100' limit 1 [] []
+[2024-12-24T15:45:10.906668+08:00] sql.INFO: [17.22] select * from `website` where `website`.`id` = '2' limit 1 [] []
+[2024-12-24T15:45:10.922501+08:00] sql.INFO: [15.03] select `page_type` from `website_template_info` where `website_id` = '2' limit 1 [] []
+[2024-12-24T15:45:10.939293+08:00] sql.INFO: [15.72] select * from `template_class` where `id` = '100' limit 1 [] []
+[2024-12-24T15:45:20.092239+08:00] sql.INFO: [443.64] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:45:20.754957+08:00] sql.INFO: [661.63] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:48:04.058578+08:00] sql.INFO: [284.18] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:48:04.523057+08:00] sql.INFO: [447.99] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:48:58.092080+08:00] sql.INFO: [65.43] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:48:58.124786+08:00] sql.INFO: [15.34] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:48:59.266952+08:00] sql.INFO: [17.85] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:48:59.283258+08:00] sql.INFO: [15.26] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:49:00.254729+08:00] sql.INFO: [16.9] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:49:00.272507+08:00] sql.INFO: [16.92] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:49:01.274996+08:00] sql.INFO: [16.87] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:49:01.291064+08:00] sql.INFO: [15.16] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:49:02.267696+08:00] sql.INFO: [17.55] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:49:02.282327+08:00] sql.INFO: [13.54] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:49:16.928195+08:00] sql.INFO: [225.38] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:49:16.945846+08:00] sql.INFO: [16.66] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:49:20.088425+08:00] sql.INFO: [57.89] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:49:20.120440+08:00] sql.INFO: [15.63] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:49:59.643629+08:00] sql.INFO: [503.89] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:49:59.676522+08:00] sql.INFO: [16.24] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:50:18.442461+08:00] sql.INFO: [71.35] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:50:18.472552+08:00] sql.INFO: [13.78] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:50:21.706456+08:00] sql.INFO: [59.03] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:50:21.735650+08:00] sql.INFO: [13.6] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:50:59.722749+08:00] sql.INFO: [17.62] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:50:59.737694+08:00] sql.INFO: [14.17] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:51:00.808244+08:00] sql.INFO: [17.27] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:51:00.822963+08:00] sql.INFO: [13.66] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:51:03.437729+08:00] sql.INFO: [17.19] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:51:03.451458+08:00] sql.INFO: [12.79] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:52:12.826752+08:00] sql.INFO: [268.97] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:52:12.841127+08:00] sql.INFO: [13.47] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:52:16.374399+08:00] sql.INFO: [62.96] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:52:16.407291+08:00] sql.INFO: [14.5] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []
+[2024-12-24T15:52:17.630389+08:00] sql.INFO: [230.6] select * from `website` where `website`.`id` = '12' limit 1 [] []
+[2024-12-24T15:52:17.645424+08:00] sql.INFO: [14.05] select `page_type` from `website_template_info` where `website_id` = '12' limit 1 [] []

Some files were not shown because too many files changed in this diff