From ff93a75e1ede2f3a66de84efd822cfa94b0ac821 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 01 二月 2024 15:59:59 +0800
Subject: [PATCH] 三一车辆追踪修改提交

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
index a281656..1f46524 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java
@@ -217,7 +217,7 @@
     @GetMapping("/lockIng")
     @ApiOperation("瀹炴椂閿佺姸鎬�")
     public AjaxResult lockIng(String carId)  {
-        return AjaxResult.success(ardSyCarLockService.lockIng(carId));
+        return ardSyCarLockService.lockIng(carId);
     }
 
 
@@ -231,13 +231,15 @@
             String carId = carVo.getCarId();
             Map<String,Object> map = ardSyCarService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser);
             List list1 = (List) map.get("list");
-            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(list1.get(0)));
-            String carPlate = (String) jsonObject.get("carPlate");
-            carVo.setCarPlate(carPlate);
-            String drvName = (String) jsonObject.get("drvName");
-            carVo.setDrvName(drvName);
-            String drvPhone = (String) jsonObject.get("drvPhone");
-            carVo.setDrvPhone(drvPhone);
+            if(list1.size()>0){
+                JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(list1.get(0)));
+                String carPlate = (String) jsonObject.get("carPlate");
+                carVo.setCarPlate(carPlate);
+                String drvName = (String) jsonObject.get("drvName");
+                carVo.setDrvName(drvName);
+                String drvPhone = (String) jsonObject.get("drvPhone");
+                carVo.setDrvPhone(drvPhone);
+            }
         }
         return list;
     }

--
Gitblit v1.9.3