ResultHelper

javahongxi · Sep 10, 2020 · 8af2243 · 8af2243
1 parent 23ea707
commit 8af2243
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/whatsmars-common/src/main/java/org/hongxi/whatsmars/common/result/ResultHelper.java b/whatsmars-common/src/main/java/org/hongxi/whatsmars/common/result/ResultHelper.java
@@ -5,33 +5,33 @@
  */
 public class ResultHelper {
 
-    public static <T> Result newSuccessResult(T data) {
-        Result result = newSuccessResult();
+    public static <T> Result<T> newSuccessResult(T data) {
+        Result<T> result = newSuccessResult();
         result.setData(data);
         return result;
     }
 
-    public static Result newErrorResult(int code, String message) {
-        return new Result(code, message);
+    public static <T> Result<T> newErrorResult(int code, String message) {
+        return new Result<>(code, message);
     }
 
-    public static Result newErrorResult() {
+    public static <T> Result<T> newErrorResult() {
         return newResult(false);
     }
 
-    public static Result newSuccessResult() {
+    public static  <T> Result<T> newSuccessResult() {
         return newResult(true);
     }
 
-    public static Result newResult(boolean success) {
+    public static  <T> Result<T> newResult(boolean success) {
         return newResult(success, null);
     }
 
-    public static Result newResult(boolean success, String message) {
+    public static  <T> Result<T> newResult(boolean success, String message) {
         if (success) {
-            return new Result(200, message == null ? "操作成功" : message);
+            return new Result<>(200, message == null ? "操作成功" : message);
         } else {
-            return new Result(500, message == null ? "系统繁忙，请稍后再试" : message);
+            return new Result<>(500, message == null ? "系统繁忙，请稍后再试" : message);
         }
     }
 

diff --git a/...src/main/java/org/hongxi/whatsmars/boot/sample/web/exception/DefaultExceptionHandler.java b/...src/main/java/org/hongxi/whatsmars/boot/sample/web/exception/DefaultExceptionHandler.java
@@ -22,15 +22,15 @@ public class DefaultExceptionHandler {
     @ResponseStatus(HttpStatus.OK)
     @ExceptionHandler(BusinessException.class)
     @ResponseBody
-    public Result handleLogicException(HttpServletRequest request, BusinessException e) {
+    public Result<Void> handleLogicException(HttpServletRequest request, BusinessException e) {
         log.error("business exception handled, request:{}", request.getRequestURI(), e);
         return ResultHelper.newErrorResult(e.getCode(), e.getMsg());
     }
 
     @ResponseStatus(HttpStatus.OK)
     @ExceptionHandler(Exception.class)
     @ResponseBody
-    public Result handleException(HttpServletRequest request, Exception e) throws Exception {
+    public Result<Void> handleException(HttpServletRequest request, Exception e) throws Exception {
         if (AnnotationUtils.findAnnotation(e.getClass(), ResponseStatus.class) != null) {
             throw e;
         }