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

Compare commits

base: weiz:cdeace58257e3c9889f2493bb65cf251e18e2709
Branches Tags
weiz:master
weiz:dev
weiz:preview
weiz:zhangwei
weiz:yaooo
..
compare: weiz:17d4f673397efae6570c878715ecff9bd5c63e15
Branches Tags
weiz:dev
weiz:master
weiz:preview
weiz:zhangwei
weiz:yaooo

No commits in common. "cdeace58257e3c9889f2493bb65cf251e18e2709" and "17d4f673397efae6570c878715ecff9bd5c63e15" have entirely different histories.
cdeace5825 ... 17d4f67339

1 changed files with 9 additions and 9 deletions
Show Stats Expand all files Collapse all files

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

@ -46,24 +46,24 @@ class IndexController extends BaseApiController
//获取监测数据 //获取监测数据
$landDeviceForSoil = LandDevice::where('land_id',$land['id'])->where('device_type',1)->findOrEmpty(); $landDeviceForSoil = LandDevice::where('land_id',$land['id'])->where('device_type',1)->findOrEmpty();
if($landDeviceForSoil->isEmpty()){ if($landDeviceForSoil->isEmpty()){
$land['soil_device'] = 0; $data['soil_device'] = 0;
}else{ }else{
$land['soil_device'] = 1; $data['soil_device'] = 1;
$land['soil_monitor_data'] = SoilMonitor::where('device_id',$landDeviceForSoil['device_id'])->order('id desc')->findOrEmpty(); $data['soil_monitor_data'] = SoilMonitor::where('device_id',$landDeviceForSoil['device_id'])->order('id desc')->findOrEmpty();
} }
$landDeviceForAir = LandDevice::where('land_id',$land['id'])->where('device_type',2)->findOrEmpty(); $landDeviceForAir = LandDevice::where('land_id',$land['id'])->where('device_type',2)->findOrEmpty();
if($landDeviceForAir->isEmpty()){ if($landDeviceForAir->isEmpty()){
$land['air_device'] = 0; $data['air_device'] = 0;
}else{ }else{
$land['air_device'] = 1; $data['air_device'] = 1;
$land['air_monitor_data'] = AirMonitor::where('device_id',$landDeviceForAir['device_id'])->order('id desc')->findOrEmpty(); $data['air_monitor_data'] = AirMonitor::where('device_id',$landDeviceForAir['device_id'])->order('id desc')->findOrEmpty();
} }
$landDeviceForVideo = LandDevice::where('land_id',$land['id'])->where('device_type',3)->findOrEmpty(); $landDeviceForVideo = LandDevice::where('land_id',$land['id'])->where('device_type',3)->findOrEmpty();
if($landDeviceForVideo->isEmpty()){ if($landDeviceForVideo->isEmpty()){
$land['video_device'] = 0; $data['video_device'] = 0;
}else{ }else{
$land['video_device'] = 1; $data['video_device'] = 1;
$land['video_monitor_data'] = ''; $data['video_monitor_data'] = '';
} }
return $this->success('请求成功',$land->toArray()); return $this->success('请求成功',$land->toArray());
} }