From d3c268e0384cd5887203f662472d0f275847219f Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 18 七月 2023 11:44:18 +0800
Subject: [PATCH] 提交
---
ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java | 6 +++---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 3 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 5 +++++
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java
index c44e3b9..2d2f9c3 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java
@@ -45,11 +45,11 @@
@PreAuthorize("@ss.hasPermi('alarmpoints:tubesDetails:list')")
@GetMapping("/list")
@ApiOperation("鏌ヨ绠＄嚎璇︽儏鍒楄〃")
- public TableDataInfo list(ArdTubesDetails ardTubesDetails)
+ public AjaxResult list(ArdTubesDetails ardTubesDetails)
{
- startPage();
+ //startPage();
List<ArdTubesDetails> list = ardTubesDetailsService.selectArdTubesDetailsList(ardTubesDetails);
- return getDataTable(list);
+ return AjaxResult.success(list);
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
index 72581a4..588480f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -2,6 +2,9 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -28,6 +31,7 @@
*
* @author ruoyi
*/
+@Api(tags = "鍙傛暟閰嶇疆")
@RestController
@RequestMapping("/system/config")
public class SysConfigController extends BaseController
@@ -78,6 +82,7 @@
/**
* 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�
*/
+ @ApiOperation("鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�")
@GetMapping(value = "/configKey/{configKey}")
public AjaxResult getConfigKey(@PathVariable String configKey)
{
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index f60b022..9fad46e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -125,6 +125,7 @@
/**
* 鏂板鐢ㄦ埛
*/
+
@PreAuthorize("@ss.hasPermi('system:user:add')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
@@ -152,6 +153,7 @@
/**
* 淇敼鐢ㄦ埛
*/
+
@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
@@ -180,6 +182,7 @@
/**
* 鍒犻櫎鐢ㄦ埛
*/
+ @ApiOperation(value = "鍒犻櫎鐢ㄦ埛")
@PreAuthorize("@ss.hasPermi('system:user:remove')")
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}")
--
Gitblit v1.9.3