1

.env

@@ -23,7 +23,7 @@ AMQP_PASSWORD=H8eDTAk6LY7EjJ8y
 
 
 #图片服务器地址
-OSS_ENDPOINT =http://l1.bb1a.cn:55966
+OSS_ENDPOINT =http://116.131.8.26:19000
 OSS_KEY = xoycEr5qezRF91xITN6i
 OSS_SECRET = IYVyqYZxCCxQD5YnRsayzzNORBqwAPfhQlHP1Glw
 BUCKET = dev

app/JsonRpc/WebsiteService.php

@@ -1502,5 +1502,98 @@ class WebsiteService implements WebsiteServiceInterface
             return Result::success($result);
         }
     }
+    /**
+     * 保存网站模板
+     * @param array $data
+     * @return array
+     */
+    public function addWebsiteTemplate(array $data): array
+    {
+//        var_dump("接收参数：",$data['template_data']);
+        $result =  WebsiteTemplate::updateOrInsert(['website_id'=>$data['website_id']],['template_data'=>json_encode($data['template_data'])]);
+        if($result){
+            return Result::success($result);
+        }else{
+            return Result::error("创建失败",0);
+        }
+    }
+
+    /**
+     * 预览网站首页模板数据
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteTemplateData(array $data): array
+    {
+        $wehre = [
+            "website_id" =>$data['website_id']
+        ];
+        $result =  WebsiteTemplate::where($wehre)->first();
+        if($result){
+            $templateData = json_decode($result['template_data'],true);
+//            var_dump("数据：",$templateData[1]);
+            $templateData[1] = $this->getNewsList($templateData[1]);
 
+            return Result::success($templateData);
+        }else{
+            return Result::error("没有数据",0);
+        }
+    }
+
+    /**
+     * 获取列表数据
+     * @return void
+     */
+    public function getNewsList(array $data): array
+    {
+        if($data){
+            foreach ($data as $key=>$val){
+                if($val){
+                    foreach ($val['data'] as $k=>$item){
+                        if($item['isReturn'] && intval($item['isReturn'])==1){
+                            $imgList = [];
+                            if($item['data']['imgNum'] && intval($item['data']['imgNum'])>0){
+                                $imgList =  Article::where('imgurl',"!=","")
+                                    ->where('catid',$item['data']['category_id'])
+                                    ->select($item['data']['selectField'])
+                                    ->orderBy("created_at","desc")
+                                    ->offset(0)
+                                    ->limit(intval($item['data']['imgNum']))
+                                    ->get();
+                                $imgList = $imgList->toArray();
+                                $listIds = [];
+                                if ($imgList){
+                                    $listIds = array_column($imgList, 'id');
+                                }
+                                $dataList = Article::whereNotIn('id',$listIds)
+                                    ->where('catid',$item['data']['category_id'])
+                                    ->select($item['data']['selectField'])
+                                    ->orderBy("created_at","desc")
+                                    ->offset(0)
+                                    ->limit(intval($item['data']['pageSize'])-intval($item['data']['imgNum']))
+                                    ->get();
+                                $dataList = $dataList->toArray();
+                                var_dump("图片列表：",$imgList,"数据列表：",$dataList);
+                                $datas = array_merge($imgList,$dataList);
+//                                return $datas;
+                                var_dump("合并列表：",$datas);
+                                $data[$key]['data'][$k]['dataList'] = $datas;
+                            }else{
+                                $dataList = Article::where('catid',$item['data']['category_id'])
+                                    ->select($item['data']['selectField'])
+                                    ->orderBy("created_at","desc")
+                                    ->offset(0)
+                                    ->limit(intval($item['data']['pageSize']))
+                                    ->get();
+                                $dataList = $dataList->toArray();
+                                var_dump("数据列表：",$dataList);
+                            }
+                        }
+                    }
+                }
+
+            }
+        }
+        return $data;
+    }
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -71,8 +71,8 @@ interface WebsiteServiceInterface
     // public function templateSectorList(array $data): array;
     // public function sectorComponentList(array $data): array;
     // public function getWebsiteTemplateInfo(array $data): array;
-    // public function addWebsiteTemplate(array $data): array;
-    // public function getWebsiteTemplateData(array $data): array;
+     public function addWebsiteTemplate(array $data): array;
+     public function getWebsiteTemplateData(array $data): array;
     // public function getFooterCategoryList(array $data): array;
     // public function getFooterContentList(array $data): array;
     // public function getFooterContentInfo(array $data): array;

runtime/hyperf.pid

@@ -1 +1,5 @@
-8851
+<<<<<<< HEAD
+8851
+=======
+92061
+>>>>>>> 1b33ce823ae8ac1d9e8124fe598a6df8009a7a26