linjj
/
docus-collector2.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

注释不要的异常处理handler

Browse Source
segment2.0
linrf 2 years ago
parent 89d41d934b
commit 01e57e233f
2 changed files with 205 additions and 202 deletions
Show Stats Download Patch File Download Diff File

402
docus-api-common/src/main/java/com/docus/server/common/exception/GlobalExceptionHandler.java
Unescape Escape View File

@ -1,201 +1,201 @@
package com.docus.server.common.exception; //package com.docus.server.common.exception;
//
import com.docus.server.common.bean.Result; //import com.docus.server.common.bean.Result;
import com.docus.server.common.type.ResultEnum; //import com.docus.server.common.type.ResultEnum;
import com.docus.server.common.util.ValidatorResultUtil; //import com.docus.server.common.util.ValidatorResultUtil;
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Bean;
import org.springframework.dao.DataIntegrityViolationException; //import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.http.converter.HttpMessageNotReadableException; //import org.springframework.http.converter.HttpMessageNotReadableException;
import org.springframework.validation.BindException; //import org.springframework.validation.BindException;
import org.springframework.validation.BindingResult; //import org.springframework.validation.BindingResult;
import org.springframework.validation.beanvalidation.MethodValidationPostProcessor; //import org.springframework.validation.beanvalidation.MethodValidationPostProcessor;
import org.springframework.web.HttpMediaTypeNotSupportedException; //import org.springframework.web.HttpMediaTypeNotSupportedException;
import org.springframework.web.HttpRequestMethodNotSupportedException; //import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.MethodArgumentNotValidException; //import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.MissingServletRequestParameterException; //import org.springframework.web.bind.MissingServletRequestParameterException;
import org.springframework.web.bind.annotation.ExceptionHandler; //import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice; //import org.springframework.web.bind.annotation.RestControllerAdvice;
import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; //import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
//
import javax.validation.ConstraintViolation; //import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException; //import javax.validation.ConstraintViolationException;
import javax.validation.ValidationException; //import javax.validation.ValidationException;
import java.util.Set; //import java.util.Set;
//
/** ///**
* Copyright © 2018 五月工作室. All rights reserved. // * Copyright © 2018 五月工作室. All rights reserved.
* // *
* @Project: rabbitmq // * @Project: rabbitmq
* @ClassName: GlobalExceptionHandler // * @ClassName: GlobalExceptionHandler
* @Package: com.docus.viewtaskcollect.common.exception // * @Package: com.docus.viewtaskcollect.common.exception
* @author: zhuqb // * @author: zhuqb
* @Description: // * @Description:
* @date: 2019/7/10 0010 下午 17:19 // * @date: 2019/7/10 0010 下午 17:19
* @Version: V1.0 // * @Version: V1.0
*/ // */
@RestControllerAdvice //@RestControllerAdvice
@Slf4j //@Slf4j
public class GlobalExceptionHandler { //public class GlobalExceptionHandler {
//
@Bean // @Bean
public MethodValidationPostProcessor methodValidationPostProcessor() { // public MethodValidationPostProcessor methodValidationPostProcessor() {
return new MethodValidationPostProcessor(); // return new MethodValidationPostProcessor();
} // }
//
/** // /**
* 400 - Bad Request 参数类型错误 // * 400 - Bad Request 参数类型错误
*/ // */
@ExceptionHandler(MethodArgumentTypeMismatchException.class) // @ExceptionHandler(MethodArgumentTypeMismatchException.class)
public Result handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e) { // public Result handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e) {
Result result = new Result(); // Result result = new Result();
result.setCode(ResultEnum.error()); // result.setCode(ResultEnum.error());
result.setMsg("parameter type error :" + e.getMessage()); // result.setMsg("parameter type error :" + e.getMessage());
return result; // return result;
} // }
//
/** // /**
* 400 - Bad Request 缺少请求参数 // * 400 - Bad Request 缺少请求参数
*/ // */
@ExceptionHandler(MissingServletRequestParameterException.class) // @ExceptionHandler(MissingServletRequestParameterException.class)
public Result handleMissingServletRequestParameterException(MissingServletRequestParameterException e) { // public Result handleMissingServletRequestParameterException(MissingServletRequestParameterException e) {
Result result = new Result(); // Result result = new Result();
result.setCode(ResultEnum.error()); // result.setCode(ResultEnum.error());
result.setMsg("required parameter is not present"); // result.setMsg("required parameter is not present");
return result; // return result;
} // }
//
/** // /**
* 400 - Bad Request 参数解析失败 // * 400 - Bad Request 参数解析失败
*/ // */
@ExceptionHandler(HttpMessageNotReadableException.class) // @ExceptionHandler(HttpMessageNotReadableException.class)
public Result handleHttpMessageNotReadableException(HttpMessageNotReadableException e) { // public Result handleHttpMessageNotReadableException(HttpMessageNotReadableException e) {
Result result = new Result(); // Result result = new Result();
result.setCode(ResultEnum.error()); // result.setCode(ResultEnum.error());
result.setMsg("could not read json"); // result.setMsg("could not read json");
return result; // return result;
} // }
//
/** // /**
* 400 - Bad Request 参数验证失败 // * 400 - Bad Request 参数验证失败
*/ // */
@ExceptionHandler(MethodArgumentNotValidException.class) // @ExceptionHandler(MethodArgumentNotValidException.class)
public Result handleMethodArgumentNotValidException(MethodArgumentNotValidException e) { // public Result handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
BindingResult bindingResult = e.getBindingResult(); // BindingResult bindingResult = e.getBindingResult();
String errorMsg = ValidatorResultUtil.getMessage(bindingResult); // String errorMsg = ValidatorResultUtil.getMessage(bindingResult);
Result result = new Result(); // Result result = new Result();
result.setCode(ResultEnum.error()); // result.setCode(ResultEnum.error());
result.setMsg(errorMsg); // result.setMsg(errorMsg);
return result; // return result;
} // }
//
/** // /**
* 400 - Bad Request 参数绑定失败 // * 400 - Bad Request 参数绑定失败
*/ // */
@ExceptionHandler(BindException.class) // @ExceptionHandler(BindException.class)
public Result handleBindException(BindException e) { // public Result handleBindException(BindException e) {
BindingResult bindingResult = e.getBindingResult(); // BindingResult bindingResult = e.getBindingResult();
String errorMsg = ValidatorResultUtil.getMessage(bindingResult); // String errorMsg = ValidatorResultUtil.getMessage(bindingResult);
Result result = new Result(); // Result result = new Result();
result.setCode(ResultEnum.error()); // result.setCode(ResultEnum.error());
result.setMsg(errorMsg); // result.setMsg(errorMsg);
return result; // return result;
} // }
//
/** // /**
* 400 - Bad Request 参数验证失败 // * 400 - Bad Request 参数验证失败
*/ // */
@ExceptionHandler(ConstraintViolationException.class) // @ExceptionHandler(ConstraintViolationException.class)
public Result handleServiceException(ConstraintViolationException e) { // public Result handleServiceException(ConstraintViolationException e) {
Set<ConstraintViolation<?>> violations = e.getConstraintViolations(); // Set<ConstraintViolation<?>> violations = e.getConstraintViolations();
ConstraintViolation<?> violation = violations.iterator().next(); // ConstraintViolation<?> violation = violations.iterator().next();
String errorMsg = violation.getMessage(); // String errorMsg = violation.getMessage();
Result result = new Result(); // Result result = new Result();
result.setCode(ResultEnum.error()); // result.setCode(ResultEnum.error());
result.setMsg("parameter:" + errorMsg); // result.setMsg("parameter:" + errorMsg);
return result; // return result;
} // }
//
/** // /**
* 400 - Bad Request 参数验证失败 // * 400 - Bad Request 参数验证失败
*/ // */
@ExceptionHandler(ValidationException.class) // @ExceptionHandler(ValidationException.class)
public Result handleValidationException(ValidationException e) { // public Result handleValidationException(ValidationException e) {
Result result = new Result(); // Result result = new Result();
result.setCode(ResultEnum.error()); // result.setCode(ResultEnum.error());
result.setMsg("validation exception"); // result.setMsg("validation exception");
return result; // return result;
} // }
//
/** // /**
* 405 - Method Not Allowed 不支持当前请求方法 // * 405 - Method Not Allowed 不支持当前请求方法
*/ // */
@ExceptionHandler(HttpRequestMethodNotSupportedException.class) // @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
public Result handleHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) { // public Result handleHttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) {
Result result = new Result(); // Result result = new Result();
result.setCode(ResultEnum.error()); // result.setCode(ResultEnum.error());
result.setMsg("request method not supported"); // result.setMsg("request method not supported");
return result; // return result;
} // }
//
/** // /**
* 415 - Unsupported Media Type 不支持当前媒体类型 // * 415 - Unsupported Media Type 不支持当前媒体类型
*/ // */
@ExceptionHandler(HttpMediaTypeNotSupportedException.class) // @ExceptionHandler(HttpMediaTypeNotSupportedException.class)
public Result handleHttpMediaTypeNotSupportedException(Exception e) { // public Result handleHttpMediaTypeNotSupportedException(Exception e) {
Result result = new Result(); // Result result = new Result();
result.setCode(ResultEnum.error()); // result.setCode(ResultEnum.error());
result.setMsg("content type not supported"); // result.setMsg("content type not supported");
return result; // return result;
} // }
//
/** // /**
* 操作数据库出现异常:名称重复，外键关联等 // * 操作数据库出现异常:名称重复，外键关联等
*/ // */
@ExceptionHandler(DataIntegrityViolationException.class) // @ExceptionHandler(DataIntegrityViolationException.class)
public Result handleException(DataIntegrityViolationException e) { // public Result handleException(DataIntegrityViolationException e) {
Result result = new Result(); // Result result = new Result();
result.setCode(ResultEnum.error()); // result.setCode(ResultEnum.error());
result.setMsg("operating database exception"); // result.setMsg("operating database exception");
return result; // return result;
} // }
//
/** // /**
* 500 - Internal Server Error 通用异常 // * 500 - Internal Server Error 通用异常
*/ // */
@ExceptionHandler(Exception.class) // @ExceptionHandler(Exception.class)
public Result handleException(Exception e) { // public Result handleException(Exception e) {
Result result = new Result(); // Result result = new Result();
result.setCode(ResultEnum.error()); // result.setCode(ResultEnum.error());
log.error(e.getMessage(), e); // log.error(e.getMessage(), e);
if (e instanceof NullPointerException) { // if (e instanceof NullPointerException) {
result.setMsg(String.valueOf(e)); // result.setMsg(String.valueOf(e));
} else { // } else {
result.setMsg(e.getMessage()); // result.setMsg(e.getMessage());
} // }
return result; // return result;
} // }
//
/** // /**
* 应用异常 // * 应用异常
*/ // */
@ExceptionHandler(RabbitMQException.class) // @ExceptionHandler(RabbitMQException.class)
public Result handleException(RabbitMQException e) { // public Result handleException(RabbitMQException e) {
Result result = new Result(); // Result result = new Result();
result.setCode(e.getCode()); // result.setCode(e.getCode());
result.setMsg(e.getMessage()); // result.setMsg(e.getMessage());
return result; // return result;
} // }
//
/** // /**
* 断言异常 // * 断言异常
*/ // */
@ExceptionHandler(AssertionError.class) // @ExceptionHandler(AssertionError.class)
public Result handleException(AssertionError e) { // public Result handleException(AssertionError e) {
Result result = new Result(); // Result result = new Result();
result.setCode(ResultEnum.error()); // result.setCode(ResultEnum.error());
result.setMsg(e.getMessage()); // result.setMsg(e.getMessage());
return result; // return result;
} // }
//
} //}

5
docus-recovery/src/main/java/com/docus/server/service/impl/RcvBasicServiceImpl.java
Unescape Escape View File

@ -359,7 +359,10 @@ public class RcvBasicServiceImpl implements IRcvBasicService {
List<AddRcvBasicDTO> updateDataList = insertAndUpdateData.get("update"); List<AddRcvBasicDTO> updateDataList = insertAndUpdateData.get("update");
List<RcvBasic> insert = RcvBasicConvert.INSTANCE.convertAddDOList(insertDataList); List<RcvBasic> insert = RcvBasicConvert.INSTANCE.convertAddDOList(insertDataList);
insert.forEach(p -> p.setId(idService.getDateSeq())); insert.forEach(p -> {
p.setId(idService.getDateSeq());
p.setRecoveryState(RecoveryStateEnum.RECYCLED_WAITING);
});
List<RcvBasic> update = RcvBasicConvert.INSTANCE.convertAddDOList(updateDataList); List<RcvBasic> update = RcvBasicConvert.INSTANCE.convertAddDOList(updateDataList);

Write Preview
Loading…
Cancel
Save