Merge branch 'dev' into 'test'

Dev

See merge request !7

api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/BindInfoControlller.java

@@ -61,6 +61,9 @@ public class BindInfoControlller extends BaseController {
         } catch ( DistributedLockException e ) {
         } catch ( DistributedLockException e ) {
             log.error("分布式锁超时");
             log.error("分布式锁超时");
             return ResultGenerator.fail(ResultCode.REPEAT_SUBMIT);
             return ResultGenerator.fail(ResultCode.REPEAT_SUBMIT);
+        } catch ( Exception e ) {
+            log.error("系统异常：{}", e);
+            return ResultGenerator.fail(ResultCode.SYSTEM_ERROR);
         }
         }
         return response;
         return response;
     }
     }
@@ -77,7 +80,16 @@ public class BindInfoControlller extends BaseController {
     @PostMapping( "unbind" )
     @PostMapping( "unbind" )
     @BodyDecryptAnnotation
     @BodyDecryptAnnotation
     public Result unbindInfo( @RequestBody @Validated UnBindReq req ) {
     public Result unbindInfo( @RequestBody @Validated UnBindReq req ) {
-        return service.unbindInfo(req);
+        Result result = null;
+        try {
+             result = service.unbindInfo(req);
+        } catch ( DistributedLockException e ) {
+            return ResultGenerator.fail(ResultCode.REPEAT_SUBMIT);
+        } catch ( Exception e ) {
+            log.error("系统异常：{}", e);
+            return ResultGenerator.fail(ResultCode.SYSTEM_ERROR);
+        }
+        return result;
     }
     }
 
 
     /**
     /**

api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/H5Controller.java

@@ -146,7 +146,7 @@ public class H5Controller {
      * 发送短信验证码
      * 发送短信验证码
      *
      *
      * @param req
      * @param req
-     * @return Response
+     * @return Result
      * @author: xsx
      * @author: xsx
      * @date: 2020/6/21 13:57
      * @date: 2020/6/21 13:57
      */
      */
@@ -164,7 +164,7 @@ public class H5Controller {
      * 校验短信验证码
      * 校验短信验证码
      *
      *
      * @param req
      * @param req
-     * @return Response
+     * @return Result
      * @author: xsx
      * @author: xsx
      * @date: 2020/6/21 13:58
      * @date: 2020/6/21 13:58
      */
      */

api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/intercept/EncryptResponseBodyAdvice.java

@@ -41,7 +41,7 @@ public class EncryptResponseBodyAdvice implements ResponseBodyAdvice {
     @Override
     @Override
     public Object beforeBodyWrite( Object o, MethodParameter methodParameter, MediaType mediaType, Class aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse ) {
     public Object beforeBodyWrite( Object o, MethodParameter methodParameter, MediaType mediaType, Class aClass, ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse ) {
         try {
         try {
-            log.info("Response body 明文: {}", objectMapper.writeValueAsString(o));
+            log.info("Result body 明文: {}", objectMapper.writeValueAsString(o));
             if ( methodParameter.getMethod().isAnnotationPresent(ResponseEncryptAnnotation.class) && o instanceof Response ) {
             if ( methodParameter.getMethod().isAnnotationPresent(ResponseEncryptAnnotation.class) && o instanceof Response ) {
                 Response<Object> result = (Response<Object>) o;
                 Response<Object> result = (Response<Object>) o;
                 if ( StatusCode.SUCCESS.getCode() == (result.getCode()) ) {
                 if ( StatusCode.SUCCESS.getCode() == (result.getCode()) ) {
@@ -54,12 +54,12 @@ public class EncryptResponseBodyAdvice implements ResponseBodyAdvice {
                         baseEncryptRes.setEncData(encryptStr);
                         baseEncryptRes.setEncData(encryptStr);
                         result.setData(baseEncryptRes);
                         result.setData(baseEncryptRes);
                         o = result;
                         o = result;
-                        log.info("Response body 密文: {}", objectMapper.writeValueAsString(o));
+                        log.info("Result body 密文: {}", objectMapper.writeValueAsString(o));
                     }
                     }
                 }
                 }
             }
             }
         } catch ( Exception e ) {
         } catch ( Exception e ) {
-            log.error("Response body 加密异常：{}", e);
+            log.error("Result body 加密异常：{}", e);
         }
         }
         return o;
         return o;
     }
     }

domain/src/main/java/com/hikcreate/edl/pub/web/mobile/domain/impl/BindServiceImpl.java

@@ -176,13 +176,12 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @DistributedLock(key = "'park:extend:lock:unbind:unqId:'+#req.unqId+':userId:'+#req.userId+':timestamp:'+#req" +
     @DistributedLock(key = "'park:extend:lock:unbind:unqId:'+#req.unqId+':userId:'+#req.userId+':timestamp:'+#req" +
-            ".timestamp", expireTime = 3000, waitTime = 2000, retryTimes = 50)
-    public Result unbindInfo(UnBindReq req) {
+            ".timestamp", isSpin = false)
+    public Result unbindInfo(UnBindReq req)  {
         ParkBindInfo bindInfo = bindCache.getById(req.getUnqId());
         ParkBindInfo bindInfo = bindCache.getById(req.getUnqId());
         if (bindInfo == null || "0".equals(bindInfo.getStatus())) {
         if (bindInfo == null || "0".equals(bindInfo.getStatus())) {
             return ResultGenerator.fail(ResultCode.BIND_INFO_UNKNOWN);
             return ResultGenerator.fail(ResultCode.BIND_INFO_UNKNOWN);
         }
         }
-
         if (!bindCache.unBind(req.getUnqId(), req.getUserId())) {
         if (!bindCache.unBind(req.getUnqId(), req.getUserId())) {
             //手动回滚
             //手动回滚
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/core/Result/Result.java

@@ -23,12 +23,12 @@ public class Result<T>  {
     /**
     /**
      * 状态码
      * 状态码
      */
      */
-    private long code;
+    private long code = ResultCode.SUCCESS.getCode();
 
 
     /**
     /**
      * 描述
      * 描述
      */
      */
-    private String msg;
+    private String msg = ResultCode.SUCCESS.getMsg();
 
 
     /**
     /**
      * 挂载数据
      * 挂载数据

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/core/Result/ResultGenerator.java

@@ -33,7 +33,7 @@ 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(StatusCode.BUSINESS_ERROR.getCode());
+        result.setCode(ResultCode.BUSINESS_ERROR.getCode());
         result.setMsg(msg);
         result.setMsg(msg);
         return result;
         return result;
     }
     }

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/cache/ViolationCache.java

@@ -25,8 +25,7 @@ public class ViolationCache {
      * @param req 号牌+号牌类型，时间开始-结束
      * @param req 号牌+号牌类型，时间开始-结束
      * @return
      * @return
      */
      */
-    @Cacheable(value = "violations", key = "'plateNum:'+#req.plateNum+':plateType:'+#req.plateType+':timeStart:'+#req" +
-            ".timeStart.toString()+':timeEnd:'+#req.timeEnd.toString()", unless = "#result==null or #result.size()==0")
+    @Cacheable(value = "violations", key = "'plateNum:'+#req.plateNum+':plateType:'+#req.plateType", unless = "#result==null or #result.size()==0")
     public List<ViolationMicRes> getByPlateNumAndType(ViolationListByTimeReq req) {
     public List<ViolationMicRes> getByPlateNumAndType(ViolationListByTimeReq req) {
         return violatio.listByTime(req).getData();
         return violatio.listByTime(req).getData();
     }
     }