修改

catch/device/controller/Station.php

@@ -239,6 +239,15 @@ class Station extends CatchController
         $total=$this->stationModel->count();
         return CatchResponse::success(['list'=>$this->stationModel->getAllList($start,$limit),'total'=>$total]);
     }
+    /**
+     * 导出列表
+     * @time 2022年01月20日 10:09
+     * @param Request $request 
+     */
+    public function getExportList(Request $request) 
+    {
+        return CatchResponse::success($this->stationModel->getExportList());
+    }
     public function getAllListForTrans(Request $request) {
         $start=0;
         $limit=40000;

catch/device/model/Station.php

@@ -70,6 +70,22 @@ class Station extends Model
             
         return $res;
     }
+    public function getExportList(){
+        $res = $this->dataRange()
+            ->catchSearch()
+            // ->field('mac,name,latitude,longitude,online_time')
+            ->append(['is_online_text','is_online'])
+            // ->cache(120)
+            ->select()
+            ->each(function($item, $key)  {
+                $wgsLoc = \algorithm\Geometry::gcj02ToWgs84((float)$item['latitude'],(float)$item['longitude']);
+                $item['longitude']=$wgsLoc['lng'];
+                $item['latitude']=$wgsLoc['lat'];
+            })->toArray();
+
+
+        return $res;
+    }
     public function getAllList($start=0,$limit=4000){
         $res = $this
             ->catchSearch()

catch/device/route.php

@@ -14,6 +14,7 @@ $router->group(function () use ($router) {
 	// device路由
 	$router->resource('device', '\catchAdmin\device\controller\Device');
 	// station路由
+	$router->get('station/getExportList','\catchAdmin\device\controller\Station@getExportList');
 	$router->get('station/getdeviceListByStation','\catchAdmin\device\controller\Station@getdeviceListByStation');
 	$router->get('station/getAllListForTrans','\catchAdmin\device\controller\Station@getAllListForTrans');
 	$router->get('station/getMapList','\catchAdmin\device\controller\Station@getMapList');
@@ -40,4 +41,4 @@ $router->group(function () use ($router) {
 	$router->post('import_device', '\catchAdmin\device\controller\Device@import_device');
 	
 	
-})->middleware('auth');
+})->middleware('auth');

catch/report/controller/Report.php

@@ -95,12 +95,12 @@ class Report extends CatchController
         $yAxisData=[];
         for($i=$start_time;$i<$end_time+24*3600;$i+=24*3600){
             $time1=date('Y-m-d',$i);
-            $time2=date('Y-m-d',$i);
+            // $time2=date('Y-m-d',$i);
             $xAxisData[]=date('Y-m-d',$i);
             // $cond['RF_DATE']=['timeRange',$time1,$time2];
             // $count=queryOracleCount('DSSC2.W_DW_RF_RECORD',$cond);
             // $count=mt_rand(0,99999);
-            $count=Db::table('station_passing')->where('date','between',[$time1,$time2])->sum('num');
+            $count=Db::table('station_passing')->where('date',$time1)->sum('num');
             $yAxisData[]=$count;
      
         }