weiz
/
suyuan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'preview' 

# Conflicts:
#	app/api/controller/IndexController.php
This commit is contained in:
chenbo 2023-12-27 18:11:42 +08:00
parent 1c9c34dc3a a4d3887205
commit ddc10275a5
1 changed files with 174 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/api/controller/IndexController.php
View File

@ -44,6 +44,9 @@ class IndexController extends BaseApiController
if($landProduct->isEmpty()){
$data['monitor'] = [];
}else{
$productDevice = ProductDevice::where('product_id',$landProduct['product_id'])->findOrEmpty();
$device = Device::where('id', $productDevice['device_id'])->findOrEmpty();
$data['video_url'] = $device['video_url'];
$landCollection = LandCollection::where('land_id',$params['land_id'])->order('id desc')->findOrEmpty();
if($landCollection->isEmpty()){
$data['monitor'] = [];