From 2799314298467be9ed68d9e19891e35cb3c3edad Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 01 八月 2024 08:14:18 +0800
Subject: [PATCH] 电磁锁动作状态改为操控中...提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 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 379c517..ffe9391 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
@@ -56,6 +56,9 @@
@Autowired
private IArdTankLockAlarmService ardTankLockAlarmService;
+ @Autowired
+ private IArdTankLockPasswordService ardTankLockPasswordService;
+
/**
* 鏌ヨ鐢电閿佸垪琛�
*/
@@ -340,8 +343,6 @@
@PreAuthorize("@ss.hasPermi('sy:lock:getAlarm')")
@PostMapping("/getAlarm")
public TableDataInfo getAlarm(@RequestBody Map<String,Object> para) {
-
- PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
String userId = SecurityUtils.getUserId();
Map<String,Object> result = ardTankLockAlarmService.getAlarm(userId,para);
@@ -352,4 +353,33 @@
dataTable.setMsg("鏌ヨ鎴愬姛");
return dataTable;
}
+
+ @ApiOperation("鏍规嵁閿佷富閿煡璇㈢數纾侀攣瀵嗙爜")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getLockPasswordByLockId')")
+ @PostMapping("/getLockPasswordByLockId")
+ public TableDataInfo getLockPasswordByLockId(@RequestBody Map<String,Object> para) {
+ Map<String,Object> result = ardTankLockPasswordService.getLockPasswordByLockId(para);
+
+ TableDataInfo dataTable = new TableDataInfo();
+ dataTable.setRows((List<Map<String,Object>>) result.get("list"));
+ dataTable.setTotal((Long) result.get("total"));
+ dataTable.setCode(200);
+ dataTable.setMsg("鏌ヨ鎴愬姛");
+ return dataTable;
+ }
+
+ @ApiOperation("鏍规嵁涓変竴涓婚敭鏌ヨ鐢电閿佸瘑鐮�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getLockPasswordByCarId')")
+ @PostMapping("/getLockPasswordByCarId")
+ public TableDataInfo getLockPasswordByCarId(@RequestBody Map<String,Object> para) {
+ String userId = SecurityUtils.getUserId();
+ Map<String,Object> result = ardTankLockPasswordService.getLockPasswordByCarId(userId,para);
+
+ TableDataInfo dataTable = new TableDataInfo();
+ dataTable.setRows((List<Map<String,Object>>) result.get("list"));
+ dataTable.setTotal((Long) result.get("total"));
+ dataTable.setCode(200);
+ dataTable.setMsg("鏌ヨ鎴愬姛");
+ return dataTable;
+ }
}
--
Gitblit v1.9.3