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-22 16:38:49 +08:00
parent da2f0b5130
commit e44a0c0951
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,6 +208,7 @@ class RemoteController extends BaseApiController
/** /**
* *
* 计算两点之间的距离 * 计算两点之间的距离
* 返回米
*/ */
function calculateDistance($longitude1, $latitude1, $longitude2, $latitude2) function calculateDistance($longitude1, $latitude1, $longitude2, $latitude2)
{ {
@ -220,7 +221,6 @@ class RemoteController extends BaseApiController
cos(deg2rad($latitude1)) * cos(deg2rad($latitude2)) * cos(deg2rad($latitude1)) * cos(deg2rad($latitude2)) *
sin($dLon / 2) * sin($dLon / 2); sin($dLon / 2) * sin($dLon / 2);
$c = 2 * asin(sqrt($a)); $c = 2 * asin(sqrt($a));
return round($earthRadius * $c*1000) ;
return $earthRadius * $c * 100;
} }
} }

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

@ -183,7 +183,7 @@ class TaskController extends BaseApiController
Task::where('id', $parmas['id'])->update($data); Task::where('id', $parmas['id'])->update($data);
return $this->success('更新成功'); return $this->success('更新成功');
} }
return $this->fail('定位坐标大于100米，请重新打卡'); return $this->fail('定位坐标大于100米，请重新打卡。'.$res.'米');
} }
public function informationg_list() public function informationg_list()