From af0635b1fe65174141620258d23bd9a7afe0bc2f Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 14 三月 2025 17:42:52 +0800
Subject: [PATCH] 设备bug解决、文件管理bug解决
---
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
index 24dbd70..b29a15e 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
@@ -10,7 +10,7 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -93,49 +93,49 @@
/**
* 杩斿洖鎴愬姛
*/
- public Result success()
+ public AjaxResult success()
{
- return Result.success();
+ return AjaxResult.success();
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public Result error()
+ public AjaxResult error()
{
- return Result.error();
+ return AjaxResult.error();
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public Result success(String message)
+ public AjaxResult success(String message)
{
- return Result.success(message);
+ return AjaxResult.success(message);
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public Result success(Object data)
+ public AjaxResult success(Object data)
{
- return Result.success(data);
+ return AjaxResult.success(data);
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public Result error(String message)
+ public AjaxResult error(String message)
{
- return Result.error(message);
+ return AjaxResult.error(message);
}
/**
* 杩斿洖璀﹀憡娑堟伅
*/
- public Result warn(String message)
+ public AjaxResult warn(String message)
{
- return Result.warn(message);
+ return AjaxResult.warn(message);
}
/**
@@ -144,9 +144,9 @@
* @param rows 褰卞搷琛屾暟
* @return 鎿嶄綔缁撴灉
*/
- protected Result toAjax(int rows)
+ protected AjaxResult toAjax(int rows)
{
- return rows > 0 ? Result.success() : Result.error();
+ return rows > 0 ? AjaxResult.success() : AjaxResult.error();
}
/**
@@ -155,7 +155,7 @@
* @param result 缁撴灉
* @return 鎿嶄綔缁撴灉
*/
- protected Result toAjax(boolean result)
+ protected AjaxResult toAjax(boolean result)
{
return result ? success() : error();
}
--
Gitblit v1.9.3