From ba65c7c102df4725251b29fbee16943f886165ce Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 24 Aug 2023 18:35:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/RemoteController.php | 5 ++++-
 app/api/controller/TaskController.php   | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/api/controller/RemoteController.php b/app/api/controller/RemoteController.php
index 91d17cff1..a162a9b44 100644
--- a/app/api/controller/RemoteController.php
+++ b/app/api/controller/RemoteController.php
@@ -179,7 +179,9 @@ class RemoteController extends BaseApiController
         ]);
         $json=json_decode($res->getContent(),true);
         $points=$json['data'];
-
+        if(empty($points)){
+            return false;
+        }
         $target =[
             "lat"=> $latitude1,
             "lon"=> $longitude1
@@ -195,6 +197,7 @@ class RemoteController extends BaseApiController
      * 计算两点之间的距离
      */
     function getClosestPoint($points, $target) {
+        halt($points,$target);
         $minDistance = PHP_INT_MAX;
         $closestPoint = null;
         foreach ($points as $point) {
diff --git a/app/api/controller/TaskController.php b/app/api/controller/TaskController.php
index f4323a153..9f038c0d1 100644
--- a/app/api/controller/TaskController.php
+++ b/app/api/controller/TaskController.php
@@ -115,12 +115,14 @@ class TaskController extends BaseApiController
             'end_time'=>$end_time
         ];
         $data['status'] = 2;
-        Log::error( $parmas);
         if (isset($parmas['terminus'])) {
             if( $parmas['terminus']['lnglat'][0]==null || $parmas['terminus']['lnglat'][0]<=0){
                 return $this->fail('定位不存在');
             }
             $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'];
         }
         if (isset($parmas['transfer'])) {
@@ -128,6 +130,9 @@ class TaskController extends BaseApiController
                 return $this->fail('定位不存在');
             }
             $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'];
         }
         if (isset($task['extend']['update']['terminus']) && isset($task['extend']['update']['transfer'])) {