mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
unknown 2023-08-30 22:09:31 +08:00
parent 096d0cca6c
commit f61b0b5970
1 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
app/api/controller/VehicleController.php
View File

@ -237,35 +237,35 @@ class VehicleController extends BaseApiController
}
public function villageIndex() {
$company_id = $this->userInfo['company_id'];
if(empty($company_id)){
return $this->fail('公司信息不存在');
}
$company = Company::where('id',$company_id)->find();
if($company['company_type'] != 18){
return $this->fail('非小组服务公司');
}
$apply = VehicleVillageApply::where('village_company_id',$company_id)->find();
$data = [
'status' => 0,
];
if($apply){
$data['apply'] = $apply->toArray();
}else{
$data['apply'] = [];
}
$car = VehicleRent::where('rent_company_id',$company_id)->find();
if($car){
//当前坐标位置
$position = curl_post('http://logistics.lihaink.cn/api/getCarLocal',[],['car_id'=>$car['car_id']]);
if($position && $position['code'] == 1){
$car['position'] = $position['data'];
}
$car['company'] = Company::where('id',$car['rent_company_id'])->find()->append(['province_name', 'city_name', 'area_name', 'street_name', 'village_name','brigade_name']);
}else{
$data['car'] = [];
}
return $this->success('success',$data);
// $company_id = $this->userInfo['company_id'];
// if(empty($company_id)){
// return $this->fail('公司信息不存在');
// }
// $company = Company::where('id',$company_id)->find();
// if($company['company_type'] != 18){
// return $this->fail('非小组服务公司');
// }
// $apply = VehicleVillageApply::where('village_company_id',$company_id)->find();
// $data = [
// 'status' => 0,
// ];
// if($apply){
// $data['apply'] = $apply->toArray();
// }else{
// $data['apply'] = [];
// }
// $car = VehicleRent::where('rent_company_id',$company_id)->find();
// if($car){
// //当前坐标位置
// $position = curl_post('http://logistics.lihaink.cn/api/getCarLocal',[],['car_id'=>$car['car_id']]);
// if($position && $position['code'] == 1){
// $car['position'] = $position['data'];
// }
// $car['company'] = Company::where('id',$car['rent_company_id'])->find()->append(['province_name', 'city_name', 'area_name', 'street_name', 'village_name','brigade_name']);
// }else{
// $data['car'] = [];
// }
// return $this->success('success',$data);
}
//车辆详情
@ -292,14 +292,17 @@ class VehicleController extends BaseApiController
public function vehicleTrack() {
//获取参数
$params = $this->request->post(['car_id','start_time','end_time']);
if(empty($params['car_id']) || empty($params['start_time']) || empty($params['end_time'])){
return $this->fail('缺少必要参数');
}
//获取轨迹
$url = 'http://logistics.lihaink.cn/api/getCarHistory?car_id='.$params['car_id'].'&start_time='.$params['start_time'].'&end_time='.$params['end_time'];
$result = curl_get($url);
return $result;
return $this->success('success',$result['data']);
}
//镇街公司合同列表