|
@@ -1021,15 +1021,16 @@ class DwyController extends BaseController
|
|
|
|
|
|
public function getTbData(Request $request){
|
|
|
$data = $request->all();
|
|
|
- if(empty($data['mac'])) return [201, ''];
|
|
|
-
|
|
|
- $result = BigKingTbj::where('mac',$data['mac'])->get()->toArray();
|
|
|
+// if(empty($data['mac'])) return [201, ''];
|
|
|
+ if(empty($data['id'])) return [201, ''];
|
|
|
+ $result = BigKingTbj::where('id',$data['id'])->get()->toArray();
|
|
|
+// $result = BigKingTbj::where('mac',$data['mac'])->get()->toArray();
|
|
|
if(empty($result)) return [200,'data' => []];
|
|
|
|
|
|
$return = [];
|
|
|
foreach ($result as $value){
|
|
|
$return[] = [
|
|
|
- 'id' => $value['id'],
|
|
|
+// 'id' => $value['id'],
|
|
|
'mac' => $value['mac'],
|
|
|
'data' => json_decode($value['data'],true),
|
|
|
];
|