|
@@ -55,8 +55,8 @@ class Station extends Model
|
|
|
public function getAllList(){
|
|
|
$res = $this
|
|
|
->catchSearch()
|
|
|
- ->field('mac,name,latitude,longitude,online_time')
|
|
|
- ->append(['is_online'])
|
|
|
+ // ->field('mac,name,latitude,longitude,online_time')
|
|
|
+ ->append(['is_online_text','is_online'])
|
|
|
->select();
|
|
|
|
|
|
return $res;
|
|
@@ -86,8 +86,7 @@ class Station extends Model
|
|
|
}elseif($value=='2'){
|
|
|
return $query->where(function ($query) use( $time) {
|
|
|
$query->whereOr('online_time','<', $time)->whereOr('online_time','=', null);
|
|
|
- });
|
|
|
- // return $query->where('online_time', '>=', $time);
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
}
|