1

src/main/java/com/fdkankan/agent/common/ResultCode.java

@@ -29,6 +29,7 @@ public enum ResultCode {
     CAMERA_IS_GIVE(4026, "该相机已分发!"),
     FILE_TYPE_ERROR(4027, "文件格式校验，需为xlsx文件"),
     TEMPLATE_TYPE_ERROR(4028, "模板格式错误"),
+    UPLOAD_EXCEL_ERROR(4029, "批量导入失败"),
 
     ;
 

src/main/java/com/fdkankan/agent/exception/BusinessException.java

@@ -10,13 +10,24 @@ import lombok.Data;
 public class BusinessException extends RuntimeException {
     private int code;
     private String message;
+    private Object data;
 
     public BusinessException(Integer code, String msg){
         this.code = code;
         this.message = msg;
     }
+    public BusinessException(Integer code, String msg,Object data){
+        this.code = code;
+        this.message = msg;
+        this.data = data;
+    }
     public BusinessException(ResultCode errorCode) {
         this.code = errorCode.code;
         this.message = errorCode.msg;
     }
+    public BusinessException(ResultCode errorCode,Object data){
+        this.code = errorCode.code;
+        this.message = errorCode.msg;
+        this.data = data;
+    }
 }

src/main/java/com/fdkankan/agent/exception/GlobalExceptionHandler.java

@@ -30,6 +30,6 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(value = BusinessException.class)
     public ResultData businessExceptionHandler(BusinessException e) {
         log.error("业务异常code:{},message:{}", e.getCode(), e.getMessage());
-        return ResultData.error(e.getCode(), e.getMessage());
+        return ResultData.error(e.getCode(), e.getMessage(),e.getData());
     }
 }

src/main/java/com/fdkankan/agent/service/impl/ExcelServiceImpl.java

@@ -128,7 +128,7 @@ public class ExcelServiceImpl implements IExcelService {
     public void toExcelError(List<Integer> errorList) {
         String resultIn = ExcelErrorUtil.getResultIn(errorList);
         if(StringUtils.isNotBlank(resultIn)){
-            throw new BusinessException(-1,resultIn);
+            throw new BusinessException(ResultCode.UPLOAD_EXCEL_ERROR,resultIn);
         }
     }
 }