Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-issuer

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/portal/FindAccountInfoByTokenResponse.java

@@ -7,6 +7,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import javax.persistence.Column;
 import java.time.LocalDateTime;
 
 @Getter
@@ -24,6 +25,10 @@ public class FindAccountInfoByTokenResponse extends AbstractPortalResponse {
     private String userName;// 用户姓名/企业名称
     private Gender gender;// 性别
     private String nickName;// 昵称
+    private String userIdImgUrl;// 会员证件照地址-信息
+    private String userIdBackImgUrl;// 会员证件照地址-国徽
+    private String address;// 地址;
     private String customerId;//最近一次ETC用户
 
+
 }

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/ocr/BaiduOcrUtil.java

@@ -343,7 +343,7 @@ public class BaiduOcrUtil {
 
             String outsideDimensions = getValue(wordsResultObj, "外廓尺寸");
             if (StringUtils.hasText(outsideDimensions)) {
-                outsideDimensions = outsideDimensions.replaceAll("[\\^\\s]", "").toLowerCase();
+                outsideDimensions = outsideDimensions.replaceAll("[\\^\\s]", "");
                 res.setOverall(outsideDimensions);
             }else {
                 res.setOverall(null);
@@ -359,6 +359,7 @@ public class BaiduOcrUtil {
             res.setRespMessage("ocr识别成功");
             return res;
         } catch (Exception e) {
+            logger.info("解析行驶证识别异常", e);
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("解析百度ocr返回值异常");
         }
     }
@@ -403,6 +404,7 @@ public class BaiduOcrUtil {
             res.setRespMessage("ocr识别成功");
             return res;
         } catch (Exception e) {
+            logger.info("解析营业执照识别异常", e);
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("解析百度ocr返回值异常");
         }
     }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/audit/VerificationRuleManager.java

@@ -275,11 +275,11 @@ public class VerificationRuleManager extends AbstractCommManager {
                     builder.append("外廓尺寸【" + model.getVehicleDimensions() + "】与系统识别结果【" + res.getOverall() + "】不一致；");
                 }
                 if (model.getVanType() == 1) {
-                    if ((model.getApprovedCount() + "人").equals(res.getApc())) {
+                    if (!(model.getApprovedCount() + "人").equals(res.getApc())) {
                         builder.append("核定载人数【" + model.getApprovedCount() + "人" + "】与系统识别结果【" + res.getApc() + "】不一致；");
                     }
                 } else {
-                    if ((model.getTotalMass() + "KG").equals(res.getGross().toUpperCase())) {
+                    if (!(model.getTotalMass() + "KG").equals(res.getGross().toUpperCase())) {
                         builder.append("总质量【" + model.getTotalMass() + "】与系统识别结果【" + res.getGross() + "】不一致；");
                     }
                 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/SignQueryManager.java

@@ -105,6 +105,7 @@ public class SignQueryManager extends AbstractOrderManager<SignQueryRequest> {
             }
             orderInfoRepo.merge(order);
         }
+        dataStream.put(RES, res);
     }
     @Override
     protected void onSuccessInternal(SignQueryRequest req, ServiceLogEvent event, Map<String, Object> dataStream) {