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/service/impl/ArdTankWallServiceImpl.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java
index d57f56f..1773afc 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java
@@ -1,11 +1,15 @@
package com.ruoyi.sy.service.impl;
+import java.util.HashMap;
import java.util.List;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.sy.mapper.ArdTankWallLockMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Map;
+
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.sy.mapper.ArdTankWallMapper;
@@ -18,12 +22,15 @@
* 鐢电閿佺數瀛愬洿鏍廠ervice涓氬姟灞傚鐞�
*
* @author ard
- * @date 2024-07-01
+ * @date 2024-07-04
*/
@Service
public class ArdTankWallServiceImpl implements IArdTankWallService {
@Resource
private ArdTankWallMapper ardTankWallMapper;
+
+ @Resource
+ private ArdTankWallLockMapper ardTankWallLockMapper;
/**
* 鏌ヨ鐢电閿佺數瀛愬洿鏍�
@@ -43,8 +50,14 @@
* @return 鐢电閿佺數瀛愬洿鏍�
*/
@Override
- public List<ArdTankWall> selectArdTankWallList(ArdTankWall ardTankWall) {
- return ardTankWallMapper.selectArdTankWallList(ardTankWall);
+ public Map<String,Object> selectArdTankWallList(ArdTankWall ardTankWall) {
+ List<ArdTankWall> result = ardTankWallMapper.selectArdTankWallList(ardTankWall);
+ Long total = ardTankWallMapper.selectArdTankWallTotal(ardTankWall.getWallName());
+ Map<String,Object> resultMap = new HashMap();
+ resultMap.put("list",result);
+ resultMap.put("total",total);
+ return resultMap;
+ //return ardTankWallMapper.selectArdTankWallList(ardTankWall);
}
/**
@@ -89,7 +102,11 @@
*/
@Override
public int deleteArdTankWallById(String id) {
- return ardTankWallMapper.deleteArdTankWallById(id);
+ try{
+ return ardTankWallMapper.deleteArdTankWallById(id);
+ } finally {
+ ardTankWallLockMapper.deleteArdTankWallLockByWallId(id);
+ }
}
@Override
@@ -97,4 +114,10 @@
List<ArdTankWall> result = ardTankWallMapper.getAllArdTankWall();
return result;
}
+
+ @Override
+ public List<Map<String,String>> getArdTankWallByLockId(String id) {
+ List<Map<String,String>> result = ardTankWallMapper.getArdTankWallByLockId(id);
+ return result;
+ }
}
--
Gitblit v1.9.3