From 8a8a13eb80498e9b905b47b8dc4d52cd8fdb8497 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:36:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java |   61 +++++++++++++++++++++++++++++-
 1 files changed, 58 insertions(+), 3 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 2abf37f..2ae1af3 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
@@ -3,11 +3,14 @@
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.sy.domain.ArdSyCarLock;
+import com.ruoyi.sy.domain.ArdSyCarRtu;
 import com.ruoyi.sy.domain.ArdSyUser;
 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.sy.vo.RtuVo;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.utils.result.Results;
 import io.swagger.annotations.Api;
@@ -42,6 +45,14 @@
         return Results.succeed(list);
     }
 
+    @GetMapping("/carAddOne")
+    @ApiOperation("鏌ヨ鎵�鏈夋湭鎸傞攣鐨勮溅杈嗗姞鏈溅杈嗕俊鎭�")
+    public Results carAddOne(String carId){
+        List<CarVo> list = ardSyCarLockService.carAddOne(carId);
+        analysis(list);
+        return Results.succeed(list);
+    }
+
     @PostMapping("/add")
     @ApiOperation("娣诲姞rtu")
     public Results add(String carId){
@@ -57,7 +68,25 @@
     @GetMapping("/one")
     @ApiOperation("鏌ヨ涓�鏉tu鍙婇攣")
     public Results one(String carId){
-        return Results.succeed(ardSyCarLockService.carLock(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")
@@ -68,10 +97,36 @@
         return Results.succeed(list);
     }
 
-    @GetMapping("/addLock")
+    @PostMapping("/addLock")
     @ApiOperation("娣诲姞淇敼閿�")
     public Results addLock(@RequestBody List<ArdSyCarLock> locks){
-        return Results.succeed(ardSyCarLockService.addUpdLock(locks));
+        return Results.succeed("鎴愬姛娣诲姞/淇敼"+ardSyCarLockService.addUpdLock(locks)+"鏉℃暟鎹�");
+    }
+
+    @GetMapping("/onrRtu")
+    @ApiOperation("鏇存敼Rtu鍓嶆煡璇�")
+    public Results onrRtu(String carId){
+        RtuVo rtuVo = ardSyCarLockService.updRtu(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");
+        rtuVo.setCarPlate(carPlate);
+        String drvName = (String) jsonObject.get("drvName");
+        rtuVo.setDrvName(drvName);
+        String drvPhone = (String) jsonObject.get("drvPhone");
+        rtuVo.setDrvPhone(drvPhone);
+        return Results.succeed(rtuVo);
+    }
+
+    @PutMapping("/updRtu")
+    @ApiOperation("鏇存敼Rtu")
+    public Results updRtu(@RequestBody ArdSyCarRtu ardSyCarRtu){
+        return Results.succeed("鎴愬姛淇敼"+ardSyCarLockService.updRtuCar(ardSyCarRtu)+"鏉℃暟鎹�");
     }
 
     public List<CarVo> analysis(List<CarVo> list){

--
Gitblit v1.9.3