Explorar el Código

为H5修改星球新闻和平台配置的接口返回格式

duqinya hace 5 años
padre
commit
aed9ef0484

+ 5 - 6
app/Http/Controllers/V2/PlatformContentController.php

@@ -25,11 +25,10 @@ class PlatformContentController extends BaseController
     public function index(Request $request)
     {
         $platformContent = $this->platformContentRepository->index($request->all());
-
-        $fractal = new Manager();
-        $resource = new Collection($platformContent , new PlatformContentTransformer());
-        $resource->setPaginator(new IlluminatePaginatorAdapter($platformContent));
-        $data = $fractal->createData($resource)->toArray();
-        return $this->jsonSuccess($data);
+        if ($platformContent){
+            return $this->jsonSuccess($platformContent);
+        }else {
+            return $this->jsonError('没有找到相关平台内容');
+        }
     }
 }

+ 5 - 6
app/Http/Controllers/V2/StarNewsController.php

@@ -27,11 +27,10 @@ class StarNewsController extends BaseController
     public function index(Request $request)
     {
         $starNews = $this->starNewsRepository->index($request->all());
-
-        $fractal = new Manager();
-        $resource = new Collection($starNews , new StarNewsTransformer());
-        $resource->setPaginator(new IlluminatePaginatorAdapter($starNews));
-        $data = $fractal->createData($resource)->toArray();
-        return $this->jsonSuccess($data);
+        if ($starNews){
+            return $this->jsonSuccess($starNews);
+        }else {
+            return $this->jsonError('没有找到相关新闻');
+        }
     }
 }

+ 2 - 3
app/Repositories/PlatformContentRepository.php

@@ -19,11 +19,10 @@ class PlatformContentRepository
 
     public function index($request)
     {
-        $perPage = isset($request['per_page']) ? $request['per_page'] : env('PER_PAGE');
         $this->platformContent = $this->platformContent
-            ->orderBy('id', 'desc');
+            ->orderBy('id', 'desc')->get();
 
-        return $this->platformContent->paginate($perPage);
+        return $this->platformContent;
     }
 
 }

+ 2 - 3
app/Repositories/StarNewsRepository.php

@@ -19,10 +19,9 @@ class StarNewsRepository
 
     public function index($request)
     {
-        $perPage = isset($request['per_page']) ? $request['per_page'] : env('PER_PAGE');
         $this->starNews = $this->starNews
-            ->orderBy('id', 'desc');
+            ->orderBy('id', 'desc')->get();
 
-        return $this->starNews->paginate($perPage);
+        return $this->starNews;
     }
 }

+ 0 - 20
app/Transformers/PlatformContentTransformer.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Transformers;
-
-use App\Models\PlatformContent;
-use League\Fractal\TransformerAbstract;
-
-class PlatformContentTransformer extends TransformerAbstract
-{
-
-    public function transform(PlatformContent $platformContent)
-    {
-        return [
-            'id'  => $platformContent['id'],
-            'title'    => $platformContent['title'],
-            'content'    => $platformContent['content'],
-            'updated_at'    => date($platformContent['updated_at']),
-        ];
-    }
-}

+ 0 - 23
app/Transformers/StarNewsTransformer.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Transformers;
-
-use App\Models\StarNews;
-use League\Fractal\TransformerAbstract;
-
-class StarNewsTransformer extends TransformerAbstract
-{
-
-    public function transform(StarNews $starNews)
-    {
-        return [
-            'id'  => $starNews['id'],
-            'title'    => $starNews['title'],
-            'content'    => $starNews['content'],
-            'cover_img'    => $starNews['cover_img'],
-            'status'    => $starNews['status'],
-            'sort'    => $starNews['sort'],
-            'updated_at'    => date($starNews['updated_at']),
-        ];
-    }
-}