From 4b8bdee03a2469a0260611f4f06d26ef16c5383c Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 04 七月 2024 13:20:31 +0800
Subject: [PATCH] 电磁锁电子围栏分页查询及根据主键查询提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 18 +++++++++++++++++-
ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml | 1 +
2 files changed, 18 insertions(+), 1 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 d5440b8..eeff2ee 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
@@ -212,11 +212,27 @@
return toAjax(ardTankWallService.deleteArdTankWallById(id));
}
- @ApiOperation("鏌ヨ鍏ㄩ儴鐢靛瓙鍥存爮")
+ /*@ApiOperation("鏌ヨ鍏ㄩ儴鐢靛瓙鍥存爮")
@PreAuthorize("@ss.hasPermi('sy:lock:getAllArdTankWall')")
@GetMapping("/getAllArdTankWall")
public Results getAllArdTankWall() {
List<ArdTankWall> result = ardTankWallService.getAllArdTankWall();
return Results.succeed(result);
+ }*/
+
+ @ApiOperation("鏌ヨ鍏ㄩ儴鐢靛瓙鍥存爮")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getAllArdTankWall')")
+ @PostMapping("/getAllArdTankWall")
+ public TableDataInfo getAllArdTankWall(@RequestBody ArdTankWall ardTankWall) {
+ startPage();
+ List<ArdTankWall> list = ardTankWallService.selectArdTankWallList(ardTankWall);
+ return getDataTable(list);
+ }
+
+ @ApiOperation("鏍规嵁涓婚敭鑾峰彇鐢电閿佺數瀛愬洿鏍�")
+ @PreAuthorize("@ss.hasPermi('sy:tankWall:getArdTankWallById')")
+ @GetMapping(value = "/getArdTankWallById/{id}")
+ public AjaxResult getArdTankWallById(@PathVariable String id) {
+ return success(ardTankWallService.selectArdTankWallById(id));
}
}
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
index 67e4371..19cc695 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
@@ -20,6 +20,7 @@
<if test="wallName != null and wallName != ''"> and wall_name like '%'||#{wallName}||'%'</if>
<if test="wallPoi != null and wallPoi != ''"> and wall_poi = #{wallPoi}</if>
</where>
+ order by wall_name
</select>
<select id="selectArdTankWallById" parameterType="String" resultMap="ArdTankWallResult">
--
Gitblit v1.9.3