From d4c8d478007e72916a92516c42338ed0d9a84f58 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 02 十一月 2023 17:30:30 +0800
Subject: [PATCH] 清淤
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarLockController.java | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 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 fc95160..c73e34b 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
@@ -135,6 +135,44 @@
return Results.succeed("鎴愬姛淇敼"+ardSyCarLockService.updRtuCar(ardSyCarRtu)+"鏉℃暟鎹�");
}
+ @GetMapping("/queryCar")
+ @ApiOperation("娓呮筏鎵嬪姩娣诲姞杞﹁締鏌ヨ")
+ public AjaxResult queryCar(){
+ List<ArdAccessFence> ardAccessFences = ardAccessFenceService.all();
+ List<String> carIdList = new ArrayList<>();
+ for (int i = 0; i < ardAccessFences.size(); i++) {
+ String carId = ardAccessFences.get(i).getCarId();
+ carIdList.add(carId);
+ }
+ List<CarVo> list = ardSyCarLockService.queryCar(carIdList);
+ analysis(list);
+ return AjaxResult.success(list);
+ }
+
+ @PostMapping("/addCar")
+ @ApiOperation("娓呮筏鎵嬪姩娣诲姞杞﹁締淇濆瓨")
+ public AjaxResult addCar(String carId){
+ List<CarVo> list = ardSyCarLockService.addCarBefore(carId);
+ analysis(list);
+ if(list.size()>0){
+ return AjaxResult.success(ardAccessFenceService.addCar(list.get(0)));
+ }
+ return AjaxResult.success();
+ }
+
+ @DeleteMapping("/delCar")
+ @ApiOperation("娓呮筏鎵嬪姩娣诲姞杞﹁締鍒犻櫎")
+ public AjaxResult delCar(String id){
+ return AjaxResult.success(ardAccessFenceService.delCar(id));
+ }
+
+ @PutMapping("/addCar")
+ @ApiOperation("娓呯┖鎶ヨ")
+ public AjaxResult updCarAlarm(String id){
+ return AjaxResult.success(ardAccessFenceService.updCarAlarm(id));
+ }
+
+ //鑾峰彇31杞﹁締杞︾墝鍙烽┚椹跺憳鍜岀數璇�
public List<CarVo> analysis(List<CarVo> list){
String usersId = SecurityUtils.getUserId();
ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
@@ -156,23 +194,5 @@
return list;
}
- @GetMapping("/addCar")
- @ApiOperation("娓呮筏鎵嬪姩娣诲姞杞﹁締鏌ヨ")
- public AjaxResult queryCar(){
- List<ArdAccessFence> ardAccessFences = ardAccessFenceService.all();
- List<String> carIdList = new ArrayList<>();
- for (int i = 0; i < ardAccessFences.size(); i++) {
- String carId = ardAccessFences.get(i).getCarId();
- carIdList.add(carId);
- }
- List<CarVo> list = ardSyCarLockService.queryCar(carIdList);
- analysis(list);
- return AjaxResult.success(list);
- }
- @PostMapping("/addCar")
- @ApiOperation("娓呮筏鎵嬪姩娣诲姞杞﹁締淇濆瓨")
- public AjaxResult queryCar(@RequestBody CarVo carVo){
- return AjaxResult.success(ardAccessFenceService.addCar(carVo));
- }
}
--
Gitblit v1.9.3