修改绑定接口

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

@@ -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.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 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 com.hikcreate.common.sdk.response.statuscode.StatusCode;
@@ -23,6 +24,8 @@ import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.par
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request.PlateNumQueryReq;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.request.PlateNumQueryReq;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.response.DrivingLicenseRes;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.response.DrivingLicenseRes;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.response.VehicleRes;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.response.VehicleRes;
+import com.hikcreate.edl.pub.web.mobile.infra.data.feign.edl_pub_service_sms.SmsFeign;
+import com.hikcreate.edl.pub.web.mobile.infra.data.feign.edl_pub_service_sms.param.request.CheckVerifyCodeMicReq;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.edl_pvt_service_drivinglicense.DrivingLicenseQrFeign;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.edl_pvt_service_drivinglicense.DrivingLicenseQrFeign;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.edl_pvt_service_drivinglicense.request.IdCardMicReq;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.edl_pvt_service_drivinglicense.request.IdCardMicReq;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.edl_pvt_service_drivinglicense.response.DlQrRes;
 import com.hikcreate.edl.pub.web.mobile.infra.data.feign.edl_pvt_service_drivinglicense.response.DlQrRes;
@@ -33,6 +36,7 @@ import com.hikcreate.edl.pub.web.mobile.infra.data.mapper.VerifyInfoMapper;
 import com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkBindInfo;
 import com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkBindInfo;
 import com.hikcreate.edl.pub.web.mobile.infra.model.entity.ParkVerifyInfo;
 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.BindInfoQueryReq;
+import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.BindSmsValidReq;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.request.H5BindInfoQuery;
 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.request.UnBindReq;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.BindInfoQueryRes;
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.BindInfoQueryRes;
@@ -83,6 +87,8 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
     private UnqIdUtil unqIdUtil;
     private UnqIdUtil unqIdUtil;
     @Autowired
     @Autowired
     private DrivingLicenseQrFeign drivingLicenseQrFeign;
     private DrivingLicenseQrFeign drivingLicenseQrFeign;
+    @Autowired
+    private SmsFeign    smsFeign;
 
 
     /**
     /**
      * 解除绑定时间限制
      * 解除绑定时间限制
@@ -108,6 +114,8 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
 
 
     private final ObjectMapper objectMapper = new ObjectMapper();
     private final ObjectMapper objectMapper = new ObjectMapper();
 
 
+    private final String bindKeyPrefix = "park:extend:bindInfo:";
+
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
@@ -174,6 +182,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
 
 
         //规则3:判断当前车牌号是否已绑定
         //规则3:判断当前车牌号是否已绑定
         QueryWrapper<ParkBindInfo> queryWrapper = new QueryWrapper<>();
         QueryWrapper<ParkBindInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", info.getUserId());
         queryWrapper.eq("plate_num", info.getPlateNum());
         queryWrapper.eq("plate_num", info.getPlateNum());
         queryWrapper.eq("plate_type", info.getPlateType());
         queryWrapper.eq("plate_type", info.getPlateType());
         queryWrapper.eq("status", "1");
         queryWrapper.eq("status", "1");
@@ -188,7 +197,8 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
 //        bindCache.insert(info);
 //        bindCache.insert(info);
         //保存至redis
         //保存至redis
         try {
         try {
-            redisTemplate.opsForValue().set("", objectMapper.writeValueAsString(info));
+            String key = bindKeyPrefix.concat(info.getPhone()).concat("-").concat(info.getOwnerPhone());
+            redisTemplate.opsForValue().set(key, objectMapper.writeValueAsString(info));
         } catch ( Exception e ) {
         } catch ( Exception e ) {
             log.error("绑定异常：{}", e.getMessage());
             log.error("绑定异常：{}", e.getMessage());
             return ResultGenerator.fail(StatusCode.SYSTEM_ERROR);
             return ResultGenerator.fail(StatusCode.SYSTEM_ERROR);
@@ -197,6 +207,30 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, ParkBindInfo> i
     }
     }
 
 
     /**
     /**
+     * 车辆绑定短信验证接口
+     *
+     * @param req
+     * @return
+     */
+    @Override
+    public Result bindSmsValid( BindSmsValidReq req ) {
+        //获取缓存信息
+        String key = bindKeyPrefix.concat(req.getPhone()).concat("-").concat(req.getOwnerPhone());
+        try {
+            objectMapper.readValue(redisTemplate.opsForValue().get(key), ParkBindInfo.class);
+        } catch ( JsonProcessingException e ) {
+            log.error("车辆绑定短信验证异常：{}",e.getMessage());
+            return ResultGenerator.fail(StatusCode.SYSTEM_ERROR);
+        }
+        //验证短信
+        CheckVerifyCodeMicReq checkVerifyCodeMicReq = new CheckVerifyCodeMicReq();
+        checkVerifyCodeMicReq.setPhone(req.getOwnerPhone())
+                .setVerifyCode(req.getSmsCode()).setTemplateCode("");
+        smsFeign.checkVerifyCode(checkVerifyCodeMicReq);
+        return null;
+    }
+
+    /**
      * 信息解绑
      * 信息解绑
      *
      *
      * @param req
      * @param req