From 6fe3c583389375f1b54f5c260ae8e2604c11f515 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 02 七月 2024 13:49:22 +0800
Subject: [PATCH] 电磁锁查询加入分页修改提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 12 +++++++++++-
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java | 10 +++++++++-
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java | 3 ++-
ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml | 4 ++++
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java | 6 ++----
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java | 14 ++++++++------
6 files changed, 36 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 a0f3e6f..48dd8f0 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
@@ -131,13 +131,23 @@
return toAjax(ardTankLockService.deleteArdTankLockById(id));
}
- @ApiOperation("鏌ヨ鍏ㄩ儴鐢电閿�")
+ /*@ApiOperation("鏌ヨ鍏ㄩ儴鐢电閿�")
@PreAuthorize("@ss.hasPermi('sy:lock:getAll')")
@GetMapping("/getAll")
public Results getAll() {
String userId = SecurityUtils.getUserId();
Results result = ardTankLockService.getAll(userId);
return result;
+ }*/
+
+ @ApiOperation("鏌ヨ鍏ㄩ儴鐢电閿�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getAll')")
+ @GetMapping("/getAll")
+ public TableDataInfo getAll() {
+ startPage();
+ String userId = SecurityUtils.getUserId();
+ List<Map<String,Object>> result = ardTankLockService.getAll(userId);
+ return getDataTable(result);
}
/**
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java
index 70f5a45..6cf096c 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java
@@ -59,9 +59,7 @@
*/
public int deleteArdTankWallLockByProcessTypes(String[] processTypes);
- /**
- *鏍规嵁鐢电閿佷富閿垹闄ょ數纾侀攣
- *
- */
public int deleteArdTankWallLockByLockId(String lockId);
+
+ public int deleteArdTankWallLockByWallId(String wallId);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java
index ba0b0f8..7272fc9 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java
@@ -63,5 +63,6 @@
*/
public int deleteArdTankLockById(String id);
- public Results getAll(String usersId);
+ //public Results getAll(String usersId);
+ public List<Map<String,Object>> getAll(String usersId);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
index df379cd..8c1b9b5 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
@@ -143,18 +143,19 @@
}
@Override
- public Results getAll(String usersId) {
+ //public Results List<Map<String,Object>> getAll(String usersId) {
+ public List<Map<String,Object>> getAll(String usersId) {
ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId);
- if(ardSyUser == null){
+ /*if(ardSyUser == null){
return Results.error("娌℃湁鎸傛帴涓変竴杞﹁締鐢ㄦ埛");
- }
+ }*/
List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT");
String syURL = "";
if(syURLResult.size() != 0){
syURL = syURLResult.get(0).getConfigValue();
- }else{
+ }/*else{
return Results.error("涓変竴杞﹁締鍦板潃鏈綍鍏�");
- }
+ }*/
String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, ardSyUser.getUserId());
String sessionId = (String) LogInResult.get("sessionId");
@@ -205,6 +206,7 @@
}
}
}
- return Results.succeed(result0);
+ //return Results.succeed(result0);
+ return result0;
}
}
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..109429c 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
@@ -3,6 +3,7 @@
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;
@@ -24,6 +25,9 @@
public class ArdTankWallServiceImpl implements IArdTankWallService {
@Resource
private ArdTankWallMapper ardTankWallMapper;
+
+ @Resource
+ private ArdTankWallLockMapper ardTankWallLockMapper;
/**
* 鏌ヨ鐢电閿佺數瀛愬洿鏍�
@@ -89,7 +93,11 @@
*/
@Override
public int deleteArdTankWallById(String id) {
- return ardTankWallMapper.deleteArdTankWallById(id);
+ try{
+ return ardTankWallMapper.deleteArdTankWallById(id);
+ } finally {
+ ardTankWallLockMapper.deleteArdTankWallLockByWallId(id);
+ }
}
@Override
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml
index fe471ef..8085bea 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml
@@ -69,4 +69,8 @@
<delete id="deleteArdTankWallLockByLockId" parameterType="java.lang.String">
delete from ard_tank_wall_lock where lock_id = #{lockId}
</delete>
+
+ <delete id="deleteArdTankWallLockByWallId" parameterType="java.lang.String">
+ delete from ard_tank_wall_lock where wall_id = #{wallId}
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3