From 4c7e2078a1439ad6fb42f8854f5f8ac1e6859cbc Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 18 十二月 2023 15:19:58 +0800
Subject: [PATCH] fly
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 2b6f049..92d6ab4 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
@@ -12,6 +12,7 @@
import com.ruoyi.sy.param.AddCarParam;
import com.ruoyi.sy.param.AddRtuParam;
import com.ruoyi.sy.param.LockTypeParam;
+import com.ruoyi.sy.param.RtuTypeParam;
import com.ruoyi.sy.service.*;
import com.ruoyi.sy.service.impl.ArdSyCarRtuServiceImpl;
import com.ruoyi.sy.vo.CarLockVo;
@@ -97,6 +98,9 @@
carLockVo.setCar(carVo);
String rtu = carVo.getRtu();
carLockVo.setCarLockList(ardSyCarLockService.carLock(rtu));
+ ArdSyCarRtu ardSyCarRtu = ardSyCarRtuService.one(carId);
+ carVo.setInstallType(ardSyCarRtu.getInstallType());
+ carVo.setUnloadType(ardSyCarRtu.getUnloadType());
return AjaxResult.success(carLockVo);
}
@@ -114,9 +118,9 @@
return Results.succeed("鎴愬姛娣诲姞/淇敼"+ardSyCarLockService.addUpdLock(locks)+"鏉℃暟鎹�");
}
- @GetMapping("/onrRtu")
+ @GetMapping("/oneRtu")
@ApiOperation("鏇存敼Rtu鍓嶆煡璇�")
- public Results onrRtu(String carId){
+ public Results oneRtu(String carId){
RtuVo rtuVo = ardSyCarLockService.updRtu(carId);
String usersId = SecurityUtils.getUserId();
ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
@@ -185,16 +189,16 @@
return AjaxResult.success(ardAccessFenceService.updCarAlarm(id));
}
- @GetMapping("/onOff")
+ @PostMapping("/onOff")
@ApiOperation("杩滅▼寮�閿�")
- public AjaxResult onOff(@RequestBody LockTypeParam lockTypeParam) {
- return AjaxResult.success(ardSyCarLockService.onOff(lockTypeParam));
+ public AjaxResult onOff(@RequestBody LockTypeParam lockTypeParam) throws MqttException {
+ return ardSyCarLockService.onOff(lockTypeParam);
}
- @GetMapping("/seal")
+ @PostMapping("/seal")
@ApiOperation("杩滅▼灏佸嵃")
- public AjaxResult seal(@RequestBody LockTypeParam lockTypeParam) {
- return AjaxResult.success(ardSyCarLockService.seal(lockTypeParam));
+ public AjaxResult seal(@RequestBody RtuTypeParam rtuTypeParam) {
+ return ardSyCarLockService.seal(rtuTypeParam);
}
@GetMapping("/lockIng")
--
Gitblit v1.9.3