From 68157f39e1d56ce2a44f80620bf33b7510cbb327 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期三, 18 六月 2025 16:55:09 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/R.java | 130 ++++++++++++++++++++++--------------------
1 files changed, 68 insertions(+), 62 deletions(-)
diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/R.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/R.java
index 56f5807..3efe873 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/R.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/R.java
@@ -1,62 +1,68 @@
-package com.zy.asrs.framework.common;
-
-import java.util.HashMap;
-
-/**
- * Created by vincent on 2019-06-09
- */
-public class R extends HashMap<String, Object> {
-
- private static final long serialVersionUID = 1L;
-
- private static final String CODE = "code";
- private static final String MSG = "msg";
- private static final String DATA = "data";
-
- public R(Integer code, String msg){
- super.put(CODE, code);
- super.put(MSG, msg);
- }
-
- public static R ok(){
- return parse(BaseRes.OK);
- }
-
- public static R ok(String msg){
- R r = ok();
- r.put(MSG, msg);
- return r;
- }
-
- public static R ok(Object obj){
- return parse(BaseRes.OK).add(obj);
- }
-
- public static R error(){
- return parse(BaseRes.ERROR);
- }
-
- public static R error(String msg){
- R r = error();
- r.put(MSG, msg);
- return r;
- }
-
- public R add(Object obj){
- this.put(DATA, obj);
- return this;
- }
-
- public static R parse(String message){
- if(Cools.isEmpty(message)){
- return parse(BaseRes.ERROR);
- }
- String[] msg = message.split("-");
- if(msg.length==2){
- return new R(Integer.parseInt(msg[0]),msg[1]);
- }else{
- return parse("500-".concat(message));
- }
- }
-
-}
+package com.zy.asrs.framework.common;
+
+import java.util.HashMap;
+
+/**
+ * Created by vincent on 2019-06-09
+ */
+public class R extends HashMap<String, Object> {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final String CODE = "code";
+ private static final String MSG = "msg";
+ private static final String DATA = "data";
+
+ public R(Integer code, String msg){
+ super.put(CODE, code);
+ super.put(MSG, msg);
+ }
+
+ public static R ok(){
+ return parse(BaseRes.OK);
+ }
+
+ public static R success(){return success(BaseRes.SUCESS);}
+
+ public static R success(String msg){
+ return new R(0, msg);
+ }
+
+ public static R ok(String msg){
+ R r = ok();
+ r.put(MSG, msg);
+ return r;
+ }
+
+ public static R ok(Object obj){
+ return parse(BaseRes.OK).add(obj);
+ }
+
+ public static R error(){
+ return parse(BaseRes.ERROR);
+ }
+
+ public static R error(String msg){
+ R r = error();
+ r.put(MSG, msg);
+ return r;
+ }
+
+ public R add(Object obj){
+ this.put(DATA, obj);
+ return this;
+ }
+
+ public static R parse(String message){
+ if(Cools.isEmpty(message)){
+ return parse(BaseRes.ERROR);
+ }
+ String[] msg = message.split("-");
+ if(msg.length==2){
+ return new R(Integer.parseInt(msg[0]),msg[1]);
+ }else{
+ return parse("500-".concat(message));
+ }
+ }
+
+}
--
Gitblit v1.9.1