fix(control): 根据条件查询不同效果

Author: lisgroup

laravel/app/Http/Controllers/Bus/IndexController.php

@@ -11,6 +11,7 @@
 use App\Http\Repository\BusRepository;
 use App\Http\Repository\NewBusRepository;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 
 class IndexController extends CommonController
 {
@@ -41,24 +42,74 @@ public function getList(Request $request)
     {
         $line = $request['linename'];
         $line = preg_replace('/快\b(\d)/', '快线$1号', $line);
-        switch ($request['type']) {
-            case '1':
-            case 'new':
-                $list = NewBusRepository::getInstent()->getLine($line);
-                break;
-
-            default:
-                $list = BusRepository::getInstent()->getList($line);
-                // $list = [];
-                if (empty($list)) {
-                    $list = NewBusRepository::getInstent()->getLine($line);
-                }
+        // 1. 前端直接传递 type 参数时先判断
+        if (isset($request['type'])) {
+            switch ($request['type']) {
+                case '1':
+                case 'new':
+                    $list = $this->getNewList($line);
+                    break;
+                default:
+                    $list = $this->getOldList($line);
+                    // $list = [];
+                    if (empty($list)) {
+                        $list = $this->getNewList($line);
+                    }
+            }
+        } else {
+            // 2. 根据后台配置查询不同的结果
+            $default_open = Cache::get('default_open');
+            switch ($default_open) {
+                case '2': // 查询新版
+                    $list = $this->getNewList($line);
+                    break;
+                case '3': // 先查老版再查新版
+                    $list = $this->getOldList($line);
+                    // $list = [];
+                    if (empty($list)) {
+                        $list = $this->getNewList($line);
+                    }
+                    break;
+                case '4': // 先查新版再查老版
+                    $list = $this->getNewList($line);
+                    // $list = [];
+                    if (empty($list)) {
+                        $list = $this->getOldList($line);
+                    }
+                    break;
+                default: // 查询老版
+                    $list = $this->getOldList($line);
+            }
         }
 
         // return $this->exportData($list);
         return $this->out(200, $list);
     }
 
+    /**
+     * 获取老线路列表
+     *
+     * @param $line
+     *
+     * @return array
+     */
+    private function getNewList($line)
+    {
+        return NewBusRepository::getInstent()->getLine($line);
+    }
+
+    /**
+     * 获取老线路列表
+     *
+     * @param $line
+     *
+     * @return array
+     */
+    private function getOldList($line)
+    {
+        return BusRepository::getInstent()->getList($line);
+    }
+
     /**
      * 获取实时公交数据table列表 --- 根据data-href 地址，请求 szjt.gov.cn 查询实时公交数据，不能缓存
      * 获取实时公交数据table列表，数据来自 szjt.gov.cn，需要限制访问频率，1秒一次请求