From be63b8a9e0ea0733d210d9e883adcd32188c3259 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Wed, 30 Aug 2023 14:12:13 +0800
Subject: [PATCH] s

---
 app/api/logic/VehicleLogic.php |  6 ++++--
 app/common/logic/GpsLogic.php  | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/app/api/logic/VehicleLogic.php b/app/api/logic/VehicleLogic.php
index 7745f246..4ca3f0a5 100644
--- a/app/api/logic/VehicleLogic.php
+++ b/app/api/logic/VehicleLogic.php
@@ -241,12 +241,14 @@ class VehicleLogic extends BaseLogic
     }
 
     public static function getCarLocal($params):array {
-        $car = Vehicle::field('gps_carid')->where('id',$params['car_id'])->find();
+        $car = Vehicle::field('gps_imei')->where('id',$params['car_id'])->find();
         if(!$car){
             return ['code'=>0,'msg'=>'车辆不存在'];
         }
+        //获取车辆在gps系统中的id
+        $gps_car_id = (new GpsLogic()) -> info($car['gps_imei']);
         //获取车辆当前位置
-        $local = (new GpsLogic()) -> status($car['gps_carid']);
+        $local = (new GpsLogic()) -> status($gps_car_id['carId']);
         if($local['code'] == 1){
             $data = [
                 'car_id' => $params['car_id'],
diff --git a/app/common/logic/GpsLogic.php b/app/common/logic/GpsLogic.php
index dd0f33fb..122862b2 100644
--- a/app/common/logic/GpsLogic.php
+++ b/app/common/logic/GpsLogic.php
@@ -31,6 +31,22 @@ class GpsLogic extends BaseLogic
         }
     }
 
+    public function info($imei) {
+        //获取token
+        $token = $this->token();
+        //发起请求
+        $result = curl_post($this->domain.'/car/getByImei.do',[],[
+            'token' => $token,
+            'imei' => $imei,
+        ]);
+        //返回数据
+        if(!empty($result['ret']) && isset($result['data'])){
+            return ['code'=>1,'msg'=>'请求成功','data'=>$result['data']];
+        }else{
+            return ['code'=>0,'msg'=>$result['msg']];
+        }
+    }
+
     public function status($car_id):array {
         //获取token
         $token = $this->token();