From 6bab172dc8767e93c8889c15a146c76e4d38e9c0 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 27 七月 2024 09:23:04 +0800
Subject: [PATCH] 电磁锁报警查询bug修改提交

---
 ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java |   58 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 45 insertions(+), 13 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 3dfbfd2..0c331b4 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,8 +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.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;
@@ -29,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;
 
@@ -51,6 +49,12 @@
 
     @Autowired
     private IArdTankWallLockService ardTankWallLockService;
+
+    @Autowired
+    private IArdTankLockProcessLogService ardTankLockProcessLogService;
+
+    @Autowired
+    private IArdTankLockAlarmService ardTankLockAlarmService;
 
     /**
      * 鏌ヨ鐢电閿佸垪琛�
@@ -158,11 +162,11 @@
 
         PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
         String userId = SecurityUtils.getUserId();
-        List<Map<String,Object>> result = ardTankLockService.getAll(userId);
+        Map<String,Object> result = ardTankLockService.getAll(userId);
 
         TableDataInfo dataTable = new TableDataInfo();
-        dataTable.setRows(result);
-        dataTable.setTotal(result.size());
+        dataTable.setRows((List<Map<String,Object>>) result.get("list"));
+        dataTable.setTotal((Long) result.get("total"));
         dataTable.setCode(200);
         dataTable.setMsg("鏌ヨ鎴愬姛");
         return dataTable;
@@ -250,11 +254,11 @@
         PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
         ArdTankWall ardTankWall = new ArdTankWall();
         ardTankWall.setWallName((String) para.get("wallName"));
-        List<ArdTankWall> list = ardTankWallService.selectArdTankWallList(ardTankWall);
+        Map<String,Object> result = ardTankWallService.selectArdTankWallList(ardTankWall);
 
         TableDataInfo dataTable = new TableDataInfo();
-        dataTable.setRows(list);
-        dataTable.setTotal(list.size());
+        dataTable.setRows((List<ArdTankWall>) result.get("list"));
+        dataTable.setTotal((Long) result.get("total"));
         dataTable.setCode(200);
         dataTable.setMsg("鏌ヨ鎴愬姛");
         return dataTable;
@@ -278,13 +282,13 @@
         String userId = SecurityUtils.getUserId();
         List<Map<String,String>> result = ardTankLockService.getLockByCarPlate(userId,para.get("carPlate"));
         return getDataTable(result);*/
-        PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
+        //PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
         String userId = SecurityUtils.getUserId();
-        List<Map<String,Object>> result = ardTankLockService.getLockByCarPlate(userId, (String) para.get("carPlate"));
+        Map<String,Object> result = ardTankLockService.getLockByCarPlate(userId, (String) para.get("carPlate"),(Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
 
         TableDataInfo dataTable = new TableDataInfo();
-        dataTable.setRows(result);
-        dataTable.setTotal(result.size());
+        dataTable.setRows((List<Map<String,Object>>) result.get("list"));
+        dataTable.setTotal((Long) result.get("total"));
         dataTable.setCode(200);
         dataTable.setMsg("鏌ヨ鎴愬姛");
         return dataTable;
@@ -318,4 +322,32 @@
     public AjaxResult deleteArdTankWallLockByLockId(@PathVariable String id) {
         return toAjax(ardTankWallLockService.deleteArdTankWallLockByLockId(id));
     }
+
+    /**
+     * 鎿嶆帶鐢电閿�
+     */
+    @ApiOperation("鎿嶆帶鐢电閿�")
+    @PreAuthorize("@ss.hasPermi('sy:lock:processArdTankLockByLockId')")
+    @Log(title = "鐢电閿�" , businessType = BusinessType.INSERT)
+    @PostMapping("/processArdTankLockByLockId")
+    public AjaxResult processArdTankLockByLockId(@RequestBody Map<String,String> para) {
+        String userId = SecurityUtils.getUserId();
+        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) {
+        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