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

Compare commits

base: weiz:73182f382cd4c85ccef47409f298b0b68a350236
Branches Tags
weiz:master
weiz:dev
weiz:preview
weiz:zhangwei
weiz:yaooo
..
compare: weiz:3ee3060b9f98dbd98c7d36be83b570472462b0af
Branches Tags
weiz:dev
weiz:master
weiz:preview
weiz:zhangwei
weiz:yaooo

No commits in common. "73182f382cd4c85ccef47409f298b0b68a350236" and "3ee3060b9f98dbd98c7d36be83b570472462b0af" have entirely different histories.
73182f382c ... 3ee3060b9f

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

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

@ -7,7 +7,6 @@ use app\common\model\land\Land;
use app\common\model\land\LandProduct;
use app\common\model\monitor\MonitorData;
use app\common\model\plant\Plant;
use app\common\model\product\ProductDevice;
use think\facade\Log;
use think\response\Json;
@ -66,12 +65,6 @@ class IndexController extends BaseApiController
'create_time' => $monitor['create_time']
];
}
$device = ProductDevice::where('product_id',$landProduct['product_id'])->where('device_type',3)->findOrEmpty();
// if($device->isEmpty()){
// $data['monitor']['video_monitor_data'] = '';
// }else{
// $data['monitor']['video_monitor_data'] = '';
// }
}
return $this->success('请求成功',$data);
}
@ -131,11 +124,13 @@ class IndexController extends BaseApiController
$plantInfo['land_area'] = $landInfo['total_area'];
$plantInfo['land_address'] = $landInfo['province_name'].$landInfo['city_name'].$landInfo['county_name'].$landInfo['town_name'].$landInfo['village_name'].$landInfo['group_name'];
//获取操作
$action = Action::field('type,type_text,detail,create_time')->where('plant_id',$params['plant_id'])->select()->each(function($item){
$action = Action::field('type_text,detail,create_time')->where('plant_id',$params['plant_id'])->select()->each(function($item){
$item['detail'] = json_decode($item['detail'],true);
return $item;
})->toArray();
$plantInfo['actions'] = $action;
return $this->success('请求成功',$plantInfo->toArray());
}
}