From dd07cafb1604f528fbb7a04a79fc89b55198e080 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 08 七月 2024 16:24:15 +0800
Subject: [PATCH] 电子围栏挂接bug修改提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 f5fbc50..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,5 +1,6 @@
package com.ruoyi.sy.service.impl;
+import java.util.HashMap;
import java.util.List;
import com.ruoyi.common.utils.uuid.IdUtils;
@@ -7,6 +8,8 @@
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;
@@ -47,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);
}
/**
@@ -105,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