From b468cde8bfd9d6e1d7ae7ccc535fc7e8ffb9f818 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 26 七月 2024 22:34:44 +0800
Subject: [PATCH] 电磁锁报警查询提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 079d6b9..379c517 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
@@ -9,9 +9,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdTankWall;
-import com.ruoyi.sy.service.IArdTankLockProcessLogService;
-import com.ruoyi.sy.service.IArdTankWallLockService;
-import com.ruoyi.sy.service.IArdTankWallService;
+import com.ruoyi.sy.service.*;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -30,7 +28,6 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.sy.domain.ArdTankLock;
-import com.ruoyi.sy.service.IArdTankLockService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -55,6 +52,9 @@
@Autowired
private IArdTankLockProcessLogService ardTankLockProcessLogService;
+
+ @Autowired
+ private IArdTankLockAlarmService ardTankLockAlarmService;
/**
* 鏌ヨ鐢电閿佸垪琛�
@@ -335,4 +335,21 @@
String username = SecurityUtils.getUsername();
return ardTankLockProcessLogService.processArdTankLockByLockId(userId,username,para);
}
+
+ @ApiOperation("鏌ヨ鐢电閿佹姤璀�")
+ @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);
+
+ 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