From 4b6440a58c6402eacb09e9eba67f988bd65000a4 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 19 十月 2023 10:12:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java |   89 ++++++++++++++++++++++++++++----------------
 1 files changed, 57 insertions(+), 32 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 a5d3a43..855640f 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
@@ -7,6 +7,7 @@
 import com.ruoyi.sy.service.ArdSyCarLockService;
 import com.ruoyi.sy.service.IArdSyCarService;
 import com.ruoyi.sy.service.IArdSyUserService;
+import com.ruoyi.sy.vo.CarLockVo;
 import com.ruoyi.sy.vo.CarVo;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.utils.result.Results;
@@ -38,6 +39,61 @@
     @ApiOperation("鏌ヨ鎵�鏈夋湭鎸傞攣鐨勮溅杈�")
     public Results car(){
         List<CarVo> list = ardSyCarLockService.car();
+        analysis(list);
+        return Results.succeed(list);
+    }
+
+    @PostMapping("/add")
+    @ApiOperation("娣诲姞rtu")
+    public Results add(String carId){
+        return Results.succeed("鎴愬姛娣诲姞"+ardSyCarLockService.addRtu(carId)+"鏉℃暟鎹�");
+    }
+
+    @DeleteMapping("/del")
+    @ApiOperation("鍒犻櫎rtu")
+    public Results del(String id){
+        return Results.succeed("鎴愬姛鍒犻櫎"+ardSyCarLockService.delCar(id)+"鏉℃暟鎹�");
+    }
+
+    @GetMapping("/one")
+    @ApiOperation("鏌ヨ涓�鏉tu鍙婇攣")
+    public Results one(String carId){
+        CarLockVo carLockVo = new CarLockVo();
+        CarVo carVo = ardSyCarLockService.carOne(carId);
+        String usersId = SecurityUtils.getUserId();
+        ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+        String syURL = sysConfigService.getSYURL();
+        Results results = ardSyCarService.getCarGPSBycarId(usersId,carId,syURL,ardSyUser);
+        Map<String,Object> map = (Map<String, Object>) results.getData();
+        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);
+        carLockVo.setCar(carVo);
+        String rtu = carVo.getRtu();
+        carLockVo.setCarLockList(ardSyCarLockService.carLock(rtu));
+        return Results.succeed(carLockVo);
+    }
+
+    @GetMapping("/query")
+    @ApiOperation("鏌ヨ鎵�鏈塺tu鎸傝浇鐨勮溅杈�")
+    public Results query(){
+        List<CarVo> list = ardSyCarLockService.carList();
+        analysis(list);
+        return Results.succeed(list);
+    }
+
+    @PostMapping("/addLock")
+    @ApiOperation("娣诲姞淇敼閿�")
+    public Results addLock(@RequestBody List<ArdSyCarLock> locks){
+        return Results.succeed("鎴愬姛娣诲姞/淇敼"+ardSyCarLockService.addUpdLock(locks)+"鏉℃暟鎹�");
+    }
+
+    public List<CarVo> analysis(List<CarVo> list){
         String usersId = SecurityUtils.getUserId();
         ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
         String syURL = sysConfigService.getSYURL();
@@ -55,38 +111,7 @@
             String drvPhone = (String) jsonObject.get("drvPhone");
             carVo.setDrvPhone(drvPhone);
         }
-        return Results.succeed(list);
+        return list;
     }
-
-    @PostMapping("/add")
-    @ApiOperation("娣诲姞rtu")
-    public Results add(String carId){
-        return Results.succeed("鎴愬姛娣诲姞"+ardSyCarLockService.addRtu(carId)+"鏉℃暟鎹�");
-    }
-
-    @DeleteMapping("/del")
-    @ApiOperation("鍒犻櫎rtu")
-    public Results del(String carId){
-        return Results.succeed("鎴愬姛鍒犻櫎"+ardSyCarLockService.delCar(carId)+"鏉℃暟鎹�");
-    }
-
-    @GetMapping("/one")
-    @ApiOperation("鏌ヨ涓�鏉tu鍙婇攣")
-    public Results one(String carId){
-        return Results.succeed(ardSyCarLockService.carLock(carId));
-    }
-
-    @GetMapping("/query")
-    @ApiOperation("鏌ヨ鎵�鏈塺tu鎸傝浇鐨勮溅杈�")
-    public Results query(){
-        return Results.succeed(ardSyCarLockService.carList());
-    }
-
-    @GetMapping("/addLock")
-    @ApiOperation("娣诲姞淇敼閿�")
-    public Results addLock(@RequestBody List<ArdSyCarLock> locks){
-        return Results.succeed(ardSyCarLockService.addUpdLock(locks));
-    }
-
 
 }

--
Gitblit v1.9.3