Merge remote-tracking branch 'origin/dev' into dev

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

@@ -66,7 +66,6 @@ public class BindInfoControlller extends BaseController {
      */
     @PostMapping("unbind")
     @BodyDecryptAnnotation
-    @ResponseEncryptAnnotation
     public Response unbindInfo(@RequestBody @Validated UnBindReq req) {
         return service.unbindInfo(req) ? ResponseGenerator.success() : ResponseGenerator.fail("解绑失败");
     }

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

@@ -13,9 +13,6 @@ import com.hikcreate.edl.pub.web.mobile.infra.data.cache.BindCache;
 import com.hikcreate.edl.pub.web.mobile.infra.data.cache.DrivingLicenseCache;
 import com.hikcreate.edl.pub.web.mobile.infra.data.cache.VechicleCache;
 import com.hikcreate.edl.pub.web.mobile.infra.data.cache.ViolationCache;
-import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.DrivingLicenseFeign;
-import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.VechicleFeign;
-import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.ViolationFeign;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request.IdCardQueryReq;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request.PlateNumAndTypeQueryReq;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request.PlateNumQueryReq;
@@ -30,6 +27,7 @@ import com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkVerifyInfo;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.BindInfoQueryReq;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.H5BindInfoQuery;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.UnBindReq;
+import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.BindInfoRes;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.DrivingLicenseInfoRes;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.InsuranceInfoRes;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.ResultList;
@@ -60,14 +58,8 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
     @Resource
     BindInfoMapper mapper;
     @Resource
-    VechicleFeign vechicle;
-    @Resource
-    ViolationFeign violatio;
-    @Resource
     VerifyInfoMapper verifyInfo;
     @Resource
-    DrivingLicenseFeign drivingLicense;
-    @Resource
     BindCache bindCache;
     @Resource
     VechicleCache vechicleCache;
@@ -78,8 +70,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
 
 
     @Override
-    public Response bind( ParkBindInfo info) {
-        info.setUnqId(UUID.randomUUID().toString());
+    public Response bind(ParkBindInfo info) {
         info.setGmtBindTime(DateTime.now().toString());
 
         //判断规则1:用户已绑定的车辆不超过3辆,包括已解绑但未过一个月的车辆
@@ -98,6 +89,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
         if (byPlateNum == null || byPlateNum.size() == 0) {
             return ResponseGenerator.fail(StatusCode.DATA_ERROR, "车辆信息不存在");
         }
+
         for (VehicleRes res : byPlateNum) {
             if (info.getPhone().equals(res.getSjhm())) {
                 info.setPlateType(res.getHpzl());
@@ -116,11 +108,12 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
         ParkBindInfo bindExist = mapper.selectOne(queryWrapper);
         if (bindExist != null) {
             return ResponseGenerator.fail(StatusCode.DATA_ERROR, "此车牌号已绑定");
-        } else {
-            info.setUnqId(UUID.randomUUID().toString());
-            mapper.insert(info);
         }
-        return ResponseGenerator.success(info.getUnqId());
+
+
+        info.setUnqId(UUID.randomUUID().toString());
+        mapper.insert(info);
+        return ResponseGenerator.success(new BindInfoRes(info.getUnqId()));
     }
 
     /**
@@ -142,9 +135,10 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
         Integer integer = mapper.selectCount(queryWrapper);
         if (integer >= 10) {
             return false;
-        } else {
-            return bindCache.unBind(req.getUnqId(), req.getUserId());
         }
+
+        return bindCache.unBind(req.getUnqId(), req.getUserId());
+
     }
 
     /**
@@ -154,7 +148,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
      * @return
      */
     @Override
-    public List<ParkBindInfo> selectByQuery( BindInfoQueryReq query) {
+    public List<ParkBindInfo> selectByQuery(BindInfoQueryReq query) {
         return bindCache.selectByQuery(query.getUserId());
     }
 
@@ -189,7 +183,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
     public Response<InsuranceInfoRes> insuranceInfo(H5BindInfoQuery query) {
         ParkBindInfo bindInfo = bindCache.getById(query.getUnqId());
         if (bindInfo == null || "0".equals(bindInfo.getStatus())) {
-            return ResponseGenerator.fail(StatusCode.DATA_ERROR,"绑定信息不存在");
+            return ResponseGenerator.fail(StatusCode.DATA_ERROR, "绑定信息不存在");
         }
         PlateNumAndTypeQueryReq req = new PlateNumAndTypeQueryReq();
         req.setPlateNum(bindInfo.getPlateNum());
@@ -227,7 +221,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
          */
         ParkBindInfo bindInfo = bindCache.getById(query.getUnqId());
         if (bindInfo == null || "0".equals(bindInfo.getStatus())) {
-            return ResponseGenerator.fail(StatusCode.DATA_ERROR,"绑定信息不存在");
+            return ResponseGenerator.fail(StatusCode.DATA_ERROR, "绑定信息不存在");
         }
 
         /**
@@ -263,7 +257,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
          */
         ParkBindInfo bindInfo = bindCache.getById(query.getUnqId());
         if (bindInfo == null || "0".equals(bindInfo.getStatus())) {
-            return ResponseGenerator.fail(StatusCode.DATA_ERROR,"绑定信息不存在");
+            return ResponseGenerator.fail(StatusCode.DATA_ERROR, "绑定信息不存在");
         }
 
         /**

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/model/param/response/BindInfoRes.java

+package com.hikcreate.edl.pub.web.mobile.infra.model.param.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 绑定操作返回结果封装
+ * @author: xieshixiang
+ * @time：2020/6/22 17:04
+ **/
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BindInfoRes {
+
+    /**
+     * 唯一键
+     */
+    private String unqId;
+}