添加新的异常类

4 years ago · ea5aaa860c
5 changed files with 148 additions and 12 deletions
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/BaseRequestLogAspect.java
@ -67,7 +67,15 @@ public abstract class BaseRequestLogAspect {
            log.info(">>>>>>>>请求信息>>>>>>>>:事务流水号:{},url:{} ,method:{},请求参数:{}", transactionSerial, requestURI, method, objectsToString(args));
            result = point.proceed();
            resultInfoLog(transactionSerial, getExecPeriod(startTime), result);
-        } catch (RenException e) {
+        } catch (EpmetException e) {
+            result = handleRenException(e);
+            if (e.getCode() > 8000) {
+                resultWarnLog(transactionSerial, getExecPeriod(startTime), result, e.getInternalMsg(), ExceptionUtils.getErrorStackTrace(e));
+            } else {
+                resultErrorLog(transactionSerial, getExecPeriod(startTime), result, e.getInternalMsg(), ExceptionUtils.getErrorStackTrace(e));
+            }
+            return result;
+        }  catch (RenException e) {
            result = handleRenException(e);
            if (e.getCode() > 8000) {
                resultWarnLog(transactionSerial, getExecPeriod(startTime), result, e.getInternalMsg(), ExceptionUtils.getErrorStackTrace(e));
@ -213,6 +221,31 @@ public abstract class BaseRequestLogAspect {
        return result;
    }

+    /**
+     * 处理EpmetException
+     * @param e
+     * @return
+     */
+    private Result handleRenException(EpmetException e) {
+        if (e.getCode() > 8000) {
+            Result result;
+            if (StringUtils.isNotBlank(e.getMsg())) {
+                // 抛出异常的时候填写了自定义显示信息，把显示信息返回
+                result = new Result().error(e.getCode(), e.getMsg());
+            } else {
+                // 没有填写显示信息，则根据code找固定的显示信息
+                result = new Result().error(e.getCode());
+            }
+            result.setInternalMsg(e.getInternalMsg());
+            return result;
+        }
+        // 转化成服务器开小差...
+        Result result=new Result().error();
+        result.setInternalMsg(e.getInternalMsg());
+        //result.setMsg(e.getMsg());
+        return result;
+    }
+
    /**
     * 将请求对象转换为String
     * @param args
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@ -212,9 +212,15 @@ public enum EpmetErrorCode {

 	SAME_RULE_NAME(8916,"该积分事件已存在，请重新调整保存"),
 	UP_LIMIT_POINT(8917,"积分上限需为单位积分倍数，请重新调整保存"),
-	BADGE_CHECK(8918,"");
+	BADGE_CHECK(8918,""),


+	//通用错误码 start
+	//通用的 错误消息自己定义返回
+	OPERATION_FAILED(9999,"网络开小差..."),
+	//通用错误码 end
+	;
+
 	private int code;
 	private String msg;

--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetException.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetException.java
@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.commons.tools.exception;
+
+
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.utils.MessageUtils;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Epmet产品 自定义异常
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public class EpmetException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * desc:错误码
+     */
+    protected int code;
+    /**
+     * 显示给客户的消息
+     */
+    protected String msg;
+    /**
+     * 内部消息，用于服务之间传递错误信息，排错用
+     */
+    protected String internalMsg;
+
+    /**
+     * desc:指定错误码异常 外部异常内容为错误码对应的异常
+     * @param code
+     */
+    public EpmetException(int code) {
+        this(code, StrConstant.EPMETY_STR);
+    }
+
+    /**
+     * desc:指定内部错误消息的异常 外部异常内容为错误码对应的异常
+     * @param code
+     * @param internalMsg
+     */
+    public EpmetException(int code, String internalMsg) {
+        super(internalMsg);
+        this.code = code;
+        if (StringUtils.isBlank(internalMsg)) {
+            this.internalMsg = EpmetErrorCode.getMsg(code);
+            if (StringUtils.isBlank(this.internalMsg)) {
+                this.internalMsg = MessageUtils.getMessage(code, internalMsg);
+            }
+        } else {
+            this.internalMsg = internalMsg;
+        }
+    }
+
+    /**
+     * desc：指定错误码 内外部错误消息异常
+     * @param code
+     * @param internalMsg
+     * @param externalMsg
+     */
+    public EpmetException(int code, String internalMsg, String externalMsg) {
+        this(code, internalMsg);
+        this.msg = externalMsg;
+    }
+
+    /**
+     * desc:指定内部消息异常 外部错误码及消息为8000，服务器开小差
+     * @param internalMsg
+     */
+    public EpmetException(String internalMsg) {
+        super(internalMsg);
+        this.code = EpmetErrorCode.SERVER_ERROR.getCode();
+        this.internalMsg = internalMsg;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public String getInternalMsg() {
+        return internalMsg;
+    }
+}
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java
@ -35,11 +35,12 @@ public class RenException extends RuntimeException {
     * 内部消息，用于服务之间传递错误信息，排错用
     */
    private String internalMsg;
-
+    @Deprecated  //已废弃 被EpmetException替代
    public RenException(int code) {
        this(code, "");
    }

+    @Deprecated  //已废弃 被EpmetException替代
    public RenException(int code, String internalMsg) {
        super(internalMsg);
        this.code = code;
@ -53,11 +54,13 @@ public class RenException extends RuntimeException {
        }
    }

+    @Deprecated  //已废弃 被EpmetException替代
    public RenException(int code, String internalMsg, String msg, MessageMode mode) {
        this(code, internalMsg);
        this.msg = msg;
    }

+    @Deprecated  //已废弃 被EpmetException替代
    public RenException(String internalMsg) {
        super(internalMsg);
 //		this.code = ErrorCode.INTERNAL_SERVER_ERROR;
@ -65,15 +68,12 @@ public class RenException extends RuntimeException {
        this.internalMsg = internalMsg;
    }

+    @Deprecated  //已废弃 被EpmetException替代
    public RenException(String internalMsg, String msg) {
        this(internalMsg);
        this.msg = msg;
    }

-
-
-
-
    public RenException(int code, String... params) {
        this.code = code;
        this.internalMsg = EpmetErrorCode.getMsg(code);
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/AssertUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/AssertUtils.java
@ -11,6 +11,7 @@ package com.epmet.commons.tools.validator;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.ArrayUtil;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import org.apache.commons.lang3.StringUtils;
@ -32,7 +33,7 @@ public class AssertUtils {

    public static void isBlank(String str, Integer code, String... params) {
        if(code == null){
-            throw new RenException(ErrorCode.NOT_NULL, "code");
+            throw new EpmetException(ErrorCode.NOT_NULL, "code");
        }

        if (StringUtils.isBlank(str)) {
@ -46,7 +47,7 @@ public class AssertUtils {

    public static void isNull(Object object, Integer code, String... params) {
        if(code == null){
-            throw new RenException(ErrorCode.NOT_NULL, "code");
+            throw new EpmetException(ErrorCode.NOT_NULL, "code");
        }

        if (object == null) {
@ -60,7 +61,7 @@ public class AssertUtils {

    public static void isArrayEmpty(Object[] array, Integer code, String... params) {
        if(code == null){
-            throw new RenException(ErrorCode.NOT_NULL, "code");
+            throw new EpmetException(ErrorCode.NOT_NULL, "code");
        }

        if(ArrayUtil.isEmpty(array)){
@ -74,7 +75,7 @@ public class AssertUtils {

    public static void isListEmpty(List<?> list, Integer code, String... params) {
        if(code == null){
-            throw new RenException(ErrorCode.NOT_NULL, "code");
+            throw new EpmetException(ErrorCode.NOT_NULL, "code");
        }

        if(CollUtil.isEmpty(list)){
@ -88,7 +89,7 @@ public class AssertUtils {

    public static void isMapEmpty(Map map, Integer code, String... params) {
        if(code == null){
-            throw new RenException(ErrorCode.NOT_NULL, "code");
+            throw new EpmetException(ErrorCode.NOT_NULL, "code");
        }

        if(MapUtil.isEmpty(map)){