接口定义

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

@@ -3,8 +3,8 @@ package com.hikcreate.edl.pub.web.mobile.api.controller;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateTime;
 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;
 import com.hikcreate.edl.pub.web.mobile.infra.core.Result;
+import com.hikcreate.edl.pub.web.mobile.infra.core.annotatiion.ResponseEncryptAnnotation;
 import com.hikcreate.edl.pub.web.mobile.infra.core.enums.ResultCode;
 import com.hikcreate.edl.pub.web.mobile.infra.core.enums.ResultCode;
-import com.hikcreate.edl.pub.web.mobile.infra.core.page.PageResult;
 import com.hikcreate.edl.pub.web.mobile.infra.data.mapper.BindInfoMapper;
 import com.hikcreate.edl.pub.web.mobile.infra.data.mapper.BindInfoMapper;
 import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo;
 import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo;
 import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfoQuery;
 import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfoQuery;
@@ -43,6 +43,7 @@ public class BindInfoControlller extends BaseController {
      * @date: 2020/6/19 10:27
      * @date: 2020/6/19 10:27
      */
      */
     @PostMapping("bind")
     @PostMapping("bind")
+    @ResponseEncryptAnnotation
     public Result bindInfo(@RequestBody BindInfo info) {
     public Result bindInfo(@RequestBody BindInfo info) {
         if (info == null) {
         if (info == null) {
             return Result.errorResult(ResultCode.PARAMETER_ERROR, "参数不能为空");
             return Result.errorResult(ResultCode.PARAMETER_ERROR, "参数不能为空");
@@ -78,68 +79,15 @@ public class BindInfoControlller extends BaseController {
      * @date: 2020/6/19 10:31
      * @date: 2020/6/19 10:31
      */
      */
     @PostMapping("query")
     @PostMapping("query")
-    public Result bindInfoQery(@RequestBody BindInfoQuery query) {
+    @ResponseEncryptAnnotation
+    public Result<BindInfo> bindInfoQery(@RequestBody BindInfoQuery query) {
         if (query == null) {
         if (query == null) {
             return Result.errorResult(ResultCode.PARAMETER_ERROR, "参数不能为空");
             return Result.errorResult(ResultCode.PARAMETER_ERROR, "参数不能为空");
         }
         }
-        return Result.successResult(mapper.selectByQuery(query));
+        return Result.successResult();
     }
     }
 
 
-    /**
-     * 年检信息查询接口
-     *
-     * @param query
-     * @return Result
-     * @author: xsx
-     * @date: 2020/6/19 10:32
-     */
-    @PostMapping("yearCheckInfo")
-    public Result yearCheckInfo(@RequestBody BindInfoQuery query) {
-        if (query == null) {
-            return Result.errorResult(ResultCode.PARAMETER_ERROR, "鉴权失败");
-        }
-        return service.yearCheckInfo(query);
-    }
-
-    /**
-     * 驾照信息查询接口
-     *
-     * @param query
-     * @return Result
-     * @author: xsx
-     * @date: 2020/6/19 16:28
-     */
-    @PostMapping("violationInfo")
-    public Result violationInfo(@RequestBody BindInfoQuery query) {
-        if (query == null) {
-            return Result.errorResult(ResultCode.PARAMETER_ERROR, "鉴权失败");
-        }
-        return service.violationInfo(query);
-    }
-
-    @PostMapping("insuranceInfo")
-    public Result insuranceInfo(@RequestBody BindInfoQuery query){
-        if (query == null) {
-            return Result.errorResult(ResultCode.PARAMETER_ERROR, "鉴权失败");
-        }
-        return service.insuranceInfo(query);
-    }
 
 
-    /**
-     * 驾照信息查询接口
-     *
-     * @param query
-     * @return Result
-     * @author: xsx
-     * @date: 2020/6/19 16:28
-     */
-    @PostMapping("drivingLicenseInfo")
-    public Result drivingLicenseInfo(@RequestBody BindInfoQuery query) {
-        if (query == null) {
-            return Result.errorResult(ResultCode.PARAMETER_ERROR, "鉴权失败");
-        }
-        return service.drivingLicenseInfo(query);
-    }
 
 
 
 
 }
 }

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

+package com.hikcreate.edl.pub.web.mobile.api.controller;
+
+import com.hikcreate.edl.pub.web.mobile.domain.IBindService;
+import com.hikcreate.edl.pub.web.mobile.infra.core.Result;
+import com.hikcreate.edl.pub.web.mobile.infra.core.enums.ResultCode;
+import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfoQuery;
+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.ViolationInfoRes;
+import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.YearCheckInfoRes;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 对外提供给H5的接口
+ *
+ * @author: xieshixiang
+ * @time：2020/6/19 16:37
+ **/
+@RestController
+@RequestMapping("/vehicle")
+@Slf4j
+public class H5Controller {
+
+    @Autowired
+    IBindService service;
+    /**
+     * 年检信息查询接口
+     *
+     * @param query
+     * @return Result
+     * @author: xsx
+     * @date: 2020/6/19 10:32
+     */
+    @PostMapping("yearCheckInfo")
+    public Result<YearCheckInfoRes> yearCheckInfo(@RequestBody BindInfoQuery query) {
+        if (query == null) {
+            return Result.errorResult(ResultCode.PARAMETER_ERROR, "鉴权失败");
+        }
+        return service.yearCheckInfo(query);
+    }
+
+    /**
+     * 违法信息查询接口
+     *
+     * @param query
+     * @return Result
+     * @author: xsx
+     * @date: 2020/6/19 16:28
+     */
+    @PostMapping("violationInfo")
+    public Result<ViolationInfoRes> violationInfo(@RequestBody BindInfoQuery query) {
+        if (query == null) {
+            return Result.errorResult(ResultCode.PARAMETER_ERROR, "鉴权失败");
+        }
+        return service.violationInfo(query);
+    }
+    /**
+     * 保险信息查询接口
+     *
+     * @param query
+     * @return Result
+     * @author: xsx
+     * @date: 2020/6/19 16:28
+     */
+    @PostMapping("insuranceInfo")
+    public Result<InsuranceInfoRes> insuranceInfo(@RequestBody BindInfoQuery query){
+        if (query == null) {
+            return Result.errorResult(ResultCode.PARAMETER_ERROR, "鉴权失败");
+        }
+        return service.insuranceInfo(query);
+    }
+
+    /**
+     * 驾照信息查询接口
+     *
+     * @param query
+     * @return Result
+     * @author: xsx
+     * @date: 2020/6/19 16:28
+     */
+    @PostMapping("drivingLicenseInfo")
+    public Result<DrivingLicenseInfoRes> drivingLicenseInfo(@RequestBody BindInfoQuery query) {
+        if (query == null) {
+            return Result.errorResult(ResultCode.PARAMETER_ERROR, "鉴权失败");
+        }
+        return service.drivingLicenseInfo(query);
+    }
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.hikcreate.edl.pub.web.mobile.infra.core.Result;
 import com.hikcreate.edl.pub.web.mobile.infra.core.Result;
 import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo;
 import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo;
 import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfoQuery;
 import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfoQuery;
+import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.DrivingLicenseInfoRes;
 
 
 /**
 /**
  * 客户绑定服务接口
  * 客户绑定服务接口
@@ -56,6 +57,6 @@ public interface IBindService extends IService<BindInfo> {
      * @author: xsx
      * @author: xsx
      * @date: 2020/6/19 16:29
      * @date: 2020/6/19 16:29
      */
      */
-    Result drivingLicenseInfo(BindInfoQuery query);
+    Result<DrivingLicenseInfoRes> drivingLicenseInfo(BindInfoQuery query);
 
 
 }
 }

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

@@ -16,6 +16,10 @@ import com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.par
 import com.hikcreate.edl.pub.web.mobile.infra.data.mapper.BindInfoMapper;
 import com.hikcreate.edl.pub.web.mobile.infra.data.mapper.BindInfoMapper;
 import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo;
 import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfo;
 import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfoQuery;
 import com.hikcreate.edl.pub.web.mobile.infra.model.BindInfoQuery;
+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.ViolationInfoRes;
+import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.YearCheckInfoRes;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -70,11 +74,11 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
         if (info.getPlateType()==null || info.getPlateType().equals("")){
         if (info.getPlateType()==null || info.getPlateType().equals("")){
             return Result.errorResult(ResultCode.DATA_ERROR,"您提交的手机号与备案信息不符!");
             return Result.errorResult(ResultCode.DATA_ERROR,"您提交的手机号与备案信息不符!");
         }
         }
-        return mapper.insert(info)>0?Result.successResult(info): Result.errorResult("绑定失败!");
+        return mapper.insert(info)>0?Result.successResult(info.getUnqId()): Result.errorResult("绑定失败!");
     }
     }
 
 
     @Override
     @Override
-    public Result yearCheckInfo(BindInfoQuery query) {
+    public Result<YearCheckInfoRes> yearCheckInfo(BindInfoQuery query) {
         BindInfo bindInfo = mapper.selectById(query.getUnqId());
         BindInfo bindInfo = mapper.selectById(query.getUnqId());
         if (bindInfo==null || "0".equals(bindInfo.getStatus())){
         if (bindInfo==null || "0".equals(bindInfo.getStatus())){
             return Result.errorResult(ResultCode.DATA_ERROR,"车辆绑定信息不存在,或已过期!");
             return Result.errorResult(ResultCode.DATA_ERROR,"车辆绑定信息不存在,或已过期!");
@@ -83,7 +87,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
     }
     }
 
 
     @Override
     @Override
-    public Result insuranceInfo(BindInfoQuery query) {
+    public Result<InsuranceInfoRes> insuranceInfo(BindInfoQuery query) {
         BindInfo bindInfo = mapper.selectById(query.getUnqId());
         BindInfo bindInfo = mapper.selectById(query.getUnqId());
         if (bindInfo==null || "0".equals(bindInfo.getStatus())){
         if (bindInfo==null || "0".equals(bindInfo.getStatus())){
             return Result.errorResult(ResultCode.DATA_ERROR,"车辆绑定信息不存在,或已过期!");
             return Result.errorResult(ResultCode.DATA_ERROR,"车辆绑定信息不存在,或已过期!");
@@ -91,8 +95,9 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
         return null;
         return null;
     }
     }
 
 
+
     @Override
     @Override
-    public Result violationInfo(BindInfoQuery query) {
+    public Result<ViolationInfoRes> violationInfo(BindInfoQuery query) {
         BindInfo bindInfo = mapper.selectById(query.getUnqId());
         BindInfo bindInfo = mapper.selectById(query.getUnqId());
         if (bindInfo==null || "0".equals(bindInfo.getStatus())){
         if (bindInfo==null || "0".equals(bindInfo.getStatus())){
             return Result.errorResult(ResultCode.DATA_ERROR,"车辆绑定信息不存在,或已过期!");
             return Result.errorResult(ResultCode.DATA_ERROR,"车辆绑定信息不存在,或已过期!");
@@ -102,12 +107,17 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
         req.setPlateNum(bindInfo.getPlateNum());
         req.setPlateNum(bindInfo.getPlateNum());
         req.setPlateType(bindInfo.getPlateType());
         req.setPlateType(bindInfo.getPlateType());
         List<ViolationRes> byPlateNumAndType = violatio.getByPlateNumAndType(req);
         List<ViolationRes> byPlateNumAndType = violatio.getByPlateNumAndType(req);
-        return Result.successResult(byPlateNumAndType);
+        return null;
     }
     }
 
 
     @Override
     @Override
-    public Result drivingLicenseInfo(BindInfoQuery query) {
+    public Result<DrivingLicenseInfoRes> drivingLicenseInfo(BindInfoQuery query) {
+        BindInfo bindInfo = mapper.selectById(query.getUnqId());
+        if (bindInfo==null || "0".equals(bindInfo.getStatus())){
+            return Result.errorResult(ResultCode.DATA_ERROR,"车辆绑定信息不存在,或已过期!");
+        }
         return null;
         return null;
+
     }
     }
 
 
 
 
@@ -122,6 +132,4 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
     }
     }
 
 
 
 
-
-
 }
 }

infra/src/main/java/com/hikcreate/edl/pub/web/mobile/infra/data/feign/dcp_service_vehicle/param/response/DrivingLicenseRes.java

+package com.hikcreate.edl.pub.web.mobile.infra.data.feign.dcp_service_vehicle.param.response;
+
+import lombok.Data;
+
+/**
+ * @author MOUBK
+ * @create 2019/7/5 15:31
+ */
+@Data
+public class DrivingLicenseRes {
+
+    private String dabh;//档案编号
+    private String sfzmhm;//身份证明号码
+    private String zjcx;//准驾车型
+    private String yzjcx;//原准驾车型
+    private String qfrq;//下一清分日期
+    private String syrq;//下一审验日期
+    private String cclzrq;//初次领证日期
+    private String ccfzjg;//初次发证机关
+    private String jzqx;//驾证期限
+    private String yxqs;//有效期始
+    private String yxqz;//有效期止
+    private String ljjf;//累积记分
+    private String cfrq;//超分日期
+    private String xxtzrq;//学习通知日期
+    private String bzcs;//补证次数
+    private String zt;//驾驶证状态
+    private String ly;//驾驶人来源
+    private String jxmc;//驾校名称
+    private String jly;//教练员
+    private String xzqh;//行政区划
+    private String xzqj;//乡镇区局
+    private String fzrq;//发证日期
+    private String jbr;//经办人
+    private String glbm;//管理部门
+    private String fzjg;//发证机关
+    private String gxsj;//更新时间
+    private String lsh;//流水号
+    private String xgzl;//相关资料
+    private String bz;//备注
+    private String jyw;//校验位
+    private String ydabh;//原档案编号
+    private String sqdm;//社区代码
+    private String zxbh;//证芯编号
+    private String xh;//序号
+    private String sfzmmc;//身份证明名称
+    private String hmcd;//号码长度
+    private String xm;//姓名
+    private String xb;//性别1男2女
+    private String csrq;//出生日期
+    private String gj;//国籍
+    private String djzsxzqh;//登记住所行政区划
+    private String djzsxxdz;//登记住所详细地址
+    private String lxzsxzqh;//联系住所行政区划
+    private String lxzsxxdz;//联系住所详细地址
+    private String lxzsyzbm;//联系住所邮政编码
+    private String lxdh;//联系电话
+    private String sjhm;//手机号码
+    private String dzyx;//电子邮箱
+    private String zzzm;//暂住证明
+    private String zzfzjg;//暂住发证机关
+    private String zzfzrq;//暂住发证日期
+    private String sfbd;//是否本地
+    private String dwbh;//nokey
+    private String syyxqz;//审验有效期止
+    private String xczg;//校车驾驶资格1有0无
+    private String xczjcx;//校车资格准驾车型
+    private String ryzt;//人员状态。0：正常；1：有吸毒记录
+    private String sxbj;//实习标记1是2否
+    private String xzcrq;//需转出日期
+    private String sxqksbj;//实习期考试标记0未参加1参加
+    private String jyw2;//nokey
+    private String picUrl; // 照片图片地址
+
+    //扩展_Value字段处理
+    private String xczgValue;//校车驾驶资格1有0无
+    private String ryztValue;//人员状态。0：正常；1：有吸毒记录
+    private String sxbjValue;//实习标记1是2否
+    private String sxqksbjValue;//实习期考试标记0未参加1参加
+    private String jzqxValue;//驾证期限
+    private String ztValue;//驾驶证状态
+    private String lyValue;//驾驶人来源
+    private String jxmcValue;//驾校名称
+    private String xzqhValue;//行政区划
+    private String xzqjValue;//乡镇区局
+    private String glbmValue;//管理部门
+    private String xgzlValue;//相关资料
+    private String sfzmmcValue;//身份证明名称
+    private String hmcdValue;//号码长度
+    private String xbValue;//性别1男2女
+    private String gjValue;//国籍
+    private String djzsxzqhValue;//登记住所行政区划
+    private String lxzsxzqhValue;//联系住所行政区划
+    private String sfbdValue;//是否本地 0是 1 否
+
+    //-------------- 未转化字段处理 --------------
+    public String getXczgValue() {
+        return "1".equals(getXczg())? "有":"无";
+    }
+    public String getRyztValue() {
+        return "0".equals(getRyzt())? "正常":"有吸毒记录";
+    }
+    public String getSxbjValue() {
+        return "1".equals(getSxbj())? "是":"否";
+    }
+    public String getSxqksbjValue() {
+        return "0".equals(getSxqksbj())? "未参加":"参加";
+    }
+    public String getSfbdValue() {
+        return "1".equals(getSfbd())? "否":"是";
+    }
+
+
+
+    //-------------- code 可能是值兼容处理 --------------
+    public String getJxmcValue() {
+        if(jxmcValue != null){
+            return jxmcValue;
+        }else{
+            return getJxmc();
+        }
+    }
+}

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

+package com.hikcreate.edl.pub.web.mobile.infra.model.param.response;
+
+import lombok.Data;
+
+/**
+ * @author MOUBK
+ * @create 2019/7/5 15:31
+ */
+@Data
+public class DrivingLicenseInfoRes {
+
+    /**
+     *有效期止
+     */
+    private String yxqz;
+    /**
+     * 驾驶证状态
+     */
+    private String zt;
+    /**
+     * 姓名
+     */
+    private String xm;
+
+}

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

+package com.hikcreate.edl.pub.web.mobile.infra.model.param.response;
+
+/**
+ * @author: xieshixiang
+ * @time：2020/6/19 17:06
+ **/
+public class InsuranceInfoRes {
+
+    /**
+     * 有效期始
+     */
+    private String yxqs;
+    /**
+     * 有效期止
+     */
+    private String yxqz;
+    /**
+     * 保险状态
+     */
+    private String zt;
+
+}

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

+package com.hikcreate.edl.pub.web.mobile.infra.model.param.response;
+
+import java.util.List;
+
+/**
+ * 违法信息实体类
+ *
+ * @author: xieshixiang
+ * @time：2020/6/19 16:48
+ **/
+public class ViolationInfoRes {
+
+    List<ViolationInfo> list;
+
+    public static class ViolationInfo{
+
+        /**
+         * 违法行为
+         */
+        private String wfxw;
+        /**
+         * 处理时间
+         */
+        private String clsj;
+        /**
+         * 违法地址
+         */
+        private String wfdz;
+        /**
+         * 罚款金额
+         */
+        private String fkje;
+        /**
+         * 违法计分
+         */
+        private String wfjfs;
+
+    }
+
+}

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

+package com.hikcreate.edl.pub.web.mobile.infra.model.param.response;
+
+/**
+ * 年检信息返回实体类
+ * @author: xieshixiang
+ * @time：2020/6/19 16:45
+ **/
+public class YearCheckInfoRes {
+
+
+    /**
+     *有效期止
+     */
+    private String yxqz;
+    /**
+     * 年检状态
+     */
+    private String zt;
+
+}