From 2b8bbbbf97836f2230b42da2fd519a221af449b0 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 19 十月 2023 10:12:14 +0800
Subject: [PATCH] 车辆锁管理
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 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..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;
@@ -57,7 +58,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 +87,10 @@
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)+"鏉℃暟鎹�");
}
public List<CarVo> analysis(List<CarVo> list){
--
Gitblit v1.9.3