From 9a30a3a8d3862a9b2ce898535b7cb51c3ddac816 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 20 五月 2026 16:01:11 +0800
Subject: [PATCH] refactor(controller): 将控制器响应结果统一为R类型并继承BaseController
---
src/main/java/com/ruoyi/framework/web/controller/BaseController.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java b/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
index 5c6fe3e..3edde93 100644
--- a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
+++ b/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
@@ -16,7 +16,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.sql.SqlUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.PageDomain;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.framework.web.page.TableSupport;
@@ -93,69 +93,69 @@
/**
* 杩斿洖鎴愬姛
*/
- public AjaxResult success()
+ public R<?> success()
{
- return AjaxResult.success();
+ return R.ok();
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public AjaxResult success(String message)
+ public R<?> success(String message)
{
- return AjaxResult.success(message);
+ return R.ok(null, message);
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public AjaxResult success(Object data)
+ public R<?> success(Object data)
{
- return AjaxResult.success(data);
+ return R.ok(data);
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public AjaxResult error()
+ public R<?> error()
{
- return AjaxResult.error();
+ return R.fail();
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public AjaxResult error(String message)
+ public R<?> error(String message)
{
- return AjaxResult.error(message);
+ return R.fail(message);
}
/**
* 杩斿洖璀﹀憡娑堟伅
*/
- public AjaxResult warn(String message)
+ public R<?> warn(String message)
{
- return AjaxResult.warn(message);
+ return R.fail(HttpStatus.WARN, message);
}
/**
* 鍝嶅簲杩斿洖缁撴灉
- *
+ *
* @param rows 褰卞搷琛屾暟
* @return 鎿嶄綔缁撴灉
*/
- protected AjaxResult toAjax(int rows)
+ protected R<?> toAjax(int rows)
{
- return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+ return rows > 0 ? R.ok() : R.fail();
}
/**
* 鍝嶅簲杩斿洖缁撴灉
- *
+ *
* @param result 缁撴灉
* @return 鎿嶄綔缁撴灉
*/
- protected AjaxResult toAjax(boolean result)
+ protected R<?> toAjax(boolean result)
{
return result ? success() : error();
}
--
Gitblit v1.9.3