From 771d591cb1ef40344f6c84b5c30cfd8ffd8e2f14 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 23 Apr 2021 14:49:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-common/src/main/java/com/moral/constant/ResultMessage.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/ResultMessage.java b/screen-common/src/main/java/com/moral/constant/ResultMessage.java
index 50b9fa2..bf18e28 100644
--- a/screen-common/src/main/java/com/moral/constant/ResultMessage.java
+++ b/screen-common/src/main/java/com/moral/constant/ResultMessage.java
@@ -34,17 +34,23 @@
public ResultMessage() {
}
+ public ResultMessage(ResponseCodeEnum codeEnum,T data){
+ this.code = codeEnum.getCode();
+ this.msg = codeEnum.getMsg();
+ this.data = data;
+ }
+
public static ResultMessage ok() {
ResultMessage resultMessage = new ResultMessage();
- resultMessage.setCode(Constants.CODE_OPERATION_SUCCESS);
- resultMessage.setMessage(Constants.MSG_OPERATION_SUCCESS);
+ resultMessage.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ resultMessage.setMessage(ResponseCodeEnum.SUCCESS.getMsg());
resultMessage.setData(new HashMap<>());
return resultMessage;
}
public static ResultMessage ok(String msg) {
ResultMessage resultMessage = new ResultMessage();
- resultMessage.setCode(Constants.CODE_OPERATION_SUCCESS);
+ resultMessage.setCode(ResponseCodeEnum.SUCCESS.getCode());
resultMessage.setMessage(msg);
resultMessage.setData(new HashMap<>());
return resultMessage;
@@ -67,8 +73,8 @@
public static <T> ResultMessage<T> ok(T data) {
ResultMessage resultMessage = new ResultMessage();
- resultMessage.setCode(Constants.CODE_OPERATION_SUCCESS);
- resultMessage.setMessage(Constants.MSG_OPERATION_SUCCESS);
+ resultMessage.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ resultMessage.setMessage(ResponseCodeEnum.SUCCESS.getMsg());
resultMessage.setData(data == null ?new HashMap<>():data);
return resultMessage;
}
@@ -83,15 +89,15 @@
public static ResultMessage fail() {
ResultMessage resultMessage = new ResultMessage();
- resultMessage.setCode(Constants.CODE_OPERATION_FAILED);
- resultMessage.setMessage(Constants.MSG_OPERATION_FAILED);
+ resultMessage.setCode(ResponseCodeEnum.FAIL.getCode());
+ resultMessage.setMessage(ResponseCodeEnum.FAIL.getMsg());
resultMessage.setData(new HashMap<>());
return resultMessage;
}
public static ResultMessage fail(String msg) {
ResultMessage resultMessage = new ResultMessage();
- resultMessage.setCode(Constants.CODE_OPERATION_FAILED);
+ resultMessage.setCode(ResponseCodeEnum.FAIL.getCode());
resultMessage.setMessage(msg);
resultMessage.setData(new HashMap<>());
return resultMessage;
@@ -107,8 +113,8 @@
public static <T> ResultMessage<T> fail(T data) {
ResultMessage resultMessage = new ResultMessage();
- resultMessage.setCode(Constants.CODE_OPERATION_FAILED);
- resultMessage.setMessage(Constants.MSG_OPERATION_FAILED);
+ resultMessage.setCode(ResponseCodeEnum.FAIL.getCode());
+ resultMessage.setMessage(ResponseCodeEnum.FAIL.getMsg());
resultMessage.setData(data == null ?new HashMap<>():data);
return resultMessage;
}
--
Gitblit v1.8.0