From a29a8d00dd9bbcde53814119ad4a081f3b4c6740 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 06 Sep 2021 13:24:28 +0800
Subject: [PATCH] screen-manage 插入设备的时候，判断组织是否含有型号并且添加默认报警值
---
screen-common/src/main/java/com/moral/constant/ResultMessage.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 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 bc1d2f5..bf18e28 100644
--- a/screen-common/src/main/java/com/moral/constant/ResultMessage.java
+++ b/screen-common/src/main/java/com/moral/constant/ResultMessage.java
@@ -25,17 +25,32 @@
@ApiModelProperty("������������")
private T data;
+ public ResultMessage(int code, String msg, T data) {
+ this.code = code;
+ this.msg = msg;
+ this.data = data;
+ }
+
+ 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;
@@ -58,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;
}
@@ -74,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;
@@ -98,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