From 463363f6ef3f5761a074016cc7d61778db0d6cd9 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 18 十月 2023 17:33:05 +0800
Subject: [PATCH] rtu管理

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java |   70 +++++++++++++++++++----------------
 1 files changed, 38 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..2abf37f 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
@@ -38,6 +38,43 @@
     @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){
+        return Results.succeed(ardSyCarLockService.carLock(carId));
+    }
+
+    @GetMapping("/query")
+    @ApiOperation("鏌ヨ鎵�鏈塺tu鎸傝浇鐨勮溅杈�")
+    public Results query(){
+        List<CarVo> list = ardSyCarLockService.carList();
+        analysis(list);
+        return Results.succeed(list);
+    }
+
+    @GetMapping("/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 +92,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