Merge remote-tracking branch 'origin/dev' into dev

lizijie

2021-03-18 f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243

 screen-common/src/main/java/com/moral/constant/ResultMessage.java

@@ -25,17 +25,26 @@
    @ApiModelProperty("返回对象")
    private T data;

    public ResultMessage(int code, String msg, T data) {
        this.code = code;
        this.msg = msg;
        this.data = data;
    }

    public ResultMessage() {
    }

    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 +67,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 +83,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 +107,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;
    }