Browse Source

修改依图接口比中返回的displayMsg

FanQun 2 years ago
parent
commit
0821d39cad

+ 2 - 2
src/main/java/com/rshy/project/hy/manager/impl/RshyJkManagerImpl.java

@@ -210,7 +210,7 @@ public class RshyJkManagerImpl implements RshyJkManager {
         rshyVo.setXb(SexEnum.codeOf(IdcardUtil.getGenderByIdCard(rshyVo.getSfzh())).getDesc());
         //出生日期 从身份证号码中获取
         Date date = DateUtil.parse(IdcardUtil.getBirthByIdCard(rshyVo.getSfzh()));
-        rshyVo.setBirthday(DateUtil.format(date, "yyyy-M-d"));
+        rshyVo.setBirthday(DateUtil.format(date, "yyyy-MM-dd"));
         //取地址、姓名、民族
         if (resultDTO.getPctsfzResult() != null) {
             //有警察叔叔身份证接口返回数据
@@ -407,7 +407,7 @@ public class RshyJkManagerImpl implements RshyJkManager {
         RetrievalRepositoryVO repositoryVO = voList.stream().findFirst().get();
         rshyVo.setPass(RepositoryEnum.COUNTRY_LARGE.getId().equals(repositoryVO.getRepository_id()) ? PassStatusEnum.NO_PASSING.getCode() : PassStatusEnum.RIGHT_WAY.getCode())
                 .setKind(EnumUtil.likeValueOf(RepositoryEnum.class, repositoryVO.getRepository_id()).getName())
-                .setWarning(stringMap.get(repositoryVO.getRepository_id())).setDisplayMsg(RepositoryEnum.COUNTRY_LARGE.getId().equals(repositoryVO.getRepository_id()) ? PassStatusEnum.NO_PASSING.getDesc() : PassStatusEnum.RIGHT_WAY.getDesc())
+                .setWarning(stringMap.get(repositoryVO.getRepository_id())).setDisplayMsg(RepositoryEnum.COUNTRY_LARGE.getId().equals(repositoryVO.getRepository_id()) ? PassStatusEnum.NO_PASSING.getTts() : PassStatusEnum.RIGHT_WAY.getTts())
                 .setTts(RepositoryEnum.COUNTRY_LARGE.getId().equals(repositoryVO.getRepository_id()) ? PassStatusEnum.NO_PASSING.getTts() : PassStatusEnum.RIGHT_WAY.getTts()).setHealthCode(StrUtil.EMPTY).setSfzh(repositoryVO.getPersonId())
                 .setXm(repositoryVO.getName()).setXb(SexEnum.codeOf(repositoryVO.getGender()).getDesc()).setMz(StrUtil.EMPTY).setPhone(StrUtil.EMPTY).setAddress(StrUtil.EMPTY);//.setPhoto(rshyQuickParam.getPhoto());
         return rshyVo;

+ 1 - 1
src/main/java/com/rshy/project/hy/model/enums/PassStatusEnum.java

@@ -14,7 +14,7 @@ public enum PassStatusEnum {
     //在逃人员或拦截人员
     NO_PASSING(0, "拦截", "请重刷"),
     RIGHT_WAY(1, "存疑", "请稍等"),
-    NORMAL_TRAFFIC(2, "核验通过", "通过"),
+    NORMAL_TRAFFIC(2, "通过", "通过"),
     GREEN_CODE(2, "绿码", "通过"),
     RED_CODE(3, "红码", "健康码异常"),
     YELLOW_CODE(3, "黄码", "健康码异常"),