From bb22ca2e9b9c60b0138a322ad49cab7ea8aa06e1 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 25 十月 2023 17:12:54 +0800
Subject: [PATCH] 修复雷达引导2个相机引导录像重复问题；
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 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 855640f..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,12 +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;
@@ -39,6 +41,14 @@
@ApiOperation("鏌ヨ鎵�鏈夋湭鎸傞攣鐨勮溅杈�")
public Results car(){
List<CarVo> list = ardSyCarLockService.car();
+ analysis(list);
+ return Results.succeed(list);
+ }
+
+ @GetMapping("/carAddOne")
+ @ApiOperation("鏌ヨ鎵�鏈夋湭鎸傞攣鐨勮溅杈嗗姞鏈溅杈嗕俊鎭�")
+ public Results carAddOne(String carId){
+ List<CarVo> list = ardSyCarLockService.carAddOne(carId);
analysis(list);
return Results.succeed(list);
}
@@ -93,6 +103,32 @@
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){
String usersId = SecurityUtils.getUserId();
ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
--
Gitblit v1.9.3