Skip to content

E
extend
Commit 9af98b73 by lixian7
Options

Merge branch 'dev' into 'test' 

业务异常编码调整

See merge request !8
parents c373e2e2 bf880f12
Showing with 87 additions and 36 deletions
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/BindInfoControlller.java
package com.hikcreate.edl.pub.web.mobile.api.controller; package com.hikcreate.edl.pub.web.mobile.api.controller;
import com.hikcreate.common.orika.DefaultConverter; import com.hikcreate.common.orika.DefaultConverter;
import com.hikcreate.common.sdk.response.statuscode.StatusCode;
import com.hikcreate.edl.common.distributed.lock.exception.DistributedLockException; import com.hikcreate.edl.common.distributed.lock.exception.DistributedLockException;
import com.hikcreate.edl.pub.web.mobile.domain.IBindService; import com.hikcreate.edl.pub.web.mobile.domain.IBindService;
import com.hikcreate.edl.pub.web.mobile.infra.core.Result.Result; import com.hikcreate.edl.pub.web.mobile.infra.core.Result.Result;
...@@ -60,10 +61,10 @@ public class BindInfoControlller extends BaseController { ...@@ -60,10 +61,10 @@ public class BindInfoControlller extends BaseController {
response = service.bind(bindInfo); response = service.bind(bindInfo);
} catch ( DistributedLockException e ) { } catch ( DistributedLockException e ) {
log.error("分布式锁超时"); log.error("分布式锁超时");
return ResultGenerator.fail(ResultCode.REPEAT_SUBMIT); return ResultGenerator.fail(StatusCode.REPEAT_SUBMIT);
} catch ( Exception e ) { } catch ( Exception e ) {
log.error("系统异常：{}", e); log.error("系统异常：{}", e);
return ResultGenerator.fail(ResultCode.SYSTEM_ERROR); return ResultGenerator.fail(StatusCode.SYSTEM_ERROR);
} }
return response; return response;
} }
...@@ -84,10 +85,10 @@ public class BindInfoControlller extends BaseController { ...@@ -84,10 +85,10 @@ public class BindInfoControlller extends BaseController {
try { try {
result = service.unbindInfo(req); result = service.unbindInfo(req);
} catch ( DistributedLockException e ) { } catch ( DistributedLockException e ) {
return ResultGenerator.fail(ResultCode.REPEAT_SUBMIT); return ResultGenerator.fail(StatusCode.REPEAT_SUBMIT);
} catch ( Exception e ) { } catch ( Exception e ) {
log.error("系统异常：{}", e); log.error("系统异常：{}", e);
return ResultGenerator.fail(ResultCode.SYSTEM_ERROR); return ResultGenerator.fail(StatusCode.SYSTEM_ERROR);
} }
return result; return result;
} }
......
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/exception/GlobalExceptionHandler.java
...@@ -36,7 +36,7 @@ public class GlobalExceptionHandler { ...@@ -36,7 +36,7 @@ public class GlobalExceptionHandler {
@ResponseStatus(HttpStatus.OK) @ResponseStatus(HttpStatus.OK)
public Result handleServletRequestBindingException(ServletRequestBindingException e) { public Result handleServletRequestBindingException(ServletRequestBindingException e) {
log.error("param bind failure", e); log.error("param bind failure", e);
return ResultGenerator.fail(ResultCode.PARAM_ERROR); return ResultGenerator.fail(StatusCode.PARAM_ERROR);
} }
/** /**
...@@ -59,7 +59,7 @@ public class GlobalExceptionHandler { ...@@ -59,7 +59,7 @@ public class GlobalExceptionHandler {
message = fieldError.getDefaultMessage(); message = fieldError.getDefaultMessage();
} }
} }
return ResultGenerator.fail(ResultCode.PARAM_ERROR.getCode(), message); return ResultGenerator.fail(StatusCode.PARAM_ERROR.getCode(), message);
} }
/** /**
...@@ -76,16 +76,16 @@ public class GlobalExceptionHandler { ...@@ -76,16 +76,16 @@ public class GlobalExceptionHandler {
public Result handleValidationException( ConstraintViolationException e) { public Result handleValidationException( ConstraintViolationException e) {
for (ConstraintViolation<?> s : e.getConstraintViolations()) { for (ConstraintViolation<?> s : e.getConstraintViolations()) {
log.error("Request parameter is invalid {}", s.getMessage()); log.error("Request parameter is invalid {}", s.getMessage());
return ResultGenerator.fail(ResultCode.PARAM_ERROR); return ResultGenerator.fail(StatusCode.PARAM_ERROR);
} }
return ResultGenerator.fail(ResultCode.PARAM_ERROR); return ResultGenerator.fail(StatusCode.PARAM_ERROR);
} }
@ExceptionHandler(value = RetryableException.class) @ExceptionHandler(value = RetryableException.class)
@ResponseBody @ResponseBody
public Result retryableExceptionHandler(HttpServletRequest req, RetryableException e) throws Exception { public Result retryableExceptionHandler(HttpServletRequest req, RetryableException e) throws Exception {
log.error(" connect timed out", e); log.error(" connect timed out", e);
return ResultGenerator.fail(ResultCode.SYSTEM_ERROR.getCode(), "服务请求超时或不可用"); return ResultGenerator.fail(StatusCode.SYSTEM_ERROR.getCode(), "服务请求超时或不可用");
} }
/** /**
......
domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java
...@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; ...@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.hikcreate.common.sdk.response.statuscode.StatusCode;
import com.hikcreate.edl.common.distributed.lock.annotation.DistributedLock; import com.hikcreate.edl.common.distributed.lock.annotation.DistributedLock;
import com.hikcreate.edl.pub.web.mobile.domain.IBindService; import com.hikcreate.edl.pub.web.mobile.domain.IBindService;
import com.hikcreate.edl.pub.web.mobile.infra.core.Result.Result; import com.hikcreate.edl.pub.web.mobile.infra.core.Result.Result;
...@@ -128,7 +129,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i ...@@ -128,7 +129,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
if (phones != null && !phones.isEmpty()) { if (phones != null && !phones.isEmpty()) {
boolean phoneExist = phones.get(0).getUserId().equals(info.getUserId()); boolean phoneExist = phones.get(0).getUserId().equals(info.getUserId());
if (!phoneExist) { if (!phoneExist) {
return ResultGenerator.fail(ResultCode.DATA_ERROR.getCode(),"当前手机号已被其他客户绑定"); return ResultGenerator.fail(StatusCode.DATA_ERROR.getCode(),"当前手机号已被其他客户绑定");
} }
} }
...@@ -329,7 +330,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i ...@@ -329,7 +330,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
ParkVerifyInfo verify = verifyInfo.checkValidity(query.getPhone(), query.getUserId(), ParkVerifyInfo verify = verifyInfo.checkValidity(query.getPhone(), query.getUserId(),
DateUtil.offsetDay(DateTime.now(), -1)); DateUtil.offsetDay(DateTime.now(), -1));
if (verify == null) { if (verify == null) {
return ResultGenerator.fail(ResultCode.PERMISSION_DENIED); return ResultGenerator.fail(StatusCode.PERMISSION_DENIED);
} }
/** /**
......
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/core/Result/ParkServiceCode.java 0 → 100644
package com.hikcreate.edl.pub.web.mobile.infra.core.Result;
import com.hikcreate.common.sdk.response.statuscode.ServiceCode;
/**
* @Description
* @Author lixian
* @Date 2020/6/24 14:15
**/
public enum ParkServiceCode implements ServiceCode {
PARK_OPEN(2L,"停车对外服务")
;
private long code;
private String name;
private ParkServiceCode(long code, String name) {
this.code = code;
this.name = name;
}
@Override
public long getCode() {
return code;
}
@Override
public String getName() {
return name;
}
}
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/core/Result/Result.java
...@@ -2,6 +2,7 @@ package com.hikcreate.edl.pub.web.mobile.infra.core.Result; ...@@ -2,6 +2,7 @@ package com.hikcreate.edl.pub.web.mobile.infra.core.Result;
import com.hikcreate.common.sdk.exception.BusinessException; import com.hikcreate.common.sdk.exception.BusinessException;
import com.hikcreate.common.sdk.response.apiparam.Response; import com.hikcreate.common.sdk.response.apiparam.Response;
import com.hikcreate.common.sdk.response.statuscode.StatusCode;
import lombok.Data; import lombok.Data;
/** /**
...@@ -23,12 +24,12 @@ public class Result<T> { ...@@ -23,12 +24,12 @@ public class Result<T> {
/** /**
* 状态码 * 状态码
*/ */
private long code = ResultCode.SUCCESS.getCode(); private long code = StatusCode.SUCCESS.getCode();
/** /**
* 描述 * 描述
*/ */
private String msg = ResultCode.SUCCESS.getMsg(); private String msg = StatusCode.SUCCESS.getMsg();
/** /**
* 挂载数据 * 挂载数据
......
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/core/Result/ResultCode.java
package com.hikcreate.edl.pub.web.mobile.infra.core.Result; package com.hikcreate.edl.pub.web.mobile.infra.core.Result;
import com.hikcreate.common.sdk.response.statuscode.IStatusCode;
import com.hikcreate.common.sdk.response.statuscode.ProductCode;
import com.hikcreate.common.sdk.response.statuscode.StatusCodeHelper;
import com.hikcreate.edl.common.sdk.enums.EdlServiceCode;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
...@@ -8,34 +12,46 @@ import lombok.Getter; ...@@ -8,34 +12,46 @@ import lombok.Getter;
* @time：2020/6/24 10:28 * @time：2020/6/24 10:28
**/ **/
@AllArgsConstructor @AllArgsConstructor
@Getter public enum ResultCode implements IStatusCode {
public enum ResultCode {
SUCCESS(1000, "操作成功"), /*SUCCESS(1000, "操作成功"),
SYSTEM_ERROR(1001, "系统未知错误"), SYSTEM_ERROR(1001, "系统未知错误"),
PERMISSION_DENIED(1002, "没有权限"), PERMISSION_DENIED(1002, "没有权限"),
DATA_ERROR(1003, "数据错误"), DATA_ERROR(1003, "数据错误"),
REPEAT_SUBMIT(1004, "重复提交"), REPEAT_SUBMIT(1004, "重复提交"),
PARAM_ERROR(1005, "参数错误"), PARAM_ERROR(1005, "参数错误"),
BUSINESS_ERROR(1006, "业务错误"), BUSINESS_ERROR(1006, "业务错误"),*/
BIND_NUM_ERROR(1501, "同一客户绑定认证不超过3辆"), BIND_NUM_ERROR(2, "同一客户绑定认证不超过3辆"),
UNBIND_TOTAL_ERROR(1502, "30天内解绑次数超过10次,不能再次绑定认证"), UNBIND_TOTAL_ERROR(3, "30天内解绑次数超过10次,不能再次绑定认证"),
USERID_PHONE_ERROR(1503, "客户ID与手机号不一致"), USERID_PHONE_ERROR(4, "客户ID与手机号不一致"),
CAR_MESSAGE_UNKNOWN(1504, "车辆信息不存在"), CAR_MESSAGE_UNKNOWN(5, "车辆信息不存在"),
CAR_PHONE_UNMATCHED(1505, "手机号与车辆备案手机号不一致"), CAR_PHONE_UNMATCHED(6, "手机号与车辆备案手机号不一致"),
CAR_HAVE_BIND(1506, "车辆已被绑定"), CAR_HAVE_BIND(7, "车辆已被绑定"),
BIND_INFO_UNKNOWN(1507, "绑定认证不存在"), BIND_INFO_UNKNOWN(8, "绑定认证不存在"),
DRIVING_LICENSE_UNKNOWN(1508, "车主驾照信息不存在"); DRIVING_LICENSE_UNKNOWN(9, "车主驾照信息不存在");
/** private int customCode;
* 状态码
*/
private long code;
/**
* 描述信息
*/
private String msg; private String msg;
private StatusCodeHelper statusCodeHelper = new StatusCodeHelper(ProductCode.PARKING, ParkServiceCode.PARK_OPEN);
ResultCode(int customCode, String msg) {
this.customCode = customCode;
this.msg = msg;
}
@Override
public long getCode() {
return statusCodeHelper.getCode(this.customCode);
}
@Override
public String getMsg() {
return this.msg;
}
public static void main( String[] args ) {
for(ResultCode code :ResultCode.values()){
System.out.println(code.getMsg()+"----"+code.getCode());
}
}
} }
infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/core/Result/ResultGenerator.java
package com.hikcreate.edl.pub.web.mobile.infra.core.Result; package com.hikcreate.edl.pub.web.mobile.infra.core.Result;
import com.hikcreate.common.sdk.response.statuscode.IStatusCode;
import com.hikcreate.common.sdk.response.statuscode.StatusCode; import com.hikcreate.common.sdk.response.statuscode.StatusCode;
/** /**
...@@ -33,12 +34,12 @@ public class ResultGenerator { ...@@ -33,12 +34,12 @@ public class ResultGenerator {
public static <T> Result<T> fail(String msg) { public static <T> Result<T> fail(String msg) {
Result<T> result = new Result<>(); Result<T> result = new Result<>();
result.setSuccess(false); result.setSuccess(false);
result.setCode(ResultCode.BUSINESS_ERROR.getCode()); result.setCode(StatusCode.BUSINESS_ERROR.getCode());
result.setMsg(msg); result.setMsg(msg);
return result; return result;
} }
public static <T> Result<T> fail(ResultCode statusCode) { public static <T> Result<T> fail( IStatusCode statusCode) {
Result<T> result = new Result<>(); Result<T> result = new Result<>();
result.setSuccess(false); result.setSuccess(false);
result.setCode(statusCode.getCode()); result.setCode(statusCode.getCode());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment