Merge remote-tracking branch 'origin/master'

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

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

@@ -63,7 +63,7 @@ public class BindInfoControlller extends BaseController {
     @PostMapping("unbind")
     @PostMapping("unbind")
     public Result unbindInfo(@RequestBody BindInfo info) {
     public Result unbindInfo(@RequestBody BindInfo info) {
         if (info == null) {
         if (info == null) {
-            return Result.errorResult(ResultCode.PARAMETER_ERROR, "参数不能为空");
+            return Result.errorResult(ResultCode.PARAMETER_ERROR);
         }
         }
         info.setStatus("0");
         info.setStatus("0");
         info.setEditorTime(DateTime.now());
         info.setEditorTime(DateTime.now());
@@ -82,7 +82,7 @@ public class BindInfoControlller extends BaseController {
     @ResponseEncryptAnnotation
     @ResponseEncryptAnnotation
     public Result<BindInfo> bindInfoQery(@RequestBody BindInfoQuery query) {
     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();
         return Result.successResult();
     }
     }

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

@@ -10,7 +10,10 @@ import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.ViolationInfo
 import com.hikcreate.edl.pub.web.mobile.infra.model.param.response.YearCheckInfoRes;
 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.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+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;
 import java.util.List;
 
 
@@ -38,7 +41,7 @@ public class H5Controller {
     @GetMapping("yearCheckInfo")
     @GetMapping("yearCheckInfo")
     public Result<YearCheckInfoRes> yearCheckInfo(@RequestBody BindInfoQuery query) {
     public Result<YearCheckInfoRes> yearCheckInfo(@RequestBody BindInfoQuery query) {
         if (query == null) {
         if (query == null) {
-            return Result.errorResult(ResultCode.PARAMETER_ERROR, "鉴权失败");
+            return Result.errorResult(ResultCode.PARAMETER_ERROR);
         }
         }
         return service.yearCheckInfo(query);
         return service.yearCheckInfo(query);
     }
     }
@@ -54,7 +57,7 @@ public class H5Controller {
     @GetMapping("violationInfo")
     @GetMapping("violationInfo")
     public Result<ViolationInfoRes> violationInfo(@RequestBody BindInfoQuery query) {
     public Result<ViolationInfoRes> violationInfo(@RequestBody BindInfoQuery query) {
         if (query == null) {
         if (query == null) {
-            return Result.errorResult(ResultCode.PARAMETER_ERROR, "鉴权失败");
+            return Result.errorResult(ResultCode.PARAMETER_ERROR);
         }
         }
         return service.violationInfo(query);
         return service.violationInfo(query);
     }
     }
@@ -69,7 +72,7 @@ public class H5Controller {
     @GetMapping("insuranceInfo")
     @GetMapping("insuranceInfo")
     public Result<InsuranceInfoRes> insuranceInfo(@RequestBody BindInfoQuery query){
     public Result<InsuranceInfoRes> insuranceInfo(@RequestBody BindInfoQuery query){
         if (query == null) {
         if (query == null) {
-            return Result.errorResult(ResultCode.PARAMETER_ERROR, "鉴权失败");
+            return Result.errorResult(ResultCode.PARAMETER_ERROR);
         }
         }
         return service.insuranceInfo(query);
         return service.insuranceInfo(query);
     }
     }
@@ -85,7 +88,7 @@ public class H5Controller {
     @GetMapping("drivingLicenseInfo")
     @GetMapping("drivingLicenseInfo")
     public Result<DrivingLicenseInfoRes> drivingLicenseInfo(@RequestBody BindInfoQuery query) {
     public Result<DrivingLicenseInfoRes> drivingLicenseInfo(@RequestBody BindInfoQuery query) {
         if (query == null) {
         if (query == null) {
-            return Result.errorResult(ResultCode.PARAMETER_ERROR, "鉴权失败");
+            return Result.errorResult(ResultCode.PARAMETER_ERROR);
         }
         }
         return service.drivingLicenseInfo(query);
         return service.drivingLicenseInfo(query);
     }
     }

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

@@ -59,7 +59,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
         boundQuery.eq("user_id", info.getUserId());
         boundQuery.eq("user_id", info.getUserId());
         Integer bound = mapper.selectCount(boundQuery);
         Integer bound = mapper.selectCount(boundQuery);
         if (bound >= 3) {
         if (bound >= 3) {
-            return Result.errorResult(ResultCode.SERVICE_ERROR, "您的绑定名额已用完!");
+            return Result.errorResult(ResultCode.SERVICE_ERROR);
         }
         }
 
 
         //规则2:客户手机号与车辆对应的车主手机号一致
         //规则2:客户手机号与车辆对应的车主手机号一致
@@ -72,16 +72,16 @@ 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.getUnqId()): Result.errorResult("绑定失败!");
+        return mapper.insert(info)>0?Result.successResult(info.getUnqId()): Result.errorResult();
     }
     }
 
 
     @Override
     @Override
     public Result<YearCheckInfoRes> 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);
         }
         }
         return null;
         return null;
     }
     }
@@ -90,7 +90,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
     public Result<InsuranceInfoRes> 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);
         }
         }
         return null;
         return null;
     }
     }
@@ -100,7 +100,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
     public Result<ViolationInfoRes> 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);
         }
         }
 
 
         ViolationPlateNumAndTypeQueryReq req = new ViolationPlateNumAndTypeQueryReq();
         ViolationPlateNumAndTypeQueryReq req = new ViolationPlateNumAndTypeQueryReq();
@@ -114,7 +114,7 @@ public class BindServiceImpl extends ServiceImpl<BindInfoMapper, BindInfo> imple
     public Result<DrivingLicenseInfoRes> drivingLicenseInfo(BindInfoQuery query) {
     public Result<DrivingLicenseInfoRes> drivingLicenseInfo(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);
         }
         }
         return null;
         return null;
 
 

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

@@ -17,7 +17,6 @@ public class Result<T> {
     private boolean success;
     private boolean success;
     private String msg;
     private String msg;
     private String code;
     private String code;
-    private String codeMean;
     private T data;
     private T data;
 
 
     public static <T> Result<T> createResult(boolean isSuccess, String mes, T data, String code) {
     public static <T> Result<T> createResult(boolean isSuccess, String mes, T data, String code) {
@@ -33,13 +32,10 @@ public class Result<T> {
         return result;
         return result;
     }
     }
 
 
-    public static <T> Result<T> createResult(ResultCode code, String mes, T data) {
+    public static <T> Result<T> createResult(ResultCode code, T data) {
         Result<T> result = new Result<T>();
         Result<T> result = new Result<T>();
-        if (code.getMean() != null && !code.getMean().isEmpty()) {
-            result.setCodeMean(code.getMean());
-        }
-        if (mes != null && !mes.isEmpty()) {
-            result.setMsg(mes);
+        if (code.getMsg() != null && !code.getMsg().isEmpty()) {
+            result.setMsg(code.getMsg());
         }
         }
 
 
         if (data != null) {
         if (data != null) {
@@ -52,37 +48,28 @@ public class Result<T> {
 
 
 
 
     public static <T> Result<T> successResult() {
     public static <T> Result<T> successResult() {
-        return createResult(ResultCode.SUCCESS, null, null);
+        return createResult(ResultCode.SUCCESS, null);
     }
     }
 
 
     public static <T> Result<T> successResult(T data) {
     public static <T> Result<T> successResult(T data) {
-        return createResult(ResultCode.SUCCESS, null, data);
-    }
-
-    public static <T> Result<T> successResult(String msg, T data) {
-        return createResult(ResultCode.SUCCESS, msg, data);
+        return createResult(ResultCode.SUCCESS, data);
     }
     }
 
 
     public static <T> Result<T> errorResult() {
     public static <T> Result<T> errorResult() {
-        return createResult(ResultCode.SYSTEM_UNKNOWN_ERROR, null, null);
+        return createResult(ResultCode.SYSTEM_UNKNOWN_ERROR, null);
     }
     }
 
 
     public static <T> Result<T> errorResult(T data) {
     public static <T> Result<T> errorResult(T data) {
-        return createResult(ResultCode.SYSTEM_UNKNOWN_ERROR, null, data);
-    }
-    public static <T> Result<T> errorResult(String msg) {
-        return createResult(ResultCode.SYSTEM_UNKNOWN_ERROR, msg, null);
+        return createResult(ResultCode.SYSTEM_UNKNOWN_ERROR, data);
     }
     }
+
     public static <T> Result<T> errorResult(ResultCode code) {
     public static <T> Result<T> errorResult(ResultCode code) {
-        return createResult(code, null, null);
+        return createResult(code, null);
     }
     }
 
 
-    public static <T> Result<T> errorResult(ResultCode code, String msg) {
-        return createResult(code, msg, null);
-    }
 
 
     public static <T> Result<T> errorResult(ResultCode code, T data) {
     public static <T> Result<T> errorResult(ResultCode code, T data) {
-        return createResult(code, null, data);
+        return createResult(code, data);
     }
     }
 
 
 
 
@@ -90,14 +77,6 @@ public class Result<T> {
         return this.failFast(this.code, this.msg);
         return this.failFast(this.code, this.msg);
     }
     }
 
 
-    public Result<T> failFastWithCode(String msg) {
-        return this.failFast(this.code, msg);
-    }
-
-    public Result<T> failFastWithMessage(String code) {
-        return this.failFast(code, this.msg);
-    }
-
     public Result<T> failFast(String code, String msg) {
     public Result<T> failFast(String code, String msg) {
         if (!this.success) {
         if (!this.success) {
             RuntimeException ex = new RuntimeException(code + ":" + msg);
             RuntimeException ex = new RuntimeException(code + ":" + msg);

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

@@ -18,12 +18,12 @@ public enum ResultCode {
     SERVICE_ERROR("1006", "业务错误", false);
     SERVICE_ERROR("1006", "业务错误", false);
 
 
     private String code;
     private String code;
-    private String mean;
+    private String msg;
     private boolean success;
     private boolean success;
 
 
-    ResultCode(String code, String mean, boolean success) {
+    ResultCode(String code, String msg, boolean success) {
         this.code = code;
         this.code = code;
-        this.mean = mean;
+        this.msg = msg;
         this.success = success;
         this.success = success;
     }
     }
 
 
@@ -31,8 +31,8 @@ public enum ResultCode {
         return this.code;
         return this.code;
     }
     }
 
 
-    public String getMean() {
-        return mean;
+    public String getMsg() {
+        return msg;
     }
     }
 
 
     public boolean isSuccess() {
     public boolean isSuccess() {