From 51e4fb4bd7cb6d0e8bb890b35097ccc71f847847 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 26 九月 2025 09:11:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java b/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java
index 51253c6..890aeaa 100644
--- a/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java
+++ b/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java
@@ -1,6 +1,7 @@
package com.ruoyi.framework.web.domain;
import java.util.HashMap;
+import java.util.Objects;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.utils.StringUtils;
@@ -102,9 +103,32 @@
}
/**
+ * 杩斿洖璀﹀憡娑堟伅
+ *
+ * @param msg 杩斿洖鍐呭
+ * @return 璀﹀憡娑堟伅
+ */
+ public static AjaxResult warn(String msg)
+ {
+ return AjaxResult.warn(msg, null);
+ }
+
+ /**
+ * 杩斿洖璀﹀憡娑堟伅
+ *
+ * @param msg 杩斿洖鍐呭
+ * @param data 鏁版嵁瀵硅薄
+ * @return 璀﹀憡娑堟伅
+ */
+ public static AjaxResult warn(String msg, Object data)
+ {
+ return new AjaxResult(HttpStatus.WARN, msg, data);
+ }
+
+ /**
* 杩斿洖閿欒娑堟伅
*
- * @return
+ * @return 閿欒娑堟伅
*/
public static AjaxResult error()
{
@@ -115,7 +139,7 @@
* 杩斿洖閿欒娑堟伅
*
* @param msg 杩斿洖鍐呭
- * @return 璀﹀憡娑堟伅
+ * @return 閿欒娑堟伅
*/
public static AjaxResult error(String msg)
{
@@ -127,7 +151,7 @@
*
* @param msg 杩斿洖鍐呭
* @param data 鏁版嵁瀵硅薄
- * @return 璀﹀憡娑堟伅
+ * @return 閿欒娑堟伅
*/
public static AjaxResult error(String msg, Object data)
{
@@ -139,7 +163,7 @@
*
* @param code 鐘舵�佺爜
* @param msg 杩斿洖鍐呭
- * @return 璀﹀憡娑堟伅
+ * @return 閿欒娑堟伅
*/
public static AjaxResult error(int code, String msg)
{
@@ -147,6 +171,36 @@
}
/**
+ * 鏄惁涓烘垚鍔熸秷鎭�
+ *
+ * @return 缁撴灉
+ */
+ public boolean isSuccess()
+ {
+ return Objects.equals(HttpStatus.SUCCESS, this.get(CODE_TAG));
+ }
+
+ /**
+ * 鏄惁涓鸿鍛婃秷鎭�
+ *
+ * @return 缁撴灉
+ */
+ public boolean isWarn()
+ {
+ return Objects.equals(HttpStatus.WARN, this.get(CODE_TAG));
+ }
+
+ /**
+ * 鏄惁涓洪敊璇秷鎭�
+ *
+ * @return 缁撴灉
+ */
+ public boolean isError()
+ {
+ return Objects.equals(HttpStatus.ERROR, this.get(CODE_TAG));
+ }
+
+ /**
* 鏂逛究閾惧紡璋冪敤
*
* @param key 閿�
--
Gitblit v1.9.3