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

更新

Browse Source
This commit is contained in:
mkm 2023-08-24 18:35:29 +08:00
parent 86e5d12945
commit ba65c7c102
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/api/controller/RemoteController.php
View File

@ -179,7 +179,9 @@ class RemoteController extends BaseApiController
]); ]);
$json=json_decode($res->getContent(),true); $json=json_decode($res->getContent(),true);
$points=$json['data']; $points=$json['data'];
if(empty($points)){
return false;
}
$target =[ $target =[
"lat"=> $latitude1, "lat"=> $latitude1,
"lon"=> $longitude1 "lon"=> $longitude1
@ -195,6 +197,7 @@ class RemoteController extends BaseApiController
* 计算两点之间的距离 * 计算两点之间的距离
*/ */
function getClosestPoint($points, $target) { function getClosestPoint($points, $target) {
halt($points,$target);
$minDistance = PHP_INT_MAX; $minDistance = PHP_INT_MAX;
$closestPoint = null; $closestPoint = null;
foreach ($points as $point) { foreach ($points as $point) {

7
app/api/controller/TaskController.php
View File

@ -115,12 +115,14 @@ class TaskController extends BaseApiController
'end_time'=>$end_time 'end_time'=>$end_time
]; ];
$data['status'] = 2; $data['status'] = 2;
Log::error( $parmas);
if (isset($parmas['terminus'])) { if (isset($parmas['terminus'])) {
if( $parmas['terminus']['lnglat'][0]==null || $parmas['terminus']['lnglat'][0]<=0){ if( $parmas['terminus']['lnglat'][0]==null || $parmas['terminus']['lnglat'][0]<=0){
return $this->fail('定位不存在'); return $this->fail('定位不存在');
} }
$res = App(RemoteController::class)->coordinate($datas, $parmas['terminus']['lnglat'][0], $parmas['terminus']['lnglat'][1]); $res = App(RemoteController::class)->coordinate($datas, $parmas['terminus']['lnglat'][0], $parmas['terminus']['lnglat'][1]);
if($res==false){
return $this->fail('定位不存在|或GPS无轨迹');
}
$task['extend']['update']['terminus'] = $parmas['terminus']; $task['extend']['update']['terminus'] = $parmas['terminus'];
} }
if (isset($parmas['transfer'])) { if (isset($parmas['transfer'])) {
@ -128,6 +130,9 @@ class TaskController extends BaseApiController
return $this->fail('定位不存在'); return $this->fail('定位不存在');
} }
$res = App(RemoteController::class)->coordinate($datas, $parmas['transfer']['lnglat'][0], $parmas['transfer']['lnglat'][1]); $res = App(RemoteController::class)->coordinate($datas, $parmas['transfer']['lnglat'][0], $parmas['transfer']['lnglat'][1]);
if($res==false){
return $this->fail('定位不存在|或GPS无轨迹');
}
$task['extend']['update']['transfer'] = $parmas['transfer']; $task['extend']['update']['transfer'] = $parmas['transfer'];
} }
if (isset($task['extend']['update']['terminus']) && isset($task['extend']['update']['transfer'])) { if (isset($task['extend']['update']['terminus']) && isset($task['extend']['update']['transfer'])) {