From 24e152d8a574e77b1909a8fea4703d4fe835c2a5 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: Fri, 05 Jul 2024 11:53:07 +0800
Subject: [PATCH] 查询电磁锁及挂接的车辆提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 72 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
index a0f3e6f..5a47087 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
@@ -131,13 +131,52 @@
return toAjax(ardTankLockService.deleteArdTankLockById(id));
}
- @ApiOperation("查询全部电磁锁")
+ /*@ApiOperation("查询全部电磁锁")
@PreAuthorize("@ss.hasPermi('sy:lock:getAll')")
@GetMapping("/getAll")
public Results getAll() {
String userId = SecurityUtils.getUserId();
Results result = ardTankLockService.getAll(userId);
return result;
+ }*/
+
+ @ApiOperation("查询全部电磁锁")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getAll')")
+ @GetMapping("/getAll")
+ public TableDataInfo getAll() {
+ startPage();
+ String userId = SecurityUtils.getUserId();
+ List<Map<String,Object>> result = ardTankLockService.getAll(userId);
+ return getDataTable(result);
+ }
+
+ /**
+ * 根据car_id获取电磁锁详细信息
+ */
+ @ApiOperation("根据car_id获取电磁锁详细信息")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getLockByCarId')")
+ @PostMapping("/getLockByCarId")
+ public AjaxResult getLockByCarId(@RequestBody ArdTankLock ardTankLock) {
+ String userId = SecurityUtils.getUserId();
+ return success(ardTankLockService.getLockByCarId(ardTankLock.getCarId(),userId));
+ }
+
+ /**
+ * 根据car_id删除电磁锁
+ */
+ @ApiOperation("根据car_id删除电磁锁")
+ @PreAuthorize("@ss.hasPermi('sy:lock:deleteLockByCarId')")
+ @PostMapping("/deleteLockByCarId")
+ public AjaxResult deleteLockByCarId(@RequestBody ArdTankLock ardTankLock) {
+ return toAjax(ardTankLockService.deleteLockByCarId(ardTankLock.getCarId()));
+ }
+
+ @ApiOperation("修改电磁锁")
+ @PreAuthorize("@ss.hasPermi('sy:lock:updateLockByCarId')")
+ @Log(title = "电磁锁" , businessType = BusinessType.UPDATE)
+ @PutMapping("/updateLockByCarId")
+ public AjaxResult updateLockByCarId(@RequestBody Map<String,Object> para) {
+ return toAjax(ardTankLockService.updateLockByCarId(para));
}
/**
@@ -173,11 +212,40 @@
return toAjax(ardTankWallService.deleteArdTankWallById(id));
}
- @ApiOperation("查询全部电子围栏")
+ /*@ApiOperation("查询全部电子围栏")
@PreAuthorize("@ss.hasPermi('sy:lock:getAllArdTankWall')")
@GetMapping("/getAllArdTankWall")
public Results getAllArdTankWall() {
List<ArdTankWall> result = ardTankWallService.getAllArdTankWall();
return Results.succeed(result);
+ }*/
+
+ @ApiOperation("查询全部电子围栏")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getAllArdTankWall')")
+ @PostMapping("/getAllArdTankWall")
+ public TableDataInfo getAllArdTankWall(@RequestBody ArdTankWall ardTankWall) {
+ startPage();
+ List<ArdTankWall> list = ardTankWallService.selectArdTankWallList(ardTankWall);
+ return getDataTable(list);
+ }
+
+ @ApiOperation("根据主键获取电磁锁电子围栏")
+ @PreAuthorize("@ss.hasPermi('sy:tankWall:getArdTankWallById')")
+ @GetMapping(value = "/getArdTankWallById/{id}")
+ public AjaxResult getArdTankWallById(@PathVariable String id) {
+ return success(ardTankWallService.selectArdTankWallById(id));
+ }
+
+ /**
+ * 模糊查询电磁锁及挂接的车辆
+ */
+ @ApiOperation("模糊查询电磁锁及挂接的车辆")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getLockByCarPlate')")
+ @PostMapping("/getLockByCarPlate")
+ public TableDataInfo getLockByCarPlate(@RequestBody Map<String,String> para) {
+ startPage();
+ String userId = SecurityUtils.getUserId();
+ List<Map<String,String>> result = ardTankLockService.getLockByCarPlate(userId,para.get("carPlate"));
+ return getDataTable(result);
}
}
--
Gitblit v1.9.3