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-09-25 19:25:59 +08:00
parent e3b189b1cc
commit 0f9d69f1d0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,7 +228,7 @@ class TaskController extends BaseApiController
if($res>200){ if($res>200){
return $this->fail('定位坐标大于200米，请重新打卡。'.$res.'米'); return $this->fail('定位坐标大于200米，请重新打卡。'.$res.'米');
} }
$res = App(RemoteController::class)->coordinate($datas, $parmas['terminus']['lnglat'][0], $parmas['terminus']['lnglat'][1]); $res_two = App(RemoteController::class)->coordinate($datas, $parmas['terminus']['lnglat'][0], $parmas['terminus']['lnglat'][1]);
if($res===false){ if($res===false){
return $this->fail('GPS无轨迹'); return $this->fail('GPS无轨迹');
} }
@ -240,9 +240,9 @@ class TaskController extends BaseApiController
} }
$res = App(RemoteController::class)->calculateDistance($task['extend']['transfer']['lnglat'][0],$task['extend']['transfer']['lnglat'][1], $parmas['transfer']['lnglat'][0], $parmas['transfer']['lnglat'][1]); $res = App(RemoteController::class)->calculateDistance($task['extend']['transfer']['lnglat'][0],$task['extend']['transfer']['lnglat'][1], $parmas['transfer']['lnglat'][0], $parmas['transfer']['lnglat'][1]);
if($res>200){ if($res>200){
return $this->fail('定位坐标大于100米，请重新打卡。'.$res.'米'); return $this->fail('定位坐标大于200米，请重新打卡。'.$res.'米');
} }
$res = App(RemoteController::class)->coordinate($datas, $parmas['transfer']['lnglat'][0], $parmas['transfer']['lnglat'][1]); $res_two = App(RemoteController::class)->coordinate($datas, $parmas['transfer']['lnglat'][0], $parmas['transfer']['lnglat'][1]);
if($res===false){ if($res===false){
return $this->fail('GPS无轨迹'); return $this->fail('GPS无轨迹');
} }
@ -251,7 +251,7 @@ class TaskController extends BaseApiController
if (isset($task['extend']['update']['terminus']) && isset($task['extend']['update']['transfer'])) { if (isset($task['extend']['update']['terminus']) && isset($task['extend']['update']['transfer'])) {
$data['status'] = 3; $data['status'] = 3;
} }
if($res<200){ if($res_two<1000){
$data['extend'] = json_encode($task['extend']); $data['extend'] = json_encode($task['extend']);
Task::where('id', $parmas['id'])->update($data); Task::where('id', $parmas['id'])->update($data);
return $this->success('更新成功'); return $this->success('更新成功');