|
@@ -65,8 +65,10 @@ class GatewayService extends Service
|
|
if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
|
|
if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
|
|
if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
|
|
if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
|
|
if(! empty($data['ip'])) $model->where('ip', 'LIKE', '%'.$data['ip'].'%');
|
|
if(! empty($data['ip'])) $model->where('ip', 'LIKE', '%'.$data['ip'].'%');
|
|
|
|
+ if(isset($data['is_online'])) $model->where('is_online', $data['is_online']);
|
|
|
|
|
|
$list = $this->limit($model,'',$data);
|
|
$list = $this->limit($model,'',$data);
|
|
|
|
+ $list = $this->fillData($list);
|
|
|
|
|
|
return [true,$list];
|
|
return [true,$list];
|
|
}
|
|
}
|
|
@@ -92,4 +94,18 @@ class GatewayService extends Service
|
|
|
|
|
|
return [true,''];
|
|
return [true,''];
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ public function fillData($data){
|
|
|
|
+ if(empty($data['data'])) return $data;
|
|
|
|
+
|
|
|
|
+ //获取仓是否在线离线状态
|
|
|
|
+ $online = SystemlService::getIsOnlineStatusGateWay(array_column($data['data'],'id'));
|
|
|
|
+
|
|
|
|
+ foreach ($data['data'] as $key => $value){
|
|
|
|
+ $tmp_online = $online[$value['id']] ?? 0;
|
|
|
|
+ $data['data'][$key]['is_online'] = $tmp_online;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return $data;
|
|
|
|
+ }
|
|
}
|
|
}
|